设备管道选择 gengdidi

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,6 +69,7 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
@@ -82,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -91,6 +100,7 @@
     methods: {
       show () {
         this.dialogVisible = true;
+        //this.getPipeInfo();
       },
       hide () {
         this.remove()
@@ -134,6 +144,11 @@
       handleClose(done) {
         done();
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -6,7 +6,14 @@
     :before-close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="135px">
       <el-form-item label="所属管道" prop="pipeCode">
-        <el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
+        <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
+          <el-option
+            v-for="item in pipeList"
+            :key="item.pipeCode"
+            :label="item.pipeName"
+            :value="item.pipeCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="deviceName">
         <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
@@ -62,9 +69,8 @@
 <script>
 
   import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-
+  import { pipeAllInfoList } from "@/api/device/pipe";
   import MyFileUpload from "@/components/MyFileUpload";
-
   import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
   export default {
@@ -84,7 +90,8 @@
         map : null,
         obj : null,
         gaoMap : null,
-        fileArr: []
+        fileArr: [],
+        pipeList: []
       }
     },
     components: {
@@ -135,6 +142,11 @@
         this.form.url = "";
         this.fileArr = [];
       }
+    },
+    mounted(){
+      pipeAllInfoList({}).then(response => {
+        this.pipeList = response.data;
+      });
     }
   }
 </script>

gassafety-web/src/views/enterprise/map/index.vue

@@ -226,19 +226,6 @@ export default {
 
     this.gaoMap = gaoMap;
     window.addEventListener("click", this.barClose);
-    let path = [
-      [
-        [114.436698, 38.083306],
-        [114.57952, 38.065468],
-        [114.57952, 38.002732],
-        [114.440131, 38.006519],
-        [114.436698, 38.083306],
-      ],
-      [
-        [114.528708, 38.075198],
-        [114.530768, 38.00165],
-      ],
-    ];
     gaoMap.addMouseTool();
     gaoMap.searchTips("tipinput");
     this.getDeviceInfo();