Skip to content

G
gassafety
Commit 7427377c authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

合并jzl分离地图

parents 67bdde22 9d985a16
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 17 deletions
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java
View file @ 7427377c
......@@ -34,6 +34,10 @@ public class TInspectionData extends BaseEntity
@Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
private String dealStatus;
/** 是否存在隐患 */
@Excel(name = "是否存在隐患")
private String isHiddenDanger;
/** 备注 */
@Excel(name = "备注")
private String remarks;
......@@ -47,6 +51,7 @@ public class TInspectionData extends BaseEntity
{
return dataId;
}
public void setPlanId(int planId)
{
this.planId = planId;
......@@ -56,6 +61,7 @@ public class TInspectionData extends BaseEntity
{
return planId;
}
public void setDeviceCode(String deviceCode)
{
this.deviceCode = deviceCode;
......@@ -83,7 +89,16 @@ public class TInspectionData extends BaseEntity
{
return dealStatus;
}
public void setRemarks(String remarks)
public String getIsHiddenDanger() {
return isHiddenDanger;
}
public void setIsHiddenDanger(String isHiddenDanger) {
this.isHiddenDanger = isHiddenDanger;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
......@@ -101,6 +116,7 @@ public class TInspectionData extends BaseEntity
.append("deviceCode", getDeviceCode())
.append("deviceType", getDeviceType())
.append("dealStatus", getDealStatus())
.append("isHiddenDanger", getIsHiddenDanger())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
.append("remarks", getRemarks())
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java
View file @ 7427377c
......@@ -69,6 +69,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
String deviceCode = tOrderFeedback.getDeviceCode();
String dealStatus = tOrderFeedback.getDealStatus();
String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
// 根据工单类型和源id修改源数据状态
TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tOrderFeedback.getOrderId());
......@@ -77,16 +78,20 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
if("1".equals(orderType)){
TInspectionData data = tInspectionDataMapper.selectTInspectionDataByCode(deviceCode);
data.setDealStatus(dealStatus);
data.setIsHiddenDanger(isHiddenDanger);
data.setUpdateTime(DateUtils.getNowDate());
tInspectionDataMapper.updateTInspectionData(data);
} else if("2".equals(orderType)) {
THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(order.getResourceId());
trouble.setDealStatus(dealStatus);
trouble.setUpdateTime(DateUtils.getNowDate());
tHiddenTroubleMapper.updateTHiddenTrouble(trouble);
} else if("3".equals(orderType)) {
TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(order.getResourceId());
alarm.setDealStatus(dealStatus);
alarm.setUpdateTime(DateUtils.getNowDate());
tDeviceAlarmMapper.updateTDeviceAlarm(alarm);
}
......
gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml
View file @ 7427377c
......@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="planId" column="plan_id" />
<result property="deviceCode" column="device_code" />
<result property="deviceType" column="device_type" />
<result property="isHiddenDanger" column="is_hidden_danger" />
<result property="dealStatus" column="deal_status" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
......@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTInspectionDataVo">
select data_id, plan_id, device_code, device_type, deal_status, update_time, create_time, remarks from t_inspection_data
select data_id, plan_id, device_code, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
</sql>
<select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
......@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="deviceType != null "> and device_type = #{deviceType}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="isHiddenDanger != null and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
......@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">plan_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceType != null">device_type,</if>
<if test="isHiddenDanger != null">is_hidden_danger,</if>
<if test="dealStatus != null">deal_status,</if>
<if test="updateTime != null">update_time,</if>
<if test="createTime != null">create_time,</if>
......@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">#{planId},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="isHiddenDanger != null">#{isHiddenDanger},</if>
<if test="dealStatus != null">#{dealStatus},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planId != null">plan_id = #{planId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceType != null">device_type = #{deviceType},</if>
<if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</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/workOrder/basicsInfo/detail.vue
View file @ 7427377c
......@@ -3,8 +3,15 @@
<!-- 工单信息 -->
<div style="padding-top: 10px;background: #fff;height: 100%;">
<div>
<span style="color: #31EAEA;font-weight: 900;margin-left: 15px;">工单信息</span>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 20px">
<div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)">
<el-button
size="medium"
type="text"
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>
<el-steps :active="active" finish-status="success" simple prop="orderStatus" style="margin-top: 5px">
<el-step title="未接收" ></el-step>
<el-step title="已接收" ></el-step>
<!-- <el-step title="进行中" ></el-step>-->
......@@ -95,12 +102,90 @@
</el-form>
</div>
<!-- 反馈信息 -->
<div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null">
<!-- <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null"> -->
<div style="width: 100%;font-weight: 600;">
<el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>反馈信息</li></ul>
</div>
<div style="width: 95%;float: left;">
<!-- <el-table :data="form.feedbackList" height="250" border style="width: 100%">
<el-table-column prop="contents" label="反馈信息">
</el-table-column>
<el-table-column prop="feedbackTime" label="反馈时间">
</el-table-column>
<el-table-column prop="dealStatus" label="是否解决">
<template slot-scope="scope">
<font v-if="scope.row.dealStatus == 3">未解决</font>
<font v-if="scope.row.dealStatus != 3 && scope.row.dealStatus != null">已解决</font>
</template>
</el-table-column>
<el-table-column prop="pictureUrl1" label="图片1">
<template slot-scope="scope">
<el-image :src="scope.row.pictureUrl1" fit="cover" v-if="scope.row.pictureUrl1 != null && scope.row.pictureUrl1 != ''" style="width: 100px;height: 100px;">
</el-image>
</template>
</el-table-column>
<el-table-column prop="pictureUrl2" label="图片2">
<template slot-scope="scope">
<el-image :src="scope.row.pictureUrl2" fit="cover" v-if="scope.row.pictureUrl2 != null && scope.row.pictureUrl2 != ''" style="width: 100px;height: 100px;">
</el-image>
</template>
</el-table-column>
<el-table-column prop="pictureUrl3" label="图片3">
<template slot-scope="scope">
<el-image :src="scope.row.pictureUrl3" fit="cover" v-if="scope.row.pictureUrl3 != null && scope.row.pictureUrl3 != ''" style="width: 100px;height: 100px;">
</el-image>
</template>
</el-table-column>
</el-table> -->
<div class="block" style="width: 95%;margin-left: 2%;">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in form.feedbackList"
:key="index"
:timestamp="activity.feedbackTime">
<el-card>
<div style="float: left;margin-left: 50px;">
<p>设备类型：{{activity.deviceType}}</p>
<p>设备名称：{{activity.deviceType}}</p>
<p>反馈信息：{{activity.contents}}</p>
</div>
<div style="float: left;margin-left: 50px;">
<p v-if="activity.dealStatus == 3">是否解决：未解决</p>
<p v-if="activity.dealStatus != 3">是否解决：已解决</p>
<p>反馈时间：{{activity.feedbackTime}}</p>
</div>
<div class="feedbackTime-div">
<div class="feedbackTime">
<el-image :src="activity.pictureUrl1" :preview-src-list="activity.pictureUrl1" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 70px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl2" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 70px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl3" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 70px;"></el-image>
</div>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
</div>
<!-- <el-timeline-item timestamp="2018/4/3" placement="top">
<el-card>
<p>反馈时间：{{contents}}</p>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="2018/4/2" placement="top">
<el-card>
<p>是否解决：{{contents}}</p>
</el-card>
</el-timeline-item> -->
<!-- <div style="width: 95%;float: left;">
<div style="float: left;margin-left: 50px;" >
<el-image :src="form.pictureUrl1" fit="cover" v-if="form.pictureUrl1 != null && form.pictureUrl1 != ''" style="width: 100px;height: 100px;">
</el-image>
......@@ -121,17 +206,10 @@
<font v-if="form.dealStatus != 3 && form.dealStatus != null">已解决</font>
</el-form-item>
</el-form>
</div>
</div>
</div>-->
</div>
<!-- 返回按钮 -->
<div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)">
<el-button
size="medium"
type="text"
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>
......@@ -171,6 +249,7 @@ export default {
total: 0,
// 工单基础信息表格数据
basicsInfoList: [],
// feedbackList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -254,6 +333,7 @@ export default {
getBasicsInfo (){
getBasicsInfo(this.orderId).then(response =>{
this.form = response.data;
console.log(this.form,"00000000000")
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]);
......@@ -388,6 +468,22 @@ export default {
}
</script>
<style>
.feedbackTime-div{
float: left;margin-left: 150px;margin-top: 10px;
}
.feedbackTime{
height: 100px;
width: 100px;
float: left;
margin-left: 15px;
margin-bottom: 15px;
display: flex;
justify-content: center;
align-items: center;
}
.el-card__body {
padding: 5px 20px 20px 20px;
}
.detail .el-form{
width: 20%;
}
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ 7427377c
......@@ -122,7 +122,7 @@
/>
<!-- 工单反馈对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="工单名称" prop="orderName">
<font>{{form.orderName}}</font>
......
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