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">
-        <el-button class="elbtn" type="primary">设备详情</el-button>
+        <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">
-        <el-button class="elbtn" type="primary">设备详情</el-button>
+        <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/views/dataMonitoring/deviceAlarm/index.vue

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