Merge remote-tracking branch 'origin/master'

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

@@ -135,7 +135,8 @@ export default {
         path: "/dataMonitoring/realtimedetail",
         query: {
           deviceId: this.obj.polyline.getExtData().lineData.pipeId,
-          deviceType:"0"
+          //这里是传数字
+          deviceType:"0",
         },
       });
     },

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

@@ -167,7 +167,7 @@ export default {
     },
     checkWork() {
       this.obj.polyline.getExtData().class.view.$router.push({
-        path: "/basicsInfo/detail",
+        path: "/workOrder/detail",
         query: {
           orderId: this.obj.polyline.getExtData().lineData.orderId,
         },
@@ -191,9 +191,10 @@ export default {
     deviceMore() {
       console.log(this.obj.polyline.getExtData().lineData);
       this.obj.polyline.getExtData().class.view.$router.push({
-        path: "/deviceAlarm/alarmdetail",
+        path: "/dataMonitoring/alarmdetail",
         query: {
           alarmId: this.obj.polyline.getExtData().lineData.alarmId,
+          deviceType:"管道"
         },
       });
     },

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

@@ -91,9 +91,10 @@ export default {
     moment,
     deviceMore() {
       this.data.class.view.$router.push({
-        path: "/realtimeData/realtimedetail",
+        path: "/dataMonitoring/realtimedetail",
         query: {
           deviceId: this.data.deviceId,
+          deviceType: this.data.deviceType,
         },
       });
     },

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

@@ -104,6 +104,16 @@ export default {
     data: {},
     map: null,
   },
+  data() {
+    return {
+      deviceType: {
+        1: "调压箱",
+        2: "阀门井",
+        3: "流量计",
+        4: "智能燃气表",
+      },
+    };
+  },
   computed: {
     orderId() {
       // 如果已经生成过工单，就不能再次生成了
@@ -141,16 +151,17 @@ export default {
     // },
     deviceMore() {
       this.data.view.$router.push({
-        path: "/deviceAlarm/alarmdetail",
+        path: "/dataMonitoring/alarmdetail",
         query: {
           alarmId: this.data.alarmId,
+          dcviceType: this.deviceType[this.data.deviceType],
         },
       });
     },
     // 查看工单
     checkWork() {
       this.data.view.$router.push({
-        path: "/basicsInfo/detail",
+        path: "/workOrder/detail",
         query: {
           orderId: this.data.orderId,
         },