报警详情、巡检计划详情、工单详情管道上图

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

@@ -14,7 +14,7 @@
 
       <el-row style="padding-left: 50px;">
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules" style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="设备类型:" prop="deviceType">
               <font>{{form.deviceType}}</font>
             </el-form-item>
@@ -24,7 +24,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="报警类型:" prop="alarmType">
               <font>{{form.alarmType}}</font>
             </el-form-item>
@@ -34,7 +34,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="报警开始时间:" prop="startTime">
               <font>{{form.startTime}}</font>
             </el-form-item>
@@ -44,7 +44,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="工单编号:" prop="orderId">
               <font>{{form.orderId}}</font>
             </el-form-item>
@@ -62,10 +62,10 @@
       </el-row>
 
       <!-- <div style="width: 100%;height: 100px;"> -->
-       
-       
-       
-       
+
+
+
+
 
 
       <!-- </div> -->
@@ -79,13 +79,13 @@
               <el-table-column label="设备编号" align="center" prop="deviceCode" />
               <el-table-column label="报警类型" align="center" prop="alarmType" />
             </el-table>
-  
+
             <el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;">
               <el-table-column label="报警值" align="center" prop="alarmValue" />
               <el-table-column label="报警开始时间" align="center" prop="startTime" />
             </el-table>
-  
-  
+
+
             <el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;">
               <el-table-column label="报警结束时间" align="center" prop="endTime" />
               <el-table-column label="处理状态" align="center" prop="dealStatus">
@@ -99,7 +99,7 @@
                 </template>
               </el-table-column>
             </el-table>
-  
+
           </div>
         </el-col>
         <el-col :span="8" style="padding: 10px;padding-left: 0px;">
@@ -109,7 +109,7 @@
         </el-col>
       </el-row>
 
-      
+
       <template v-if="$route.query.deviceType!='管道'">
 
 
@@ -146,14 +146,14 @@
           </el-col>
         </el-row>
         <!-- <div v-if="form.deviceType != '压力表'" style="height: 320p x;width: 100%;margin-top: 15px;padding: 10px;"> -->
-          
-          
+
+
         <!-- </div> -->
 
 
         <!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> -->
-          
-         
+
+
         <!-- </div> -->
 
       </template>
@@ -187,6 +187,7 @@ export default {
       title: "",
       // 表单参数
       form: { },
+      rule: { },
       };
     },
     created() {
@@ -532,7 +533,10 @@ export default {
           console.log("this.form", this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
           this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
-          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
+          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form);
+
+          this.form.pipeName = this.form.deviceName;
+          this.gaoMap.onlyLine(this.form);
 
           var getData1 = [];
           var getData2 = [];
@@ -665,4 +669,4 @@ export default {
     font-size: 15px;
     font-weight: 900;
   }
-</style>
+</style>
\ No newline at end of file

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

@@ -18,7 +18,7 @@
             <div style="color: #31EAEA;height: 25px;">
               <ul><li>详细信息</li></ul>
             </div>
-          </el-col> 
+          </el-col>
         </el-row>
 
         <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
@@ -78,7 +78,7 @@
           </el-col>
         </el-row>
 
-        
+
         <!-- 接单信息 -->
         <el-row>
           <el-divider></el-divider>
@@ -110,8 +110,8 @@
           </el-col>
         </el-row>
         <div>
-          
-          
+
+
         </div>
         <el-divider></el-divider>
       </div>
@@ -206,13 +206,16 @@ export default {
           this.active = parseInt(response.data.orderStatus) + 1;
           if(this.form.deviceList.length>0){
             this.gaoMap.resetMapCenter([this.form.deviceList[0].longitude,this.form.deviceList[0].latitude]);
-            
+
           }
           for(var i = 0; i < this.form.deviceList.length; i++){
             let obj = this.form.deviceList[i];
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
           }
-
+          for(var i = 0; i < this.form.pipeList.length; i++){
+            let obj = this.form.pipeList[i];
+            this.gaoMap.onlyLine(obj);
+          }
 
           if(this.form.orderType == '1') {
             // 获取设备列表树
@@ -252,8 +255,8 @@ export default {
         };
         this.resetForm("form");
       },
-     
-      
+
+
       /** 归档按钮操作 */
     handleFinish(res) {
       // this.reset();

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

@@ -19,7 +19,7 @@
               <el-step title="已反馈" ></el-step>
               <el-step title="已归档" ></el-step>
           </el-steps>
-        
+
           <el-divider></el-divider>
 
 
@@ -29,7 +29,7 @@
               <div style="color: #31EAEA;height: 25px;">
                 <ul><li>详细信息</li></ul>
               </div>
-            </el-col> 
+            </el-col>
           </el-row>
           <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
             <el-col :span="6">
@@ -97,10 +97,10 @@
             </el-col>
           </el-row>
 
-          
+
         <!-- 接单信息 -->
 
-        
+
         <div v-if="form.actualTime != '' && form.actualTime != null">
           <el-divider></el-divider>
           <el-row>
@@ -181,7 +181,7 @@
                           </div>
                         </el-col>
                       </el-row>
-                      
+
                     </el-card>
                   </el-timeline-item>
                 </el-timeline>
@@ -427,7 +427,11 @@ export default {
           }
           for(var i = 0; i < this.form.deviceInfoList.length; i++){
             let obj = this.form.deviceInfoList[i];
-            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
+            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
+          }
+          for(var i = 0; i < this.form.pipeList.length; i++){
+            let obj = this.form.pipeList[i];
+            this.gaoMap.onlyLine(obj);
           }
 
           if(this.form.orderType == '1') {