Merge remote-tracking branch 'origin/master'

gassafety-web/src/assets/styles/gassafety.scss

@@ -105,18 +105,23 @@
 
 // gis地图中底部table样式
 .drawer {
-  // .el-button {
-  //   color:red;
-  //   .is-disabled {
-  //     background-color: none;
-  //   }
-  // }
-
+  .el-button {
+    color: #ffffff;
+    &:not(.is-disabled):hover {
+      color: rgb(46, 231, 231);
+    }
+    &.is-disabled {
+      border-color: #ccccccc3 !important;
+      color: #ccccccc3;
+    }
+  }
 }
 .right-bottom-data-left {
   .el-table {
     background-color: rgba(0, 0, 0, 0) !important;
-
+    .el-table__body {
+      width: 100% !important;
+    }
     &::before {
       height: 0px !important;
     }
@@ -172,6 +177,39 @@
       }
     }
   }
+  // 滚动条样式
+  .el-table--scrollable-y {
+    .el-table__body-wrapper {
+      &::-webkit-scrollbar {
+        width: 10px;
+        background: #012a53;
+        position: absolute;
+        top: 0;
+      }
+      &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        // border-radius: 10px;
+        // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        background: #00000052;
+        border-radius: 8px;
+      }
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        // border-radius: 10px;
+        // background-color: red;
+      }
+
+      &::-webkit-scrollbar-button:start {
+        // overflow: hidden;
+      }
+      &::-webkit-scrollbar-button:end {
+        // overflow: hidden;
+      }
+
+      // overflow-y: none !important;
+    }
+  }
 }
 // gis地图里抽屉的搜索样式
 .search-input {
@@ -383,7 +421,6 @@
   }
 }
 
-
 // 设备巡检详情页表格样式
 .inspectiondetail {
   .el-table {
@@ -437,3 +474,37 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+// 滚动条公共样式
+.scrollStyle {
+  &::-webkit-scrollbar {
+    width: 10px;
+    background: rgba(6, 29, 51, 0.8)
+
+    // position: absolute;
+    // top: 0;
+  }
+  &::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    // border-radius: 10px;
+    // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: #00000053;
+
+    border-radius: 8px;
+  }
+  &::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    // border-radius: 10px;
+    // background-color: red;
+  }
+
+  &::-webkit-scrollbar-button:start {
+    // overflow: hidden;
+  }
+  &::-webkit-scrollbar-button:end {
+    // overflow: hidden;
+  }
+
+  // overflow-y: none !important;
+}

gassafety-web/src/components/PopWindow/lineInfoWindow.vue

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

gassafety-web/src/components/PopWindow/markerInfoWindow.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

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

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 报警设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

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

@@ -8,7 +8,7 @@
     </div>
 
     <!-- 报警设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <!-- <div :title="obj.pipeName" class="eq-text">

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

@@ -8,7 +8,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

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

@@ -10,7 +10,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

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

@@ -10,7 +10,7 @@
       </div>
     </div>
     <!-- 设备信息 -->
-    <div class="content">
+    <div class="content  scrollStyle">
       <div class="eq-content display-default">
         <div class="text-wrapper">
           <div class="eq-text">

gassafety-web/src/components/mapDialog/js/gaodeMapDialog.js

@@ -9,6 +9,8 @@ import { delDeviceInfo } from "@/api/device/deviceInfo";
 import markerInfoWindow from "@/components/PopWindow/markerInfoWindow.vue";
 import { getArray } from "@/utils/gassafety.js";
 import { delPipe } from "@/api/device/pipe.js";
+import { lineColor,mapStyle } from "@/utils/mapCommon.js";
+
 import vue from "@/main";
 let defaultCenter = "石家庄";
 export let map;
@@ -48,7 +50,8 @@ class gaodeMap {
       showLabel: true,
       // labelzIndex: 110,
       pitch: 8,
-      zoom: 12
+      zoom: 12,
+      mapStyle,
       //mapStyle: 'amap://styles/darkblue',
       // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
     });

gassafety-web/src/utils/gaodeMap.js

 import createPop from "./createPop";
-import { lineColor } from "./mapCommon.js";
+import { lineColor,mapStyle } from "./mapCommon.js";
 import regulatorBox from "../components/PopWindow/regulatorBox.vue";
 import valveWell from "../components/PopWindow/valveWell.vue";
 import flowMeter from "../components/PopWindow/flowMeter.vue";
@@ -57,7 +57,7 @@ class gaodeMap {
       // labelzIndex: 110,
       pitch: 8,
       zoom: 9,
-      mapStyle: "amap://styles/1c84d2203793b0f622df2cda53db1afd"
+      mapStyle,
       // mapStyle: 'amap://styles/darkblue',
       // mapStyle: 'amap://styles/3b679a15f448a4740ba2ff7524e1a4ae',
     });

