Merge branch 'develop_jzl'

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;
-    },
-    close() {
-      this.obj.polyline.infoWindow.close();
+      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)
     },
-    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);
+    checkWork() {
+      this.obj.polyline.getExtData().class.view.$router.push({
+        path: "/basicsInfo/detail",
+        query: {
+          orderId: this.obj.polyline.getExtData().lineData.orderId,
+        },
+      });
     },
+    // // 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;
-    },
-    CreateWorkCallBack() {
-      // 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);
+      // this.data.view.CreateWorkCallBack = this.CreateWorkCallBack;
+      this.data.view.alarmObjChange({
+        alarmId: this.data.alarmId,
+        type: "device",
+      });
     },
+    // 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 = 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

@@ -334,7 +334,7 @@ class gaodeMap {
       map.setZoom("11");
     }
     //map.setFitView();
-
+    
     function infoClose(e) {
       let options = map.getStatus();
       options.scrollWheel = true;
@@ -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) => {
-            this.msgSuccess("生成工单成功");
-            this.open = false;
-            this.$emit("callback");
+            if (response.code == 200) {
+              console.log(response.msg);
+              this.msgSuccess("生成工单成功");
+              this.open = false;
+            }
+            this.$emit("callback", 999);
           });
         }
       });
     },
     close() {
+      console.log("关闭");
       this.open = false;
     },
   },