Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

# Conflicts:
#	gassafety-web/src/views/workOrder/basicsInfo/detail.vue

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

@@ -34,21 +34,25 @@
               </el-form-item>
               <el-form-item label="工单描述:" prop="actualTime">
                 <font>{{form.actualTime}}</font>
-              </el-form-item> 
+              </el-form-item>
           </el-form>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;">
-              <el-form-item label="设备类型:" prop="deviceType">
+              <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>
               <el-form-item label="设备编号:" prop="deviceCodes">
                 <font>{{form.deviceCodes}}</font>
               </el-form-item>
-              <el-form-item label="设备位置:" prop="remarks">
-                <font>{{form.remarks}}</font>
+              <el-form-item label="设备位置:" v-if="form.orderType != 1">
+                <font v-if="form.deviceType == 0">{{form.coordinates}}</font>
+                <font v-if="form.deviceType != 0">{{form.longitude}},{{form.longitude}}</font>
+              </el-form-item>
+              <el-form-item label="工单进度:" v-if="form.orderType == 1">
+                <font>{{form.deviceNum}}/{{form.deviceNum}}</font>
               </el-form-item>
               <el-form-item label="下发时间:" prop="allotTime">
                 <font>{{form.allotTime}}</font>
@@ -61,7 +65,7 @@
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </div>
-        
+
         <el-divider></el-divider>
         <div style="color: #31EAEA;width: 100%;height: 40px;">
           <ul><li>接单信息</li></ul>
@@ -72,7 +76,7 @@
             </el-form-item>
             <el-form-item label="接单时间:" prop="actualTime" style="float: left;">
               <font>{{form.actualTime}}</font>
-            </el-form-item>  
+            </el-form-item>
         </el-form>
         <el-divider></el-divider>
         <div style="width: 100%;font-weight: 600;height: 250px;">
@@ -120,16 +124,16 @@
                 </el-form-item>
                 <el-form-item label="反馈时间:" prop="feedbackTime">
                   <font>{{form.feedbackTime}}</font>
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item label="是否解决:" prop="dealStatus">
                   <font v-if="form.dealStatus == 3">未解决</font>
                   <font v-if="form.dealStatus != 3">已解决</font>
-                </el-form-item>  
+                </el-form-item>
             </el-form>
           </div>
-         
+
         </div>
-        
+
         <div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)">
           <el-button
           size="medium"
@@ -137,14 +141,14 @@
           style="font-size: 18px; color: rgb(7, 63, 112);float: left;"
         >返回</el-button>
         <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
-        
+
       </div>
-    </div>   
+    </div>
     </div>
   </template>
-  
+
   <script>
-   
+
   import { listBasicsInfo, getBasicsInfo, delBasicsInfo, addBasicsInfo, updateBasicsInfo, exportBasicsInfo } from "@/api/workOrder/basicsInfo";
   import gaodeMap from "utils/gaodeMap.js"
   import {map, DEVICE_TYPE} from "utils/gaodeMap.js"
@@ -209,7 +213,7 @@ export default {
       // 如果是跳转来的，则接受初始化参数
       // this.user_id = this.$route.query.id; //详细信息页接收参数
       this.orderId = this.$route.query.orderId;
-      
+
       this.getList();
       this.getDicts("t_order_status").then(response => {
         this.typeOptions = response.data;
@@ -220,11 +224,10 @@ export default {
       this.getBasicsInfo();
     },
     mounted(){
-     let map =  new gaodeMap("平山"); 
+     let map =  new gaodeMap("平山");
      let data = {longitude:"114.208371",latitude:"38.267036"}
      map.addMarker(DEVICE_TYPE,data)
-     
-
+    //  map.addMarker(DEVICE_TYPE.WORKORDER,data)
     },
     methods: {
       handleRemove(file) {
@@ -396,4 +399,4 @@ export default {
     font-size: 15px;
     font-weight: 900;
   }
-  </style>
+  </style>
\ No newline at end of file