gassafety-web/src/utils/gaodeMapView.js

@@ -15,7 +15,7 @@ import workerManInfowindow from "../components/PopWindowGis/workerManInfowindow.
 import workerManView from "../components/PopWindowGis/workerManView.vue";
 
 import { getArray } from "@/utils/gassafety.js";
-import { lineColor } from "./mapCommon.js";
+import { lineColor,mapStyle } from "./mapCommon.js";
 import { delPipe } from "@/api/device/pipe.js";
 import vue from "../main";
 import { Card } from "element-ui";
@@ -73,7 +73,7 @@ class gaodeMap {
       pitch: 8,
       zoom: 9,
       //mapStyle: 'amap://styles/darkblue',
-      mapStyle: "amap://styles/1c84d2203793b0f622df2cda53db1afd"
+      mapStyle,
     });
     this.myMap = map;
     this.myMap.on("mousedown", e => {
@@ -103,6 +103,8 @@ class gaodeMap {
     // 地图开始平移删除infowindow
     this.myMap.on("movestart", () => {
       // console.log("地图平移");
+      // 如果这个值为真，下面都不执行,trac用的，第一额值班人员的infowindow显示的时候被消掉了
+      if (this.tracMoveFlag) return;
       if (this.leftListClick) {
         console.log("moveStart");
         this.closeInfoWindow();
@@ -113,11 +115,15 @@ class gaodeMap {
     // 地图开始缩放删除infowindow
     this.myMap.on("zoomstart", () => {
       // console.log("缩放开始")
+      this.domAllShow();
+      // 如果这个值为真，下面都不执行,trac用的，第一额值班人员的infowindow显示的时候被消掉了
+      if (this.tracMoveFlag) return;
       this.closeInfoWindow();
-      this.polyLinesColorClear()
-
+      this.polyLinesColorClear();
     });
     this.myMap.on("moveend", () => {
+      this.tracMoveFlag = false;
+
       if (this.handleInfoWindowOpenFunc) {
         this.handleInfoWindowOpenFunc();
         this.handleInfoWindowOpenFunc = null;
@@ -703,6 +709,11 @@ class gaodeMap {
   }
   //
   trackBack(marker, arr, data) {
+    this.tracMoveFlag = true;
+    // 飞过去
+    this.panTo(arr[0]);
+    // 放大
+    this.myMap.setZoom(13);
     // 值班人员轨迹回放
     AMap.plugin("AMap.MoveAnimation", () => {
       let lineArr = arr;
@@ -766,15 +777,30 @@ class gaodeMap {
       });
       // 刚开始的时候要立个点
       let workPoint = this.addMarker(DEVICE_TYPE.SMALLINSPECTOR, data[0]);
+      this.wokerManOpen({
+        target: workPoint,
+        lnglat: workPoint.getExtData().pos
+      });
       marker.pointArr.push(workPoint);
       marker.moveMarker.on("moveend", e => {
         // 如果不是最后一个点，就创建一个新的worderpoint，如果是就不创建，并且把自身删除
+        let z = {};
         if (e.index == lineArr.length - 1) {
+          z = {
+            target: marker,
+            lnglat: e.passedPos
+          };
           map.remove(marker.moveMarker);
         } else {
           workPoint = this.addMarker(DEVICE_TYPE.SMALLINSPECTOR, data[e.index]);
+          // workPoint.infoWindow.open(map,e.passedPos);
+          z = {
+            target: workPoint,
+            lnglat: e.passedPos
+          };
           marker.pointArr.push(workPoint);
         }
+        this.wokerManOpen(z);
       });
       marker.moveMarker.on("moveAlong", () => {
         console.log("moveAlong", e);
@@ -789,6 +815,7 @@ class gaodeMap {
     });
   }
   workerManAttrRemove(marker) {
+    marker.moveMarker && marker.moveMarker.stopMove();
     marker.moveMarker && map.remove(marker.moveMarker);
     marker.polyline && map.remove(marker.polyline);
     marker.passedPolyline && map.remove(marker.passedPolyline);

gassafety-web/src/utils/mapCommon.js

@@ -6,3 +6,4 @@
   "3":"#18FF0F",
   "4":"#DE67FA"
 }
+export const mapStyle="amap://styles/1c84d2203793b0f622df2cda53db1afd";
\ No newline at end of file

gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -697,12 +697,25 @@ export default {
           }
 
           if(this.form.deviceList != null){
+            console.log(this.form.deviceList,"oooooooooooo")
             let device = this.form.deviceList[0];
             console.log("device", device);
             this.dataListdetail.push(device);
             let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,[device.longitude, device.latitude],"containerAlarm");
             this.gaoMap = gaoMap;
-            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, device);
+            if("1" == device.deviceType){
+              this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, device,"false")
+            }
+            if("2" == device.deviceType){
+              this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, device,"false")
+            }
+            if("3" == device.deviceType){
+              this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, device,"false")
+            }
+            if("4" == device.deviceType){
+              this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, device,"false")
+            }
+            // this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, device);
 
             // this.gaoMap.resetMapCenter([device.longitude, device.latitude]);
           }

gassafety-web/src/views/dataMonitoring/realtimedetail/index.vue

@@ -587,18 +587,20 @@
           this.active = parseInt(response.data.orderStatus) + 1;
           let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER,[this.form.longitude, this.form.latitude]);
           this.gaoMap = gaoMap;
-          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
-          // this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
-          console.log("this.form.longitude",this.form.longitude)
-          console.log("this.form", this.form)
-
-          // if (this.form.length > 0) {
-
-          // }
-          // for (var i = 0; i < this.form.length; i++) {
-          //   let obj = this.form[i];
-          //   this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
-          // }
+          if("1" == deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, this.form,"false")
+          }
+          if("2" == deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, this.form,"false")
+          }
+          if("3" == deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, this.form,"false")
+          }
+          if("4" == deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, this.form,"false")
+          }
+          
+        
 
           var getData1 = [];
           var getData2 = [];

gassafety-web/src/views/device/deviceInfoDetail/index.vue

@@ -315,7 +315,19 @@
           // this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);let obj = this.form.deviceList[0];
           let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [obj.longitude, obj.latitude]);
           this.gaoMap = gaoMap;
