55555

gassafety-web/src/utils/gaodeMap.js

@@ -1150,7 +1150,7 @@ class gaodeMap {
     });
     let infoWindow = new AMap.InfoWindow({
       isCustom: true,
-      content: `<span style='border:1px solid #80d8ff;background:#fff'>${pipeName}</span>`,
+      content: `<div style='max-width:150px;border:1px solid #80d8ff;background:#fff'>${pipeName}</div>`,
       anchor: "left-top",
       offset: new AMap.Pixel(20, -20)
     });
@@ -1167,9 +1167,11 @@ class gaodeMap {
       infoWindow.close();
     });
     map.add(polyline);
-    const path = eval(coordinates)[0];
+    const path1 = eval(coordinates)[0];
+    const path2 = eval(coordinates)[1];
     // map.setFitView();
-    map.setCenter([+path[0], +path[1]], false);
+    const path3 = [(Number(path1[0])+Number(path2[0]) )/2 ,(Number(path1[1])+Number(path2[1]) )/2];
+    map.setCenter(path3, false);
 
     // const lntlat = eval(coordinates)[0];
     // map.panTo(lntlat)

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

@@ -281,8 +281,8 @@ export default {
       this.getDetail();
     },
     mounted() {
-      let gaoMap = new gaodeMap("石家庄");
-      this.gaoMap = gaoMap;
+      // let gaoMap = new gaodeMap("石家庄");
+      // this.gaoMap = gaoMap;
     },
     methods: {
       initData(getData1, getData2, getData3) {
@@ -663,6 +663,13 @@ export default {
 
           if(this.form.pipeList != null){
             let pipe = this.form.pipeList[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("石家庄",path3);
+            this.gaoMap=gaoMap;
             console.log("pipe", pipe);
             this.dataListdetail.push(pipe);
             this.gaoMap.onlyLine(pipe);
@@ -672,8 +679,11 @@ export default {
             let device = this.form.deviceList[0];
             console.log("device", device);
             this.dataListdetail.push(device);
-            this.gaoMap.resetMapCenter([device.longitude, device.latitude]);
+            let gaoMap = new gaodeMap("石家庄",[device.longitude, device.latitude]);
+            this.gaoMap = gaoMap;
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, device);
+
+            // this.gaoMap.resetMapCenter([device.longitude, device.latitude]);
           }
 
           var getData1 = [];

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

@@ -6,14 +6,17 @@
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
-            <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
+            <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png"
+                style="width: 25px;" alt=""></div>
           </div>
         </el-col>
       </el-row>
       <el-row style="width: 100%;height: 45px;">
         <el-col :span="24">
           <div style="">
-            <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">管道管理详情</li></ul>
+            <ul>
+              <li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">管道管理详情</li>
+            </ul>
           </div>
         </el-col>
       </el-row>
@@ -22,7 +25,9 @@
       <el-row style="width: 100%;">
         <el-col :span="24">
           <div style="color: #31EAEA;height: 25px;">
-            <ul><li>详细信息</li></ul>
+            <ul>
+              <li>详细信息</li>
+            </ul>
           </div>
         </el-col>
       </el-row>
@@ -70,27 +75,18 @@
           </el-form>
         </el-col>
         <el-col :span="11">
-          <div id="marbox" style="width: 100%;height: 390px;margin-top: -35px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+          <div id="marbox"
+            style="width: 100%;height: 390px;margin-top: -35px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </el-col>
       </el-row>
 
       <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
-        <el-button
-          size="normal"
-          type="primary"
-          icon="el-icon-edit"
-          @click="handleUpdate(form)"
-          v-hasPermi="['device:pipe:edit']"
-        >修改</el-button>
-        <el-button
-          size="normal"
-          type="primary"
-          icon="el-icon-delete"
-          @click="handleDelete(form)"
-          v-hasPermi="['device:pipe:remove']"
-        >删除</el-button>
+        <el-button size="normal" type="primary" icon="el-icon-edit" @click="handleUpdate(form)"
+          v-hasPermi="['device:pipe:edit']">修改</el-button>
+        <el-button size="normal" type="primary" icon="el-icon-delete" @click="handleDelete(form)"
+          v-hasPermi="['device:pipe:remove']">删除</el-button>
 
 
         <!-- 添加或修改管道信息对话框 -->
@@ -109,10 +105,7 @@
             <el-col :span="12">
               <el-form-item label="管道长度" prop="pipeLength">
                 <el-input type="number" min="0" v-model="editForm.pipeLength" placeholder="请输入管道长度">
-                  <i
-                    slot="suffix"
-                    style="color: #000; font-style: normal; margin-right: 10px"
-                  >米</i>
+                  <i slot="suffix" style="color: #000; font-style: normal; margin-right: 10px">米</i>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -153,24 +146,15 @@
             </el-col>
             <el-col>
               <el-form-item label="管道图片上传" prop="iconUrl">
-                <MyFileUpload
-                  listType="picture-card"
-                  @resFun="getFileInfo"
-                  @remove="listRemove"
-                  :fileArr="fileList"
-                />
+                <MyFileUpload listType="picture-card" @resFun="getFileInfo" @remove="listRemove" :fileArr="fileList" />
                 <el-input v-show="false" disabled v-model="editForm.iconUrl"></el-input>
               </el-form-item>
             </el-col>
             <el-col>
               <el-form-item label="安装日期" prop="installationTime">
                 <el-col :span="11">
-                  <el-date-picker clearable size="small"
-                                  style="width: 100%"
-                                  v-model="editForm.installationTime"
-                                  type="date"
-                                  value-format="yyyy-MM-dd"
-                                  placeholder="请选择安装日期">
+                  <el-date-picker clearable size="small" style="width: 100%" v-model="editForm.installationTime"
+                    type="date" value-format="yyyy-MM-dd" placeholder="请选择安装日期">
                   </el-date-picker>
                 </el-col>
               </el-form-item>
@@ -187,13 +171,8 @@
           </div>
         </el-dialog>
 
-        <Mapdialog
-          v-if="loadmap"
-          :dialogTableVisible="dialogTableVisible"
-          @dialogcancelFun="dialogcancelFun"
-          @confirmFun="confirmFun($event)"
-          :str="str"
-        ></Mapdialog>
+        <Mapdialog v-if="loadmap" :dialogTableVisible="dialogTableVisible" @dialogcancelFun="dialogcancelFun"
+          @confirmFun="confirmFun($event)" :str="str"></Mapdialog>
 
       </div>
     </div>
@@ -269,6 +248,9 @@
     created() {
       // 如果是跳转来的，则接受初始化参数
       this.pipeId = this.$route.query.pipeId;
+
+    },
+    mounted() {
       this.getDetail();
       this.getDicts("t_pipe_type").then(response => {
         this.typeOptions = response.data;
@@ -276,19 +258,22 @@
       this.getDicts("t_pipe_pressure").then(response => {
         this.pressureOptions = response.data;
       });
-    },
-    mounted(){
-      let gaoMap =  new gaodeMap("石家庄");
-      this.gaoMap = gaoMap;
+
     },
     methods: {
-      getDetail (){
-        getPipe(this.pipeId).then(response =>{
+      getDetail() {
+        getPipe(this.pipeId).then(response => {
           this.form = response.data;
+          const { coordinates } = this.form;
+          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("石家庄", path3);
+          this.gaoMap = gaoMap;
           this.gaoMap.onlyLine(this.form);
         });
       },
-      getFileInfo(res){
+      getFileInfo(res) {
         this.editForm.iconUrl = res.url;
       },
       listRemove(e) {
@@ -321,7 +306,7 @@
               url: this.editForm.iconUrl,
             });
           }
-          if(this.editForm.coordinates){
+          if (this.editForm.coordinates) {
             this.str = this.editForm.coordinates;
           }
           this.open = true;
@@ -345,7 +330,7 @@
       handleDelete(res) {
         res.isDel = "1";
         var devices = " ";
-        for(var i = 0; i < res.deviceInfoList.length; i++){
+        for (var i = 0; i < res.deviceInfoList.length; i++) {
           var obj = res.deviceInfoList[i];
           devices = devices + obj.deviceName + " ";
         }
@@ -371,10 +356,14 @@
     width: 100%;
     margin: 20px 0;
   }
-  .feedbackTime-div{
-    float: left;margin-left: 150px;margin-top: 10px;
+
+  .feedbackTime-div {
+    float: left;
+    margin-left: 150px;
+    margin-top: 10px;
   }
-  .feedbackTime{
+
+  .feedbackTime {
     height: 120px;
     width: 120px;
     float: left;
@@ -385,19 +374,24 @@
     justify-content: center;
     align-items: center;
   }
+
   .el-card__body {
     padding: 5px 20px 20px 20px;
   }
-  .detail .el-form{
+
+  .detail .el-form {
     width: 20%;
   }
-  .detail .el-form-item{
+
+  .detail .el-form-item {
     margin-bottom: 0px;
   }
-  .avatar-uploader{
+
+  .avatar-uploader {
     width: 25%;
     float: left;
   }
+
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -405,9 +399,11 @@
     position: relative;
     overflow: hidden;
   }
+
   .avatar-uploader .el-upload:hover {
     border-color: #409EFF;
   }
+
   .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
@@ -416,12 +412,14 @@
     line-height: 178px;
     text-align: center;
   }
+
   .avatar {
     width: 178px;
     height: 178px;
     display: block;
   }
-  li{
+
+  li {
     font-size: 15px;
     font-weight: 900;
   }

gassafety-web/src/views/workOrder/feedbackdetail/index.vue

@@ -276,7 +276,7 @@
   import FileUpload from '@/components/FileUpload';
   import Cookie from 'js-cookie';
   import { deviceTree } from "@/api/device/deviceInfo";
-  import gaodeMap from "utils/gaodeMap.js";
+  import c from "utils/gaodeMap.js";
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
   import { inspectorList } from "@/api/system/user";