Skip to content

G
gassafety
Commit 866dbca3 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

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

parents d66bc84f 9f704243
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 38 deletions
gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java
View file @ 866dbca3
......@@ -30,6 +30,10 @@ public class THiddenTrouble extends BaseEntity
@Excel(name = "工单id")
private String orderId;
/** 地址 */
@Excel(name = "地址")
private String address;
/** 经度 */
@Excel(name = "经度")
private BigDecimal longitude;
......@@ -86,6 +90,15 @@ public class THiddenTrouble extends BaseEntity
{
return orderId;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public void setLongitude(BigDecimal longitude)
{
this.longitude = longitude;
......@@ -139,6 +152,7 @@ public class THiddenTrouble extends BaseEntity
.append("deviceCode", getDeviceCode())
.append("deviceType", getDeviceType())
.append("orderId", getOrderId())
.append("address", getAddress())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("coordinates", getCoordinates())
......
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @ 866dbca3
......@@ -56,6 +56,9 @@ public class WorkOrderVo extends BaseEntity
/** 坐标 */
private String coordinates;
/** 地址 */
private String address;
/** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
private String orderStatus;
......@@ -193,6 +196,14 @@ public class WorkOrderVo extends BaseEntity
this.coordinates = coordinates;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public void setOrderStatus(String orderStatus)
{
this.orderStatus = orderStatus;
......@@ -302,6 +313,7 @@ public class WorkOrderVo extends BaseEntity
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("coordinates", getCoordinates())
.append("address", getAddress())
.append("orderStatus", getOrderStatus())
.append("createTime", getCreateTime())
.append("appointInspector", getAppointInspector())
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ 866dbca3
......@@ -93,6 +93,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
deviceInfoList.add(deviceInfo);
}
}
workOrderVo.setDeviceInfoList(deviceInfoList);
int finish = tInspectionDataMapper.selectFinishTInspectionData(resourceId);
workOrderVo.setFinishNum(finish);
......@@ -105,6 +106,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
workOrderVo.setLatitude(trouble.getLatitude() != null ? trouble.getLatitude() : null);
workOrderVo.setCoordinates(trouble.getCoordinates() != null ? trouble.getCoordinates() : null);
workOrderVo.setDeviceType(trouble.getDeviceType());
workOrderVo.setAddress(trouble.getAddress());
} else {
......@@ -117,11 +119,13 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
workOrderVo.setCoordinates(pipe.getCoordinates());
workOrderVo.setDeviceType("0");
workOrderVo.setAddress(pipe.getPipeAddr());
} else {
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
workOrderVo.setLongitude(device.getLongitude());
workOrderVo.setLatitude(device.getLatitude());
workOrderVo.setDeviceType(device.getDeviceType());
workOrderVo.setAddress(device.getDeviceAddr());
}
}
......
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @ 866dbca3
......@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deviceCode" column="device_code" />
<result property="deviceType" column="device_type" />
<result property="orderId" column="order_id" />
<result property="address" column="address" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="coordinates" column="coordinates" />
......@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTHiddenTroubleVo">
select trouble_id, device_code, device_type, order_id, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
select trouble_id, device_code, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
</sql>
<select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
......@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceCode != null">device_code,</if>
<if test="deviceType != null">device_type,</if>
<if test="orderId != null">order_id,</if>
<if test="address != null">address,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="coordinates != null">coordinates,</if>
......@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="orderId != null">#{orderId},</if>
<if test="address != null">#{address},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="coordinates != null">#{coordinates},</if>
......@@ -75,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceType != null">device_code = #{deviceType},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<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>
......
gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml
View file @ 866dbca3
......@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectFinishTInspectionData" parameterType="int" resultType="int">
select count(*) from t_inspection_data
where plan_id = #{planId}
and deal_status != null
and deal_status is not null
</select>
<select id="selectTInspectionDataById" parameterType="int" resultMap="TInspectionDataResult">
......
gassafety-web/src/views/workOrder/basicsInfo/detail.vue
View file @ 866dbca3
......@@ -19,7 +19,9 @@
<!-- <template slot-scope="scope">
<span>{{ scope.row.orderType}}</span>
</template> -->
<font>{{form.orderType}}</font>
<font v-if="form.orderType == 1">巡检信息</font>
<font v-if="form.orderType == 2">隐患信息</font>
<font v-if="form.orderType == 3">报警信息</font>
</el-form-item>
<el-form-item label="工单编号:" prop="orderId">
<font>{{form.orderId}}</font>
......@@ -30,24 +32,32 @@
<el-form-item label="指定执行人员:" prop="appointInspectorName">
<font>{{form.appointInspectorName}}</font>
</el-form-item>
<el-form-item label="设备类型:" prop="actualInspector">
<font>{{form.actualInspector}}</font>
<el-form-item label="工单描述:" prop="actualTime">
<font>{{form.actualTime}}</font>
</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="deviceId">
<font>{{form.deviceId}}</font>
<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 label="设备位置:" prop="remarks">
<font>{{form.remarks}}</font>
<el-form-item label="设备编号:" prop="deviceCodes">
<font>{{form.deviceCodes}}</font>
</el-form-item>
<el-form-item label="创建时间:" prop="allotTime">
<font>{{form.allotTime}}</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="更新时间:" prop="actualTime">
<font>{{form.actualTime}}</font>
<el-form-item label="工单进度:" v-if="form.orderType == 1">
<font>{{form.deviceNum}}/{{form.deviceNum}}</font>
</el-form-item>
<el-form-item label="工单描述:" prop="actualTime">
<el-form-item label="下发时间:" prop="allotTime">
<font>{{form.allotTime}}</font>
</el-form-item>
<el-form-item label="接收时间:" prop="actualTime">
<font>{{form.actualTime}}</font>
</el-form-item>
</el-form>
......@@ -109,14 +119,15 @@
</div>
</el-upload>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;width: 50%;">
<el-form-item label="反馈信息:" prop="actualInspector">
<font>{{form.actualInspector}}</font>
<el-form-item label="反馈信息:" prop="contents">
<font>{{form.contents}}</font>
</el-form-item>
<el-form-item label="反馈时间:" prop="actualTime">
<font>{{form.actualTime}}</font>
<el-form-item label="反馈时间:" prop="feedbackTime">
<font>{{form.feedbackTime}}</font>
</el-form-item>
<el-form-item label="是否解决:" prop="actualTime">
<font>{{form.actualTime}}</font>
<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>
</div>
......@@ -215,9 +226,8 @@ export default {
mounted(){
let map = new gaodeMap("平山");
let data = {longitude:"114.208371",latitude:"38.267036"}
map.addMarker(DEVICE_TYPE.WORKORDER,data)
map.addMarker(DEVICE_TYPE,data)
// map.addMarker(DEVICE_TYPE.WORKORDER,data)
},
methods: {
handleRemove(file) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment