Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-admin/src/main/java/com/zehong/web/controller/inspectorLocation/TUserLocationController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.vo.TUserLocationVo;
 import com.zehong.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -62,7 +63,8 @@ public class TUserLocationController extends BaseController
      */
     @GetMapping("/getInspectorLocations")
     public AjaxResult getInspectorLocations(TUserLocationVo tUserLocationVo){
-        if(null == tUserLocationVo.getUserId()){
+        //巡检人员初始化
+        if(null == tUserLocationVo.getUserId() && StringUtils.isEmpty(tUserLocationVo.getUserName())){
             List<SysUser> inspectors = userService.selectInspectorList();
             List<TUserLocation> inspectorLocations = new ArrayList<>();
             Map<String,Object> map = new HashMap<>(16);
@@ -73,13 +75,20 @@ public class TUserLocationController extends BaseController
             }
             return AjaxResult.success(inspectorLocations);
         }
-
+        //查询巡检人员路线
+        if(StringUtils.isEmpty(tUserLocationVo.getUserName())){
             Map<String,Object> map = new HashMap<>(16);
             map.put("userId",tUserLocationVo.getUserId());
             map.put("beginTime",tUserLocationVo.getBeginTime());
             map.put("endTime",tUserLocationVo.getEndTime());
             return AjaxResult.success(tUserLocationService.selectTUserLocationListByMap(map));
         }
+        //搜索
+        Map<String,Object> map = new HashMap<>(16);
+        map.put("userName",tUserLocationVo.getUserName());
+        map.put("initInspectors","initInspectors");
+        return AjaxResult.success(tUserLocationService.selectTUserLocationListByMap(map));
+    }
 
     /**
      * 导出巡检员定位列表

gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java

@@ -45,6 +45,18 @@ public class THiddenTroubleController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 地图初始化隐患
+     * @param tHiddenTrouble
+     * @return
+     */
+    @GetMapping("/getMapHiddenTroublelist")
+    public AjaxResult getMapHiddenTroublelist(THiddenTrouble tHiddenTrouble)
+    {
+        List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出隐患信息列表
      */
@@ -53,6 +65,7 @@ public class THiddenTroubleController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(THiddenTrouble tHiddenTrouble)
     {
+        tHiddenTrouble.setDealStatus("3");
         List<THiddenTrouble> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
         ExcelUtil<THiddenTrouble> util = new ExcelUtil<THiddenTrouble>(THiddenTrouble.class);
         return util.exportExcel(list, "隐患信息数据");

gassafety-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -83,6 +83,10 @@ public class TDeviceInfo extends BaseEntity
     @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date inspectionTime;
 
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDel;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
@@ -231,6 +235,15 @@ public class TDeviceInfo extends BaseEntity
     {
         return inspectionTime;
     }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
     public void setRemarks(String remarks)
     {
         this.remarks = remarks;

gassafety-system/src/main/java/com/zehong/system/domain/TPipe.java

@@ -66,6 +66,10 @@ public class TPipe extends BaseEntity
     @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date inspectionTime;
 
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDel;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
@@ -178,6 +182,15 @@ public class TPipe extends BaseEntity
     {
         return inspectionTime;
     }
+
+    public String getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(String isDel) {
+        this.isDel = isDel;
+    }
+
     public void setRemarks(String remarks)
     {
         this.remarks = remarks;

gassafety-system/src/main/java/com/zehong/system/domain/TUserLocation.java

@@ -33,6 +33,8 @@ public class TUserLocation extends BaseEntity
 
     private String userName;
 
+    private String phonenumber;
+
     public String getUserName() {
         return userName;
     }
@@ -41,6 +43,14 @@ public class TUserLocation extends BaseEntity
         this.userName = userName;
     }
 
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
     public void setLocationId(Long locationId)
     {
         this.locationId = locationId;

gassafety-system/src/main/java/com/zehong/system/domain/vo/TUserLocationVo.java

@@ -19,6 +19,16 @@ public class TUserLocationVo {
      */
     private Date endTime;
 
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     public Long getUserId() {
         return userId;
     }

gassafety-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -21,16 +21,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phone"    column="phone"    />
         <result property="installationTime"    column="installation_time"    />
         <result property="inspectionTime"    column="inspection_time"    />
+        <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTDeviceInfoVo">
-        select device_id, enterprise_id, pipe_code, device_name, device_code, device_addr, device_model, device_type, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_device_info
+        select device_id, enterprise_id, pipe_code, device_name, device_code, device_addr, device_model, device_type, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, is_del, remarks from t_device_info
     </sql>
 
     <select id="selectTDeviceInfoList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
         <include refid="selectTDeviceInfoVo"/>
         <where>
+            is_del = '0'
             <if test="enterpriseId != null and enterpriseId != 0 "> and enterprise_id = #{enterpriseId}</if>
             <if test="pipeCode != null "> and pipe_code = #{pipeCode}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
@@ -62,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="countDeviceByType" resultType="map">
         select count(device_id) number, device_type type from t_device_info
+        where is_del = '0'
         group by device_type
     </select>
         
@@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="installationTime != null">installation_time = #{installationTime},</if>
             <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
         where device_id = #{deviceId}
     </update>

gassafety-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml

@@ -49,8 +49,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTDeviceReportDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
-        select t.report_time, t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time,
-               d.device_id, d.device_name, d.device_code, d.device_type, d.device_model
+        select
+            t.report_time,
+            t.device_report_data_id,
+            t.device_num,
+            t.standard_condition_accumulation,
+            t.working_condition_accumulation,
+            t.residual_quantity,
+            t.standard_condition_flow,
+            t.working_condition_flow,
+            t.temperature,
+            t.pressure,
+            t.communication_status,
+            t.create_time,
+            t.update_time,
+            d.device_id,
+            d.device_name,
+            d.device_code,
+            d.device_type,
+            d.device_model,
+            CASE (SELECT COUNT(DISTINCT alarm.device_id) FROM t_device_alarm alarm WHERE alarm.device_id = d.device_id AND alarm.end_time IS NULL)
+            WHEN 0 THEN '正常'
+            ELSE '报警'
+            END as device_status
         from t_device_report_data t
         left join t_device_info d on t.device_num = d.iot_no
         <where>  
@@ -64,10 +85,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectRealtimeDataList" parameterType="DeviceReportDataForm" resultMap="TDeviceReportDataResultVo">
-        select max(t.report_time) report_time, t.device_report_data_id, t.device_num, t.standard_condition_accumulation, t.working_condition_accumulation, t.residual_quantity, t.standard_condition_flow, t.working_condition_flow, t.temperature, t.pressure, t.communication_status, t.device_status, t.create_time, t.update_time,
-               d.device_id, d.device_name, d.device_code, d.device_type, d.device_model
+        select
+            max(t.report_time) report_time,
+            t.device_report_data_id,
+            t.device_num,
+            t.standard_condition_accumulation,
+            t.working_condition_accumulation,
+            t.residual_quantity,
+            t.standard_condition_flow,
+            t.working_condition_flow,
+            t.temperature,
+            t.pressure,
+            t.communication_status,
+            t.create_time,
+            t.update_time,
+            d.device_id,
+            d.device_name,
+            d.device_code,
+            d.device_type,
+            d.device_model,
+            CASE (SELECT COUNT(DISTINCT alarm.device_id) FROM t_device_alarm alarm WHERE alarm.device_id = d.device_id AND alarm.end_time IS NULL)
+            WHEN 0 THEN '正常'
+            ELSE '报警'
+            END as device_status
         from t_device_report_data t
-        right join t_device_info d on t.device_num = d.iot_no
+        LEFT JOIN t_device_info d on t.device_num = d.iot_no
         <where>
             <if test="deviceCode != null "> and d.device_code like concat('%',#{deviceCode},'%')</if>
             <if test="deviceType != null "> and d.device_type = #{deviceType}</if>

gassafety-system/src/main/resources/mapper/system/TPipeMapper.xml

@@ -17,16 +17,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="iconUrl"    column="icon_url"    />
         <result property="installationTime"    column="installation_time"    />
         <result property="inspectionTime"    column="inspection_time"    />
+        <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTPipeVo">
-        select pipe_id, enterprise_id, pipe_name, pipe_code, pipe_addr, coordinates, pipe_length, pipe_type, pipe_pressure, icon_url, installation_time, inspection_time, remarks from t_pipe
+        select pipe_id, enterprise_id, pipe_name, pipe_code, pipe_addr, coordinates, pipe_length, pipe_type, pipe_pressure, icon_url, installation_time, inspection_time, is_del, remarks from t_pipe
     </sql>
 
     <select id="selectTPipeList" parameterType="TPipe" resultMap="TPipeResult">
         <include refid="selectTPipeVo"/>
         <where>
+            is_del = '0'
             <if test="enterpriseId != null and enterpriseId != 0"> and enterprise_id = #{enterpriseId}</if>
             <if test="pipeName != null  and pipeName != ''"> and pipe_name like concat('%', #{pipeName}, '%')</if>
             <if test="pipeCode != null  and pipeCode != ''"> and pipe_code like concat('%', #{pipeCode}, '%')</if>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="countPipeLength" resultType="double">
         select sum(pipe_length) from t_pipe
+        where is_del = '0'
     </select>
         
     <insert id="insertTPipe" parameterType="TPipe" useGeneratedKeys="true" keyProperty="pipeId">
@@ -101,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="iconUrl != null">icon_url = #{iconUrl},</if>
             <if test="installationTime != null">installation_time = #{installationTime},</if>
             <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
         </trim>
         where pipe_id = #{pipeId}

gassafety-system/src/main/resources/mapper/system/TUserLocationMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTUserLocationVo">
-        select location.location_id, location.user_id, location.longitude, location.latitude, location.create_time,(SELECT sysU.user_name FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS userName from t_user_location location
+        select location.location_id, location.user_id, location.longitude, location.latitude, location.create_time,(SELECT sysU.user_name FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS userName,(SELECT sysU.phonenumber FROM sys_user sysU WHERE sysU.user_id = location.user_id) AS phonenumber from t_user_location location
     </sql>
 
     <select id="selectTUserLocationList" parameterType="TUserLocation" resultMap="TUserLocationResult">
@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="latitude != null "> and latitude = #{latitude}</if>
             <if test="beginTime != null and endTime != null"> and create_time BETWEEN #{beginTime} AND #{endTime}</if>
         </where>
+        <if test="userName !=null and userName != ''">HAVING userName LIKE concat('%', #{userName}, '%')</if>
         ORDER BY create_time DESC
         <if test="initInspectors == 'initInspectors'">
             LIMIT 1

gassafety-web/src/api/riskManagement/hiddenTrouble.js

@@ -9,6 +9,15 @@ export function listHiddenTrouble(query) {
   })
 }
 
+//地图隐患初始化
+export function getMapHiddenTroublelist(query) {
+  return request({
+    url: '/riskManagement/hiddenTrouble/getMapHiddenTroublelist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询隐患信息详细
 export function getHiddenTrouble(troubleId) {
   return request({

gassafety-web/src/components/PopWindowGis/lineInfoWindowWarn.vue

@@ -83,6 +83,11 @@
         <div>
           详细信息：<span>{{ alarmValue ? alarmValue : "-" }}</span>
         </div>
+        <div v-if="!orderId">
+          工单编号：<span>{{
+            obj.polyline.getExtData().lineData.orderId
+          }}</span>
+        </div>
       </div>
       <div @click.stop="stopPropatation" class="btn">
         <span @mousedown.stop="deviceMore">
@@ -91,6 +96,9 @@
         <span v-if="orderId" @mousedown.stop="createWork">
           <el-button class="elbtn" type="primary">生成工单</el-button>
         </span>
+        <span v-else @mousedown.stop="checkWork">
+          <el-button class="elbtn" type="primary">查看工单</el-button>
+        </span>
       </div>
     </div>
   </div>
@@ -151,29 +159,35 @@ export default {
         this.obj.polyline.getExtData().lineData.alarmId;
       this.obj.polyline.getExtData().lineData.view.$refs.CreateWork.open = true;
       // 改变外层回调
-
-      this.obj.polyline.getExtData().lineData.view.CreateWorkCallBack =
-        this.CreateWorkCallBack;
+      this.obj.polyline.getExtData().lineData.view.alarmObjChange({
+        alarmId: this.obj.polyline.getExtData().lineData.alarmId,
+        type: "pipe",
+      });
+      // this.obj.polyline.getExtData().lineData.view.CreateWorkCallBack(this.CreateWorkCallBack)
     },
-    close() {
-      this.obj.polyline.infoWindow.close();
+    checkWork() {
+      this.obj.polyline.getExtData().class.view.$router.push({
+        path: "/basicsInfo/detail",
+        query: {
+          orderId: this.obj.polyline.getExtData().lineData.orderId,
         },
-    CreateWorkCallBack() {
-      console.log("polylineCallBack");
-      const polyline = this.obj.polyline
-        .getExtData()
-        .lineData.view.gaoMap.polyLines.filter((item) => {
-          return (
-            item.getExtData().lineData.alarmId ==
-            this.obj.polyline.getExtData().lineData.alarmId
-          );
-        })[0];
-      console.log("polyline.getExtData()", polyline.getExtData().lineData);
-      let options = polyline.getExtData();
-      // 暂时传值，到时候回重新刷新
-      options.lineData.orderId = "1";
-      polyline.setExtData(options);
+      });
     },
+    // // CreateWorkCallBack(e) {
+    // //   console.log("生成工单后传过来的参数", e);
+    // //   const polyline = this.obj.polyline
+    // //     .getExtData()
+    // //     .lineData.view.gaoMap.polyLines.filter((item) => {
+    // //       return (
+    // //         item.getExtData().lineData.alarmId ==
+    // //         this.obj.polyline.getExtData().lineData.alarmId
+    // //       );
+    // //     })[0];
+    // //   let options = polyline.getExtData();
+    // //   // 暂时传值，到时候回重新刷新
+    // //   options.lineData.orderId = e;
+    // //   polyline.setExtData(options);
+    // },
     deviceMore() {
       console.log(this.obj.polyline.getExtData().lineData);
       this.obj.polyline.getExtData().class.view.$router.push({
@@ -183,6 +197,9 @@ export default {
         },
       });
     },
+    close() {
+      this.obj.polyline.infoWindow.close();
+    },
   },
 };
 </script>

gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue

@@ -70,6 +70,9 @@
         <div>
           详细信息：<span>{{ data.alarmValue ? data.alarmValue : "-" }}</span>
         </div>
+        <div v-if="!orderId">
+          工单编号：<span>{{ data.orderId }}</span>
+        </div>
       </div>
       <div class="btn">
         <span @mousedown.stop="deviceMore">
@@ -83,6 +86,9 @@
             >生成工单</el-button
           >
         </span>
+        <span v-else @mousedown.stop="checkWork">
+          <el-button class="elbtn" type="primary">查看工单</el-button>
+        </span>
       </div>
     </div>
   </div>
@@ -115,19 +121,24 @@ export default {
       this.data.view.$refs.CreateWork.open = true;
       this.data.view.$refs.CreateWork.gaoMap = this.data.view.gaoMap;
       // 改变外层回调
-      this.data.view.CreateWorkCallBack = this.CreateWorkCallBack;
+      // this.data.view.CreateWorkCallBack = this.CreateWorkCallBack;
+      this.data.view.alarmObjChange({
+        alarmId: this.data.alarmId,
+        type: "device",
+      });
     },
-    CreateWorkCallBack() {
-      // console.log("markerCallBack")
-      const marker = this.data.view.gaoMap.markers.filter((item) => {
-        return item.getExtData().alarmId == this.data.alarmId;
-      })[0];
+    // CreateWorkCallBack(e) {
+    //   // console.log("生成工单后传过来的参数", e);
+    //   // console.log("markerCallBack");
+    //   const marker = this.data.view.gaoMap.markers.filter((item) => {
+    //     return item.getExtData().alarmId == this.data.alarmId;
+    //   })[0];
     //   console.log("marer.getExtData()", marker.getExtData());
-      let options = marker.getExtData();
-      // 暂时传值，到时候回重新刷新
-      options.orderId = "1";
-      marker.setExtData(options);
-    },
+    //   let options = marker.getExtData();
+    //   // 暂时传值，到时候回重新刷新
+    //   options.orderId = e;
+    //   marker.setExtData(options);
+    // },
     deviceMore() {
       this.data.view.$router.push({
         path: "/deviceAlarm/alarmdetail",
@@ -136,6 +147,15 @@ export default {
         },
       });
     },
+    // 查看工单
+    checkWork() {
+      this.data.view.$router.push({
+        path: "/basicsInfo/detail",
+        query: {
+          orderId: this.data.orderId,
+        },
+      });
+    },
   },
   beforeDestroy() {
     // this.data.view.createWorkOpen = false;

gassafety-web/src/utils/gaodeMapView.js

@@ -351,6 +351,7 @@ class gaodeMap {
       e.target.content = this.getMarketContent( e.target.data);
       e.target.infoWindow.setContent(e.target.content);
       e.target.infoWindow.open(map, e.target.getPosition());
+      console.log("e.target.getPosition()",e.target.getExtData())
       this.boxCollision(e.target.infoWindow.dom);
       // that.addCloneDome(e.target, infoWindow);
       // infoWindow.close();

gassafety-web/src/views/enterprise/mapView/components/CreateWork.vue

@@ -48,11 +48,10 @@
         >确 定</el-button
       >
       <!-- <el-button @click="cancel">取 消</el-button> -->
-      <el-button>取 消</el-button>
+      <el-button @click.stop="close">取 消</el-button>
     </div>
   </el-dialog>
 </template>
-
 <script>
 import { inspectorList } from "@/api/system/user";
 import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
@@ -76,12 +75,12 @@ export default {
         appointInspector: "",
         remarks: "",
       },
-      gaoMap:"",
+      gaoMap: "",
       open: false,
       title: "",
       inspector: [],
       loading: false,
-      alarmId:"",
+      alarmId: "",
       rules: {
         orderName: [
           { required: true, message: "工单名称不能为空", trigger: "blur" },
@@ -100,7 +99,7 @@ export default {
     open(value, oldValue) {
       if (value) {
         console.log(this.alarmId);
-        this.handleIssue(this.alarmId) 
+        this.handleIssue(this.alarmId);
       }
     },
   },
@@ -130,14 +129,18 @@ export default {
           this.form.resourceId = this.form.alarmId;
           this.form.orderType = "3";
           addBasicsInfo(this.form).then((response) => {
+            if (response.code == 200) {
+              console.log(response.msg);
               this.msgSuccess("生成工单成功");
               this.open = false;
-            this.$emit("callback");
+            }
+            this.$emit("callback", 999);
           });
         }
       });
     },
     close() {
+      console.log("关闭");
       this.open = false;
     },
   },

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -77,12 +77,14 @@
 
     <div ref="drawer" class="drawer" :class="{ back: backFlag }">
       <div class="switch" @click="backFlag = !backFlag">
-        <i
+        <!-- <i
           :class="{
             'el-icon-arrow-left': !backFlag,
             'el-icon-arrow-right': backFlag,
           }"
-        ></i>
+        ></i> -->
+        <img v-if="!backFlag" src="@/assets/images/l.png" alt="" />
+        <img v-else src="@/assets/images/r.png" alt="" />
         <!-- <i class="el-icon-arrow-right"></i> -->
       </div>
       <!-- 只能动态传入内嵌盒子的高 -->
@@ -132,6 +134,8 @@
                 class="animate"
                 v-show="arrowRightNum.indexOf(item.value) >= 0"
               >
+                <!-- 有数据 -->
+                <template v-if="item.list.length > 0">
                   <!-- 设备以及管道 展示内容是一样的 -->
                   <template v-if="item.value != 9">
                     <div>
@@ -148,7 +152,9 @@
                         @mousedown.stop="panToo(iten, item)"
                       >
                         <div class="no">{{ iten.no + 1 }}</div>
-                      <div :title="iten.code" class="code">{{ iten.code }}</div>
+                        <div :title="iten.code" class="code">
+                          {{ iten.code }}
+                        </div>
                         <div :title="iten.deviceName" class="name">
                           {{ iten.deviceName }}
                         </div>
@@ -161,6 +167,7 @@
                       <div class="thead">
                         <div class="no">序号</div>
                         <div class="code">人员姓名</div>
+                        <div class="name">联系电话</div>
                       </div>
                       <div
                         class="deviceList"
@@ -173,6 +180,9 @@
                         <div :title="iten.userName" class="code">
                           {{ iten.userName }}
                         </div>
+                        <div :title="iten.userPhone" class="name">
+                          {{ iten.userPhone ? iten.userPhone : "-" }}
+                        </div>
                       </div>
                     </div>
                   </template>
@@ -199,6 +209,11 @@
                       >
                     </div>
                   </div>
+                </template>
+                <!-- 无数据 -->
+                <template v-else>
+                  <div style="padding-left: 5px">暂无数据</div>
+                </template>
               </div>
             </el-collapse-transition>
           </div>
@@ -317,7 +332,7 @@ export default {
       // 是否显示生成工单弹框
       createWorkOpen: false,
       // 查询用的
-      alarmId: "",
+      alarmObj: { alarmId: "", type: "" },
       //  左边抽屉 内嵌scroll盒子的高
       boxHeight: "",
       //抽屉是否收回
@@ -422,8 +437,8 @@ export default {
       });
     },
     //值班人员
-    getInspectorLocations() {
-      return getInspectorLocations().then((res) => {
+    getInspectorLocations(queryParams) {
+      return getInspectorLocations(queryParams).then((res) => {
         if (res.code == 200) {
           console.log(" 值班人员", res);
           // 把值班人员传进类里
@@ -469,6 +484,7 @@ export default {
             const pipeId = item.getExtData().lineData.pipeId;
             return deviceId == pipeId;
           })[0];
+          if (polyline) {
             let options = polyline.getExtData();
             // 增加一个报警状态
             // 如果有endtime说明状态已经不是报警状态了，要归位，所有东西都要变回来
@@ -494,6 +510,7 @@ export default {
               console.log("管道报警");
             }
             polyline.setExtData(options);
+          }
         });
       }
 
@@ -508,8 +525,8 @@ export default {
             const id = item.getExtData().deviceId;
             return deviceId == id;
           })[0];
+          if (device) {
             const options = device.getExtData();
-
             // 增加一个报警状态
             // 如果有endtime说明状态已经不是报警状态了，要归位，所有东西都要变回来
             options.view = this;
@@ -559,6 +576,7 @@ export default {
                 );
               }
             }
+          }
         });
       }
       if (this.ws) return;
@@ -566,12 +584,12 @@ export default {
     },
     socket() {
       console.log("socket执行");
-      // this.ws = new WebSocket(
-      //   "ws://36.148.23.59:8901/gassafety/websocketServer"
-      // );
       this.ws = new WebSocket(
-        "ws://192.168.2.23:8903/gassafety/websocketServer"
+        "ws://36.148.23.59:8901/gassafety/websocketServer"
       );
+      // this.ws = new WebSocket(
+      //   "ws://192.168.2.23:8903/gassafety/websocketServer"
+      // );
       this.ws.onopen = (evt) => {
         console.log("WebSockets=======gogogog");
         // this.ws.send("WebSockets!=========================");
@@ -707,7 +725,7 @@ export default {
     },
     panToo(iten, item) {
       // 如果没打对勾，就啥也不干
-      if(!this.leftBarNum.includes(item.value) ) return
+      if (!this.leftBarNum.includes(item.value)) return;
 
       // 如果地图太大了就吸纳是不出来infowindow了，所以要固定缩放比例
       this.gaoMap.myMap.setZoom(11);
@@ -793,7 +811,6 @@ export default {
       };
     },
 
-
     // 向右的箭头的动画
     arrowRightChange(item) {
       const index = this.arrowRightNum.indexOf(item.value);
@@ -897,6 +914,7 @@ export default {
           no: index,
           userId: item.userId,
           userName: item.userName,
+          userPhone: item.phone,
         };
       });
       console.log("值班人员", workManArr);
@@ -919,7 +937,11 @@ export default {
             );
           });
           item.maxPage = Math.ceil(this.allList[index].length / num);
+        }else{
+          // 如果为空，就直接把item.list写成[];
+          item.list=[];
         }
+
       });
     },
     pageBack(item) {
@@ -1057,7 +1079,7 @@ export default {
       // map.remove(this.gaodeMap.markerOverlays);
     },
     // 搜索
-    search() {
+    async search() {
       this.searchClear();
       map.clearMap();
       this.gaoMap.placeSearch.clear();
@@ -1070,14 +1092,36 @@ export default {
         this.gaoMap.searchSelectAdcode = undefined;
         this.gaoMap.searchSelectName = undefined;
       } else {
-        this.gaoMap.placeSearch.search(this.keyWord);
-        this.getDeviceInfo({ deviceName: this.keyWord });
+        // 左边全选
+        this.leftBarNum = [1, 2, 3, 4, 7, 8, 9];
+        // 右转箭头的样式active判定
+        this.arrowRightNum = [];
+        // 清空左边列表
+        // this.changeBtnDataClear();
+        // this.gaoMap.placeSearch.search(this.keyWord);
+        await this.getDeviceInfo({ deviceName: this.keyWord });
         this.gaoMap.polyLines = [];
-        this.getPipeList({ pipeName: this.keyWord });
+        await this.getPipeList({ pipeName: this.keyWord });
         // 值班人员
-        this.getInspectorLocations();
+        await this.getInspectorLocations({ userName: this.keyWord });
+
+        // 设备报警
+        this.getSelectAlarmDevice();
+        this.pipeList();
+        console.log(this.changeBtnData);
+        console.log(this.allList)
       }
     },
+    // 清空左边列表
+    changeBtnDataClear() {
+      this.allList = [];
+      this.changeBtnData.forEach((item) => {
+        // 清空list
+        item.list = [];
+        item.maxPage = 99;
+        item.nowPage = 1;
+      });
+    },
     // 新建下拉列表关闭 window点击事件
     barClose() {
       // 一点windowbottomData显示
@@ -1110,21 +1154,32 @@ export default {
     openChange(bool) {
       this.createWorkOpen = bool;
     },
-    CreateWorkCallBack() {
-      if (!this.alarmId) return;
-      // 工单弹框生成之后执行的方法
+    // 生成工单的回调
+    CreateWorkCallBack(e) {
+      if (!this.alarmObj.alarmId) return;
+      console.log("alarmObj", this.alarmObj);
+      if (this.alarmObj.type == "pipe") {
+        const polyline = this.gaoMap.polyLines.filter((item) => {
+          return item.getExtData().lineData.alarmId == this.alarmObj.alarmId;
+        })[0];
+        let options = polyline.getExtData();
+        // 暂时传值，到时候回重新刷新
+        options.lineData.orderId = e;
+        polyline.setExtData(options);
+      } else {
         const marker = this.gaoMap.markers.filter((item) => {
-        return item.getExtData().alarmId == this.alarmId;
+          return item.getExtData().alarmId == this.alarmObj.alarmId;
         })[0];
-      console.log("marer.getExtData()", marker.getExtData());
         let options = marker.getExtData();
         // 暂时传值，到时候回重新刷新
-      options.orderId = "1";
+        options.orderId = e;
         marker.setExtData(options);
+      }
+      // 工单弹框生成之后执行的方法
     },
-    alarmIdChange(alarmId) {
-      this.alarmId = alarmId;
-      console.log(alarmId);
+    alarmObjChange(obj) {
+      this.alarmObj = obj;
+      console.log(this.alarmObj);
     },
   },
 
@@ -1323,10 +1378,10 @@ input[type="radio"] {
   .switch {
     position: absolute;
     font-size: 30px;
-    right: -15px;
+    right: -27px;
     top: 50%;
     margin-top: -30px;
-    width: 25px;
+    width: 40px;
     border-radius: 40%;
     overflow: hidden;
     cursor: pointer;