工单详情地图显示设备标点和管线

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

@@ -128,7 +128,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;">
@@ -451,21 +451,21 @@ export default {
           console.log(this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
 
-          
           if(this.form.deviceInfoList.length>0){
-              console.log("this.form.deviceInfoList",this.form.deviceInfoList)
-              this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
+            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);
             }
-            
-          for(var i = 0; i < this.form.deviceInfoList.length; i++){
-            let obj = this.form.deviceInfoList[i];
-            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
           }
-          
-            for(var i = 0; i < this.form.pipeList.length; i++){
+
+          if(this.form.pipeList.length>0) {
+            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') {
             // 获取设备列表树

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

@@ -25,7 +25,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">
@@ -93,10 +93,10 @@
             </el-col>
           </el-row>
         <!-- <div style="width: 100%;height: 265px;">
-          
-          
-          
-         
+
+
+
+
         </div> -->
         <!-- 接单信息 -->
         <div v-if="form.actualTime != '' && form.actualTime != null">
@@ -260,7 +260,6 @@
         </div>
       </div>
     </div>
-    </div>
   </template>
 
   <script>
@@ -443,14 +442,23 @@ export default {
       getBasicsInfo (){
         getBasicsInfo(this.orderId).then(response =>{
           this.form = response.data;
+          console.log(this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
+
           if(this.form.deviceInfoList.length>0){
-            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);
+            }
           }
-          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++) {
+              let obj = this.form.pipeList[i];
+              this.gaoMap.onlyLine(obj);
+            }
           }
 
           if(this.form.orderType == '1') {