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

@@ -37,7 +37,7 @@
               </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>
@@ -47,8 +47,12 @@
               <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>
@@ -223,8 +227,7 @@ export default {
      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) {