设备巡检

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

@@ -136,7 +136,7 @@
 
   <script>
 
-import { listDeviceAlarm, getDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
+  import { listDeviceAlarm, getDeviceAlarm } from "@/api/dataMonitoring/deviceAlarm";
   import { deviceTree } from "@/api/device/deviceInfo";
   import gaodeMap from "utils/gaodeMap.js";
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js";
@@ -145,7 +145,7 @@ import { listDeviceAlarm, getDeviceAlarm } from "@/api/dataMonitoring/deviceAlar
   import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
 
 export default {
-    name: "BasicsInfo",
+    name: "DeviceAlarm",
     components: {
     },
     data() {
@@ -188,6 +188,7 @@ export default {
       devices: null,
       // 巡检员列表
       inspector: [],
+      alermId:'',
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -212,7 +213,10 @@ export default {
     created() {
       // 如果是跳转来的，则接受初始化参数
       // this.user_id = this.$route.query.id; //详细信息页接收参数
-      this.orderId = this.$route.query.orderId;
+     
+      this.alarmId = +this.$route.query.alarmId; 
+      console.log("query",this.$route.query.alarmId)
+
       this.getList();
       this.getDicts("t_order_status").then(response => {
         this.typeOptions = response.data;
@@ -225,7 +229,7 @@ export default {
     mounted(){
       let gaoMap =  new gaodeMap("石家庄");
       this.gaoMap = gaoMap;
-      this.getDeviceAlarm();
+      // this.getDeviceAlarm();
       this.initData();
       this.drawPieChart();
       this.main3();
@@ -790,7 +794,7 @@ export default {
       });
     },
     getDeviceAlarm (){
-      getDeviceAlarm(this.orderId).then(response =>{
+      getDeviceAlarm(this.alarmId).then(response =>{
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
           if(this.form.deviceInfoList.length>0){

gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue

@@ -321,7 +321,6 @@
           this.inspectionPlanList = response.rows;
           this.total = response.total;
           this.loading = false;
-          console.log("this.inspectionPlanList",this.inspectionPlanList)
         });
       },
       /** 详细信息跳转 */

gassafety-web/src/views/deviceInspection/inspectionPlan/inspectiondetail.vue

@@ -32,10 +32,6 @@
               <el-form-item label="检测地点:" prop="address">
                 <font>{{form.address}}</font>
               </el-form-item>
-              
-              <el-form-item label="计划执行时间:" prop="startTime">
-                <font>{{form.startTime}}至{{form.endTime}}</font>
-              </el-form-item>
               <el-form-item label="计划描述:" prop="remarks">
                 <div style="height: 90px;width: 250px; border: 1px solid rgb(187, 183, 183);margin-top: 10px;overflow-y: auto;padding: 5px;border-radius: 5px;">
                     <font>{{form.remarks}}
@@ -44,13 +40,9 @@
               </el-form-item>
           </el-form>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;width: 25%;">
-              <el-form-item label="设备类型:" prop="deviceType" v-if="form.orderType != 1">
-                <font v-if="form.deviceType == 0">管道</font>
-                <font v-if="form.deviceType == 1">调压阀</font>
-                <font v-if="form.deviceType == 2">阀门井</font>
-                <font v-if="form.deviceType == 3">流量计</font>
-                <font v-if="form.deviceType == 4">压力表</font>
-              </el-form-item>
+            <el-form-item label="计划执行时间:" prop="startTime">
+              <font>{{form.startTime}}至{{form.endTime}}</font>
+            </el-form-item>
               <el-form-item label="设备名称:" prop="deviceName">
                 <!-- <font v-if="form.orderType != 1">{{form.deviceName}}</font> -->
                 <el-tree
@@ -97,6 +89,7 @@
   import { addBasicsInfo } from "@/api/workOrder/basicsInfo";
   import { inspectorList } from "@/api/system/user";
   import { deviceNodeTree } from "@/api/device/deviceInfo";
+  import { deviceTree } from "@/api/device/deviceInfo";
 
 export default {
     name: "InspectionPlan",
@@ -260,19 +253,19 @@ export default {
         getInspectionPlan(this.planId).then(response =>{
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
-          console.log("this.form",this.form)
-          if(this.form.inspectionPlanList.length>0){
-            this.gaoMap.resetMapCenter([this.form.inspectionPlanList[0].longitude,this.form.inspectionPlanList[0].latitude]);
+          console.log(this.form,2222222222222222)
+          if(this.form.deviceInfoList.length>0){
+            this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
           }
-          for(var i = 0; i < this.form.inspectionPlanList.length; i++){
-            let obj = this.form.inspectionPlanList[i];
+          for(var i = 0; i < this.form.deviceInfoList.length; i++){
+            let obj = this.form.deviceInfoList[i];
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
           }
 
           if(this.form.orderType == '1') {
             // 获取设备列表树
             let data = {
-              key1:this.form.inspectionPlanList,
+              key1:this.form.deviceInfoList,
               key2:this.form.pipeList
             };
             deviceTree(data).then(response => {