-          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
+          if("1" == obj.deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, obj,"false")
+          }
+          if("2" == obj.deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, obj,"false")
+          }
+          if("3" == obj.deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, obj,"false")
+          }
+          if("4" == obj.deviceType){
+            this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, obj,"false")
+          }
+          // this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
         });
       },
       getFileInfo(res) {

gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

@@ -63,10 +63,13 @@
             </el-form>
           </el-col>
           <el-col :span="24">
-            <el-table  max-height="175px" :data="form.inspectionDataList" style="width: 89%; margin-left: 30px;">
-              <el-table-column label="设备名称" align="center" prop="deviceName" />
-              <el-table-column label="设备编号" align="center" prop="deviceCode" />
-              <el-table-column label="设备类型" align="center" prop="deviceType" />
+            <el-table :data="form.inspectionDataList" height="130" style="width: 89%;margin-left: 30px;margin-top: -15px;">
+              <el-table-column  label="设备名称" align="center" prop="deviceName">
+              </el-table-column>
+              <el-table-column label="设备编号" align="center" prop="deviceCode">
+              </el-table-column>
+              <el-table-column  label="设备类型" align="center" prop="deviceType">
+              </el-table-column>
               <el-table-column label="处理状态" align="center" prop="dealStatus">
                 <template slot-scope="scope">
                   <span v-if="scope.row.dealStatus == null || scope.row.dealStatus == ''">未处理</span>
@@ -86,7 +89,7 @@
           </el-col>
         </el-col>
         <el-col :span="12">
-          <div id="marbox" style="width: 100%;height: 250px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
+          <div id="marbox" style="width: 100%;height: 270px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);">
             <div style="width: 100%;height: 100%" id="containerInspect"></div>
           </div>
         </el-col>
@@ -124,7 +127,8 @@
                 <!--&lt;!&ndash; <font>{{form.orderId}}</font> &ndash;&gt;-->
                 <template slot-scope="scope">
                   <font v-if="resourceId != undefined">{{form.orderId}}</font>
-                  <el-button type="text" @click="showDetail(form.orderId)" v-if="resourceId == undefined">{{form.orderId}}</el-button>
+                  <el-button type="text" @click="showDetail(form.orderId)" v-if="resourceId == undefined">
+                    {{form.orderId}}</el-button>
                 </template>
               </el-form-item>
             </el-form>
@@ -136,7 +140,8 @@
 
       </div>
       <!-- <el-divider></el-divider> -->
-      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 15px;" v-if="form.planStatus == 0">
+      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 15px;"
+        v-if="form.planStatus == 0">
         <el-button size="normal" type="primary" icon="el-icon-edit" @click="handleIssue(form.planId)"
           v-hasPermi="['workOrder:basicsInfo:add']">生成工单
         </el-button>
@@ -210,14 +215,9 @@
       </div>
     </div>
 
-    <el-dialog
-      title = "工单信息"
-      lock-scroll
-      :visible.sync="dialogVisible"
-      width="70%"
-    >
+    <el-dialog title="工单信息" lock-scroll :visible.sync="dialogVisible" width="70%">
       <div style="height:80vh;overflow:auto">
-        <workOrder :linkOrderId="form.orderId"/>
+        <workOrder :linkOrderId="form.orderId" />
       </div>
     </el-dialog>
   </div>
@@ -235,7 +235,7 @@
   import workOrder from "../../workOrder/detail/index.vue"
 
   export default {
-    props:["resourceId"],
+    props: ["resourceId"],
     name: "InspectionPlanDetail",
     components: {
       workOrder
@@ -342,9 +342,9 @@
       // 如果是跳转来的，则接受初始化参数
       // this.user_id = this.$route.query.id; //详细信息页接收参数
       this.getList();
-      if(this.resourceId){
+      if (this.resourceId) {
         this.planId = this.resourceId;
-      }else{
+      } else {
         this.planId = this.$route.query.planId;
       }
       // this.getDetail();
@@ -380,34 +380,55 @@
           this.form = response.data;
           console.log("this.form", this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
-          if (this.form.deviceList?.length > 0) {
-
-
-            // for (var i = 0; i < this.form.deviceList.length; i++) {
+          const deviceNum = this.form?.deviceList?.length;
+          const pipeNum = this.form?.pipeList?.length;
+          console.log(deviceNum, pipeNum)
+          if (deviceNum > 0 && pipeNum > 0) {
             let obj = this.form.deviceList[0];
-              let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [obj.longitude, obj.latitude],"containerInspect");
+            let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, null, "containerInspect");
             this.gaoMap = gaoMap;
-              if("1" == obj.deviceType){
-                this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, obj,"false")
+            for (let i = 0; i < this.form.deviceList.length; i++) {
+              if ("1" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, this.form.deviceList[i], "false")
               }
-              if("2" == obj.deviceType){
-                this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, obj,"false")
+              if ("2" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, this.form.deviceList[i], "false")
               }
-              if("3" == obj.deviceType){
-                this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, obj,"false")
+              if ("3" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, this.form.deviceList[i], "false")
               }
-              if("4" == obj.deviceType){
-                this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, obj,"false")
+              if ("4" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, this.form.deviceList[i], "false")
               }
-            // }
             }
-
-          if (this.form.pipeList?.length > 0) {
+            for (var i = 0; i < this.form.pipeList.length; i++) {
+              let obj = this.form.pipeList[i];
+              this.gaoMap.onlyLine(obj);
+            }
+          } else if (deviceNum > 0 && pipeNum == 0) {
+            let obj = this.form.deviceList[0];
+            let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, [obj.longitude, obj.latitude], "containerInspect");
+            this.gaoMap = gaoMap;
+            for (let i = 0; i < this.form.deviceList.length; i++) {
+              if ("1" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX, this.form.deviceList[i], "false")
+              }
+              if ("2" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, this.form.deviceList[i], "false")
+              }
+              if ("3" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, this.form.deviceList[i], "false")
+              }
+              if ("4" == obj.deviceType) {
+                this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE, this.form.deviceList[i], "false")
+              }
+            }
+          } else if (deviceNum == 0 && pipeNum > 0) {
             const { coordinates } = this.form.pipeList[0];
             const path1 = eval(coordinates)[0];
             const path2 = eval(coordinates)[1];
             const path3 = [(Number(path1[0]) + Number(path2[0])) / 2, (Number(path1[1]) + Number(path2[1])) / 2];
-            let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, path3,"containerInspect");
+            let gaoMap = new gaodeMap(process.env.VUE_APP_MAP_CENTER, path3, "containerInspect");
             this.gaoMap = gaoMap;
             for (var i = 0; i < this.form.pipeList.length; i++) {
               let obj = this.form.pipeList[i];
@@ -415,7 +436,6 @@
             }
           }
 
-
           if (this.form.orderType == '1') {
             // 获取设备列表树
             let data = {
@@ -667,4 +687,11 @@
     font-size: 15px;
     font-weight: 900;
   }
+  .el-table::before {
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 0px;
+}
+  
 </style>
\ No newline at end of file

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -171,7 +171,7 @@
               </el-timeline-item>
             </el-timeline>
           </div>
-          <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
+          <div style="width: 95%;position: relative;" @click="changeDisplay()">
             <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;margin-bottom: 15px;">
               <span style="text-decoration:underline;">显示全部</span>
             </i>
@@ -627,7 +627,7 @@ export default {
       });
     },
       // 点击按钮显示隐藏
-      changeDisplay(e) {
+      changeDisplay() {
         this.isDisplay = !this.isDisplay
         let $timeline = this.$refs.timeline;
         if (!this.showAndHide) {