Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java

 package com.zehong.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 import com.zehong.system.domain.TDeviceInfo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -92,6 +93,15 @@ public class WorkOrderVo extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date feedbackTime;
 
+    /** 图片地址1 */
+    private String pictureUrl1;
+
+    /** 图片地址2 */
+    private String pictureUrl2;
+
+    /** 图片地址3 */
+    private String pictureUrl3;
+
     /** 处理状态 */
     private String dealStatus;
 
@@ -291,6 +301,30 @@ public class WorkOrderVo extends BaseEntity
         this.feedbackTime = feedbackTime;
     }
 
+    public String getPictureUrl1() {
+        return pictureUrl1;
+    }
+
+    public void setPictureUrl1(String pictureUrl1) {
+        this.pictureUrl1 = pictureUrl1;
+    }
+
+    public String getPictureUrl2() {
+        return pictureUrl2;
+    }
+
+    public void setPictureUrl2(String pictureUrl2) {
+        this.pictureUrl2 = pictureUrl2;
+    }
+
+    public String getPictureUrl3() {
+        return pictureUrl3;
+    }
+
+    public void setPictureUrl3(String pictureUrl3) {
+        this.pictureUrl3 = pictureUrl3;
+    }
+
     public String getDealStatus() {
         return dealStatus;
     }

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -141,6 +141,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             workOrderVo.setContents(feedback.getContents());
             workOrderVo.setFeedbackTime(feedback.getFeedbackTime());
             workOrderVo.setDealStatus(feedback.getDealStatus());
+            workOrderVo.setPictureUrl1(feedback.getPictureUrl1() != null ? feedback.getPictureUrl1() : null);
+            workOrderVo.setPictureUrl2(feedback.getPictureUrl2() != null ? feedback.getPictureUrl2() : null);
+            workOrderVo.setPictureUrl3(feedback.getPictureUrl3() != null ? feedback.getPictureUrl3() : null);
         }
 
         return workOrderVo;

gassafety-web/src/utils/gaodeMap.js

@@ -100,6 +100,12 @@ class gaodeMap {
     this.districtBoundaries();
   }
 
+
+
+  resetMapCenter(value){
+    map.setCenter(value);
+  }
+
   /**
    * 设置城市边界
    */

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

@@ -13,10 +13,9 @@
           </el-steps>
         </div>
 
-        
         <div style="width: 100%;height: 280px;">
           <el-divider></el-divider>
-          <div style="color: #31EAEA;width: 100%;height: 40px;">
+          <div style="color: #31EAEA;width: 30%;height: 40px;">
             <ul><li>详细信息</li></ul>
           </div>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
@@ -69,7 +68,7 @@
                 <font>{{form.actualTime}}</font>
               </el-form-item>
           </el-form>
-          <div id="marbox" style="width: 700px;height: 200px;float: left;border: 1px solid rgb(218, 213, 213);">
+          <div id="marbox" style="width: 700px;height: 250px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </div>
@@ -90,13 +89,13 @@
           </el-form>
         </div>
         <!-- 反馈信息 -->
-        <div style="width: 100%;font-weight: 600;height: 250px;" v-if="form.contents != null && form.feedbackTime != null && form.dealStatus != null">
+        <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.contents != null && form.feedbackTime != null && form.dealStatus != null">
           <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>反馈信息</li></ul>
           </div>
-          <div style="width: 95%;height: 200px;float: right;">
-            <el-upload style="width:20%;float: left;"
+          <div style="width: 95%;float: left;">
+            <!-- <el-upload style="float: left;"
               action="#"
               list-type="picture-card"
               :auto-upload="false">
@@ -129,8 +128,16 @@
                     </span>
                   </span>
                 </div>
-            </el-upload>
-            <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;" >
+            </el-upload> -->
+              <div style="float: left;margin-left: 50px;" >
+                <el-image :src="form.pictureUrl1" fit="cover" v-if="form.pictureUrl1 != null" style="width: 100px;height: 100px;">
+                </el-image>
+                <el-image :src="form.pictureUrl2" fit="cover" v-if="form.pictureUrl2 != null" style="width: 100px;height: 100px;">
+                </el-image>
+                <el-image :src="form.pictureUrl3" fit="cover" v-if="form.pictureUrl3 != null" style="width: 100px;height: 100px;">
+                </el-image>
+              </div>
+            <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;" >
                 <el-form-item label="反馈信息:" prop="contents">
                   <font>{{form.contents}}</font>
                 </el-form-item>
@@ -263,11 +270,15 @@ export default {
       getBasicsInfo (){
         getBasicsInfo(this.orderId).then(response =>{
           this.form = response.data;
+          console.log(response.data,"fdsfdsa======")
           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];
-            console.log(obj,"94444444444444-=----")
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
+
           }
         });