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

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

@@ -81,7 +81,10 @@
         <div>详细信息：<span>管线两端设备压差较大，管线可能泄漏</span></div>
       </div> -->
       <div class="btn">
+        <span @mousedown.stop="deviceMore">
           <el-button class="elbtn" type="primary">设备详情</el-button>
+        </span>
+
         <!-- <el-button class="elbtn" type="primary">生成工单</el-button> -->
       </div>
     </div>
@@ -107,7 +110,7 @@ export default {
   methods: {
     moment,
     mousedown(e) {
-      console.log("?")
+      console.log("?");
       return;
       // console.log(this.$refs.previewImg)
       this.$refs.previewImg.showViewer = true;
@@ -126,6 +129,15 @@ export default {
     close() {
       this.obj.polyline.infoWindow.close();
     },
+    deviceMore() {
+      console.log(this.obj.polyline.getExtData().lineData)
+      this.obj.polyline.getExtData().class.view.$router.push({
+        path: "/realtimeData/realtimedetail",
+        query: {
+          deviceId: this.obj.polyline.getExtData().lineData.pipeId,
+        },
+      });
+    },
   },
 };
 </script>
@@ -141,7 +153,7 @@ export default {
   .top {
     width: 100%;
     height: 51px;
-    background-color: #053B6A;
+    background-color: #053b6a;
     .text {
       font-weight: 600;
       font-size: 16px;
@@ -230,7 +242,7 @@ export default {
       box-sizing: border-box;
       padding: 10px 0 2px 22px;
       border-bottom: 1px solid #e2e2e2;
-      color:#FE5966;
+      color: #fe5966;
       & > div {
         font-size: 14px;
         font-weight: 400;

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

@@ -85,7 +85,7 @@
         </div>
       </div>
       <div @click.stop="stopPropatation" class="btn">
-        <span>
+        <span @mousedown.stop="deviceMore">
           <el-button class="elbtn" type="primary">设备详情</el-button>
         </span>
         <span v-if="orderId" @mousedown.stop="createWork">
@@ -160,17 +160,29 @@ export default {
     },
     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];
+      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);
     },
+    deviceMore() {
+      console.log(this.obj.polyline.getExtData().lineData);
+      this.obj.polyline.getExtData().class.view.$router.push({
+        path: "/deviceAlarm/alarmdetail",
+        query: {
+          alarmId: this.obj.polyline.getExtData().lineData.alarmId,
+        },
+      });
+    },
   },
 };
 </script>

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

@@ -68,7 +68,9 @@
         <div>详细信息：<span>管线两端设备压差较大，管线可能泄漏</span></div>
       </div> -->
       <div class="btn">
+        <span @mousedown.stop="deviceMore">
           <el-button class="elbtn" type="primary">设备详情</el-button>
+        </span>
         <!-- <el-button class="elbtn" type="primary">生成工单</el-button> -->
       </div>
     </div>
@@ -87,6 +89,14 @@ export default {
   },
   methods: {
     moment,
+    deviceMore() {
+      this.data.class.view.$router.push({
+        path: "/realtimeData/realtimedetail",
+        query: {
+          deviceId: this.data.deviceId,
+        },
+      });
+    },
   },
 };
 </script>

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

@@ -72,7 +72,7 @@
         </div>
       </div>
       <div class="btn">
-        <span>
+        <span @mousedown.stop="deviceMore">
           <el-button class="elbtn" type="primary">设备详情</el-button>
         </span>
         <span v-if="orderId" @mousedown.stop="createWork">
@@ -115,10 +115,9 @@ 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;
     },
     CreateWorkCallBack() {
-
       // console.log("markerCallBack")
       const marker = this.data.view.gaoMap.markers.filter((item) => {
         return item.getExtData().alarmId == this.data.alarmId;
@@ -129,6 +128,14 @@ export default {
       options.orderId = "1";
       marker.setExtData(options);
     },
+    deviceMore() {
+      this.data.view.$router.push({
+        path: "/deviceAlarm/alarmdetail",
+        query: {
+          alarmId: this.data.alarmId,
+        },
+      });
+    },
   },
   beforeDestroy() {
     // this.data.view.createWorkOpen = false;

gassafety-web/src/utils/gaodeMapView.js

@@ -48,6 +48,8 @@ class gaodeMap {
   showInfoWindow = null;
   // 工人轨迹用的窗口
   markerPassedPolylineInfoWindow = null;
+  view = null;
+  handleInfoWindowOpenFunc = null;
 
   //构造函数中设置中央点默认值
   constructor(center) {
@@ -100,8 +102,15 @@ class gaodeMap {
       // console.log("缩放开始")
       this.closeInfoWindow();
     });
+    this.myMap.on("moveend", () => {
+      if (this.handleInfoWindowOpenFunc) {
+        this.handleInfoWindowOpenFunc();
+        this.handleInfoWindowOpenFunc = null;
+      }
+    });
     this.districtBoundaries();
   }
+  // 地图移动结束
 
   /**
    * 获取map
@@ -155,7 +164,10 @@ class gaodeMap {
       }
     });
   }
-
+  // 地图中点平移
+  panTo(lnglat) {
+    this.myMap.panTo(lnglat);
+  }
   /**
    * 添加Market
    * @param markerType
@@ -215,18 +227,22 @@ class gaodeMap {
       //   // console.log(Card)
       //   // e.target.content = this.getMarketContent(data);
       // });
-      marker.on("mouseover", e => {
-        that.markerType = markerType;
-        e.target.content = this.getMarketContent(data);
-        infoWindow.setContent(e.target.content);
-        infoWindow.open(map, e.target.getPosition());
-        that.boxCollision(infoWindow.dom);
-        // that.addCloneDome(e.target, infoWindow);
-        // infoWindow.close();
-        that.workerManInfoWindow = infoWindow;
-      });
+      // marker.on("mouseover", e => {
+      //   that.markerType = markerType;
+      //   e.target.content = this.getMarketContent(data);
+      //   infoWindow.setContent(e.target.content);
+      //   infoWindow.open(map, e.target.getPosition());
+      //   that.boxCollision(infoWindow.dom);
+      //   // that.addCloneDome(e.target, infoWindow);
+      //   // infoWindow.close();
+      //   that.workerManInfoWindow = infoWindow;
+      // });
+      marker.markerType=markerType;
+      marker.data = data;
+      marker.infoWindow =infoWindow;
+      marker.on("mouseover", this.wokerManOpen);
       marker.on("mousedown", e => {
-        console.log(data);
+        // console.log(data);
         that.closeInfoWindow();
         if (marker.workerPoint) return;
         that.workerManView({
@@ -246,10 +262,10 @@ class gaodeMap {
       DEVICE_TYPE.SMALLINSPECTOR != markerType
     ) {
       // marker.content = this.getMarketContent(data, markerInfoWindow);
-      marker.on("mouseover", infoOpen);
+      marker.infoWindow = infoWindow;
+      marker.on("mouseover", that.infoOpen);
       marker.on("mouseout", infoClose);
       marker.setExtData(data);
-
       that.deviceType = markerType;
       let editWindow = that.createInfowindow("编辑");
       editWindow.fileArr =
@@ -326,16 +342,32 @@ class gaodeMap {
       //infoWindow.close(map, e.target.getPosition());
     }
 
-    function infoOpen(e) {
+    // function infoOpen(e) {}
+
+    return marker;
+  }
+  wokerManOpen=(e)=> {
+      this.markerType =  e.target.markerType;
+      e.target.content = this.getMarketContent( e.target.data);
+      e.target.infoWindow.setContent(e.target.content);
+      e.target.infoWindow.open(map, e.target.getPosition());
+      this.boxCollision(e.target.infoWindow.dom);
+      // that.addCloneDome(e.target, infoWindow);
+      // infoWindow.close();
+      this.workerManInfoWindow = e.target.infoWindow;
+  }
+  
+  // 鼠标移入设备时候实行的函数
+  infoOpen = e => {
     if (e.target.getExtData().alarmState == 1) {
       if (e.target.getExtData().deviceType == 4) {
-          that.markerType = "7";
+        this.markerType = "7";
       } else if (e.target.getExtData().deviceType <= 3) {
-          that.markerType = +e.target.getExtData().deviceType + 1 + "";
+        this.markerType = +e.target.getExtData().deviceType + 1 + "";
       }
-        console.log("that.markerType", that.markerType);
+      // console.log("this.markerType", this.markerType);
       // 警告状态这样就要换infowindow
-        e.target.content = that.getMarketContent(
+      e.target.content = this.getMarketContent(
         e.target.getExtData(),
         markerInfoWindowWarn
       );
@@ -347,12 +379,12 @@ class gaodeMap {
       //     : e.target.getExtData().deviceType + "";
       // 上图状态跟后台状态不统一，所以需要判断一下
       if (e.target.getExtData().deviceType == 4) {
-          that.markerType = "7";
+        this.markerType = "7";
       } else if (e.target.getExtData().deviceType <= 3) {
-          that.markerType = +e.target.getExtData().deviceType + 1 + "";
+        this.markerType = +e.target.getExtData().deviceType + 1 + "";
       }
-        console.log("that.markerType");
-        e.target.content = that.getMarketContent(
+      console.log("this.markerType");
+      e.target.content = this.getMarketContent(
         e.target.getExtData(),
         markerInfoWindow
       );
@@ -361,20 +393,16 @@ class gaodeMap {
     let options = map.getStatus();
     options.scrollWheel = false;
     map.setStatus(options);
-      infoWindow.setContent(e.target.content);
-      infoWindow.open(map, e.target.getPosition());
+    e.target.infoWindow.setContent(e.target.content);
+    e.target.infoWindow.open(map, e.target.getPosition());
 
     // 检测是否碰到底部的bottomData
-      that.boxCollision(infoWindow.dom);
+    this.boxCollision(e.target.infoWindow.dom);
     // that.addCloneDome(e.target, infoWindow);
     // infoWindow.close();
 
-      that.markerInfoWindow = infoWindow;
-    }
-
-    return marker;
-  }
-
+    this.markerInfoWindow = e.target.infoWindow;
+  };
   /**
    * marker添加拖拽事件
    */
@@ -397,7 +425,9 @@ class gaodeMap {
    * @param data
    * @returns {string}
    */
-  getMarketContent(data, markerInfoWindow) {
+  getMarketContent(Data, markerInfoWindow) {
+    let data = { ...Data };
+    data.class = this;
     console.log("this.markerType", this.markerType);
     switch (this.markerType) {
       case DEVICE_TYPE.REGEULATORBOX: {
@@ -703,7 +733,8 @@ class gaodeMap {
           type: "line",
           //当前line状态 0:正常状态 1:正在编辑状态
           isState: 0,
-          lineData: item
+          lineData: item,
+          class: this
         }
       });
 
@@ -711,17 +742,41 @@ class gaodeMap {
       // 信息窗体
       this.newLineAddEvent(polyline);
       //添加事件
-      polyline.on("mouseover", e => {
+      polyline.on("mouseover", this.polylineMouseOver);
+
+      polyline.on("mouseout", e => {
+        // console.log("polyline.getExtData().lineData.alarmState",polyline.getExtData().lineData.alarmState)
+        if (polyline.getExtData().lineData.alarmState == 1) return;
+        polyline.setOptions({ strokeColor: "#F7FE38" });
+        // infoWindow.close();
+      });
+      // 计算info的位置
+      // function infoPosition() {}
+    }
+    map.add(this.polyLines);
+    // 缩放地图到合适的视野级别
+    // map.setFitView();
+  }
+  // 鼠标移入线条执行
+  polylineMouseOver = e => {
+    let polyline = e.target;
     if (this.lineType == 1) return;
     // 生成infoWindow
     let infoWindow;
     // 警告状态时
+    const item = e.target.getExtData().lineData;
+    // console.log("item",item)
+
     if (e.target.getExtData().lineData.alarmState == 1) {
       infoWindow = this.lineMouseOver(polyline, lineInfoWindowWarn, item);
     } else {
       infoWindow = this.lineMouseOver(polyline, lineInfoWindow, item);
     }
     infoWindow.open(map, e.lnglat);
+    console.log(infoWindow);
+    // 如果是鼠标真正移入，则计算位置，如果不是鼠标真正移入，是人为执行出现infowindow，则不计算位置
+    console.log("e.originEvent", e.originEvent);
+    if (e.originEvent) {
       // 上方导航的高
       const topBar = 81;
       // 坐标导航的宽
@@ -768,25 +823,15 @@ class gaodeMap {
       } else {
         polyline.setOptions({ strokeColor: "#FF5A67" });
       }
-        
       infoWindow.setOffset(new AMap.Pixel(X, Y));
+    } else {
+      infoWindow.setOffset(new AMap.Pixel(20, -20));
+    }
     this.boxCollision(infoWindow.dom);
     this.showInfoWindow = infoWindow;
     // const
-      });
-      polyline.on("mouseout", e => {
-        // console.log("polyline.getExtData().lineData.alarmState",polyline.getExtData().lineData.alarmState)
-        if (polyline.getExtData().lineData.alarmState == 1) return;
-        polyline.setOptions({ strokeColor: "#F7FE38" });
-        // infoWindow.close();
-      });
-      // 计算info的位置
-      // function infoPosition() {}
-    }
-    map.add(this.polyLines);
-    // 缩放地图到合适的视野级别
-    // map.setFitView();
-  }
+  };
+
   lineMouseOver(polyline, lineInfoWindow, item) {
     let dom = createPop(lineInfoWindow, {
       obj: { a: 123, editorPage: true, ...item, polyline }

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

@@ -263,7 +263,6 @@ export default {
         vm.fromGisMap=false;
       }
     });
-
   },
   methods: {
     /** 查询报警信息列表 */