Merge remote-tracking branch 'origin/master'

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

@@ -80,7 +80,8 @@
                   />
                 </el-form-item>
                 <el-form-item label="设备位置:" v-if="form.orderType != 1" style="margin-bottom: 0px;">
-                  <font>{{form.address}}</font>
+                  <font v-if="form.deviceType == 0">{{form.pipeList?form.pipeList[0].pipeAddr:"-"}}</font>
+                  <font v-if="form.deviceType != 0">{{form.deviceInfoList?form.deviceInfoList[0].deviceAddr:"-"}}</font>
                 </el-form-item>
                 <el-form-item label="工单进度:" v-if="form.orderType == 1" style="margin-bottom: 0px;">
                   <font>{{form.finishNum}}/{{form.deviceNum}}</font>
@@ -128,7 +129,7 @@
           </el-row>
           <el-divider></el-divider>
         </div>
-
+        
         <!-- 反馈信息 -->
         <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
           <div style="color: #31EAEA;width: 100%;height: 40px;">
@@ -452,16 +453,15 @@ export default {
           this.active = parseInt(response.data.orderStatus) + 1;
 
           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.deviceInfoList.length; i++){
-              let obj = this.form.deviceInfoList[i];
-              this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
+              console.log("this.form.deviceInfoList",this.form.deviceInfoList)
+              this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
             }
+          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.pipeList.length>0) {
-            for (var i = 0; i < this.form.pipeList.length; i++) {
+          if(this.form.pipeList != null){
+            for(var i = 0; i < this.form.pipeList.length; i++){
               let obj = this.form.pipeList[i];
               this.gaoMap.onlyLine(obj);
             }