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

# Conflicts:
#	gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java

@@ -42,10 +42,6 @@ public class THiddenTrouble extends BaseEntity
     @Excel(name = "纬度")
     private BigDecimal latitude;
 
-    /** 坐标 */
-    @Excel(name = "坐标")
-    private String coordinates;
-
     /** 处理状态（1不需处理，2已处理完成，3未处理完成） */
     @Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
     private String dealStatus;
@@ -118,14 +114,6 @@ public class THiddenTrouble extends BaseEntity
         return latitude;
     }
 
-    public String getCoordinates() {
-        return coordinates;
-    }
-
-    public void setCoordinates(String coordinates) {
-        this.coordinates = coordinates;
-    }
-
     public void setDealStatus(String dealStatus)
     {
         this.dealStatus = dealStatus;
@@ -155,7 +143,6 @@ public class THiddenTrouble extends BaseEntity
             .append("address", getAddress())
             .append("longitude", getLongitude())
             .append("latitude", getLatitude())
-            .append("coordinates", getCoordinates())
             .append("dealStatus", getDealStatus())
             .append("updateTime", getUpdateTime())
             .append("createTime", getCreateTime())

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

@@ -114,7 +114,6 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             workOrderVo.setDeviceId(deviceId);
             workOrderVo.setLongitude(trouble.getLongitude() != null ? trouble.getLongitude() : null);
             workOrderVo.setLatitude(trouble.getLatitude() != null ? trouble.getLatitude() : null);
-            workOrderVo.setCoordinates(trouble.getCoordinates() != null ? trouble.getCoordinates() : null);
             workOrderVo.setDeviceType(trouble.getDeviceType());
             workOrderVo.setAddress(trouble.getAddress());
 

gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml

@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
-        <result property="coordinates"    column="coordinates"    />
         <result property="dealStatus"    column="deal_status"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -20,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTHiddenTroubleVo">
-        select trouble_id, device_id, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
+        select trouble_id, device_id, device_type, order_id, address, longitude, latitude, deal_status, update_time, create_time, remarks from t_hidden_trouble
     </sql>
 
     <select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
@@ -31,7 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
             <if test="latitude != null "> and latitude = #{latitude}</if>
-            <if test="coordinates != null "> and coordinates = #{coordinates}</if>
             <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
@@ -51,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
-            <if test="coordinates != null">coordinates,</if>
             <if test="dealStatus != null">deal_status,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
@@ -64,7 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">#{address},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
-            <if test="coordinates != null">#{coordinates},</if>
             <if test="dealStatus != null">#{dealStatus},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -81,7 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address = #{address},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
-            <if test="coordinates != null">coordinates = #{coordinates},</if>
             <if test="dealStatus != null">deal_status = #{dealStatus},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -14,7 +14,7 @@
 
       <el-row style="padding-left: 50px;">
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules" style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="设备类型:" prop="deviceType">
               <font>{{form.deviceType}}</font>
             </el-form-item>
@@ -24,7 +24,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="报警类型:" prop="alarmType">
               <font>{{form.alarmType}}</font>
             </el-form-item>
@@ -34,7 +34,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="报警开始时间:" prop="startTime">
               <font>{{form.startTime}}</font>
             </el-form-item>
@@ -44,7 +44,7 @@
           </el-form>
         </el-col>
         <el-col :span="6">
-          <el-form ref="form" v-model="form" :rules="rules"  style="width: 100%;">
+          <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="工单编号:" prop="orderId">
               <!-- <font>{{form.orderId}}</font> -->
               <template slot-scope="scope">
@@ -190,6 +190,7 @@ export default {
       title: "",
       // 表单参数
       form: { },
+      rule: { },
       };
     },
     created() {
@@ -545,7 +546,10 @@ export default {
           console.log("this.form", this.form)
           this.active = parseInt(response.data.orderStatus) + 1;
           this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
-          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form)
+          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form);
+
+          this.form.pipeName = this.form.deviceName;
+          this.gaoMap.onlyLine(this.form);
 
           var getData1 = [];
           var getData2 = [];

gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

@@ -215,7 +215,10 @@ export default {
             let obj = this.form.deviceList[i];
             this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
           }
-
+          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/detail/index.vue

@@ -427,7 +427,11 @@ export default {
           }
           for(var i = 0; i < this.form.deviceInfoList.length; i++){
             let obj = this.form.deviceInfoList[i];
-            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj)
+            this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, obj);
+          }
+          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') {