Skip to content

G
gassafety
Commit 198dd281 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

值班人员修改 gengdidi

parents 2b50332d cb779535
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1410 additions and 151 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TOrderFeedbackController.java
View file @ 198dd281
package com.zehong.web.controller.workOrder;
import java.util.List;
import com.zehong.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -74,9 +76,16 @@ public class TOrderFeedbackController extends BaseController
@PreAuthorize("@ss.hasPermi('workOrder:feedback:add')")
@Log(title = "工单反馈信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TOrderFeedback tOrderFeedback)
public AjaxResult add(@RequestBody TOrderFeedback tOrderFeedback) throws Exception
{
return toAjax(tOrderFeedbackService.insertTOrderFeedback(tOrderFeedback));
int result = 0;
try {
result = tOrderFeedbackService.insertTOrderFeedback(tOrderFeedback);
} catch (Exception e) {
e.printStackTrace();
throw new Exception(StringUtils.format("工单反馈操作失败，数据有误"));
}
return toAjax(result);
}
/**
......
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionPlan.java
View file @ 198dd281
......@@ -42,8 +42,8 @@ public class TInspectionPlan extends BaseEntity
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 状态 */
@Excel(name = "状态")
/** 计划状态（0未下发，1已下发，2进行中，3已完成） */
@Excel(name = "计划状态（0未下发，1已下发，2进行中，3已完成）")
private String planStatus;
/** 计划描述 */
......
gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java
View file @ 198dd281
......@@ -57,10 +57,6 @@ public class TOrderFeedback extends BaseEntity
@Excel(name = "图片地址3")
private String pictureUrl3;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setFeedbackId(int feedbackId)
{
this.feedbackId = feedbackId;
......@@ -151,15 +147,6 @@ public class TOrderFeedback extends BaseEntity
{
return pictureUrl3;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
......@@ -174,7 +161,6 @@ public class TOrderFeedback extends BaseEntity
.append("pictureUrl1", getPictureUrl1())
.append("pictureUrl2", getPictureUrl2())
.append("pictureUrl3", getPictureUrl3())
.append("remarks", getRemarks())
.toString();
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.java 0 → 100644
View file @ 198dd281
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 工单反馈信息对象 t_order_feedback
*
* @author zehong
* @date 2021-07-19
*/
public class OrderFeedbackVo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 工单反馈id */
private int feedbackId;
/** 工单id */
private String orderId;
/** 设备编号 */
private String deviceCode;
/** 设备名称 */
private String deviceName;
/** 设备类型 */
private String deviceType;
/** 反馈内容 */
private String contents;
/** 反馈时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date feedbackTime;
/** 是否存在隐患（1是，2否） */
private String isHiddenDanger;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
private String dealStatus;
/** 图片地址1 */
private String pictureUrl1;
/** 图片地址2 */
private String pictureUrl2;
/** 图片地址3 */
private String pictureUrl3;
public void setFeedbackId(int feedbackId)
{
this.feedbackId = feedbackId;
}
public int getFeedbackId()
{
return feedbackId;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setDeviceCode(String deviceCode)
{
this.deviceCode = deviceCode;
}
public String getDeviceCode()
{
return deviceCode;
}
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public void setContents(String contents)
{
this.contents = contents;
}
public String getContents()
{
return contents;
}
public void setFeedbackTime(Date feedbackTime)
{
this.feedbackTime = feedbackTime;
}
public Date getFeedbackTime()
{
return feedbackTime;
}
public void setIsHiddenDanger(String isHiddenDanger)
{
this.isHiddenDanger = isHiddenDanger;
}
public String getIsHiddenDanger()
{
return isHiddenDanger;
}
public void setDealStatus(String dealStatus)
{
this.dealStatus = dealStatus;
}
public String getDealStatus()
{
return dealStatus;
}
public void setPictureUrl1(String pictureUrl1)
{
this.pictureUrl1 = pictureUrl1;
}
public String getPictureUrl1()
{
return pictureUrl1;
}
public void setPictureUrl2(String pictureUrl2)
{
this.pictureUrl2 = pictureUrl2;
}
public String getPictureUrl2()
{
return pictureUrl2;
}
public void setPictureUrl3(String pictureUrl3)
{
this.pictureUrl3 = pictureUrl3;
}
public String getPictureUrl3()
{
return pictureUrl3;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("feedbackId", getFeedbackId())
.append("orderId", getOrderId())
.append("deviceId", getDeviceCode())
.append("contents", getContents())
.append("feedbackTime", getFeedbackTime())
.append("isHiddenDanger", getIsHiddenDanger())
.append("dealStatus", getDealStatus())
.append("pictureUrl1", getPictureUrl1())
.append("pictureUrl2", getPictureUrl2())
.append("pictureUrl3", getPictureUrl3())
.toString();
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @ 198dd281
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TOrderFeedback;
......@@ -44,7 +43,7 @@ public class WorkOrderVo extends BaseEntity
private List<TDeviceInfo> deviceInfoList;
/** 反馈信息列表 */
private List<TOrderFeedback> feedbackList;
private List<OrderFeedbackVo> feedbackList;
/** 设备数量 */
private int deviceNum;
......@@ -157,11 +156,11 @@ public class WorkOrderVo extends BaseEntity
this.deviceInfoList = deviceInfoList;
}
public List<TOrderFeedback> getFeedbackList() {
public List<OrderFeedbackVo> getFeedbackList() {
return feedbackList;
}
public void setFeedbackList(List<TOrderFeedback> feedbackList) {
public void setFeedbackList(List<OrderFeedbackVo> feedbackList) {
this.feedbackList = feedbackList;
}
......
gassafety-system/src/main/java/com/zehong/system/service/ITOrderFeedbackService.java
View file @ 198dd281
......@@ -33,7 +33,7 @@ public interface ITOrderFeedbackService
* @param tOrderFeedback 工单反馈信息
* @return 结果
*/
public int insertTOrderFeedback(TOrderFeedback tOrderFeedback);
public int insertTOrderFeedback(TOrderFeedback tOrderFeedback) throws Exception;
/**
* 修改工单反馈信息
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java
View file @ 198dd281
......@@ -28,6 +28,10 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
private THiddenTroubleMapper tHiddenTroubleMapper;
@Autowired
private TDeviceAlarmMapper tDeviceAlarmMapper;
@Autowired
private TPipeMapper tPipeMapper;
@Autowired
private TDeviceInfoMapper tDeviceInfoMapper;
/**
* 查询工单反馈信息
......@@ -60,7 +64,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
* @return 结果
*/
@Override
public int insertTOrderFeedback(TOrderFeedback tOrderFeedback)
public int insertTOrderFeedback(TOrderFeedback tOrderFeedback) throws Exception
{
if("2".equals(tOrderFeedback.getIsHiddenDanger())){
tOrderFeedback.setDealStatus("1");
......@@ -82,6 +86,15 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
data.setUpdateTime(DateUtils.getNowDate());
tInspectionDataMapper.updateTInspectionData(data);
if("0".equals(data.getDeviceType())){
TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
pipe.setInspectionTime(DateUtils.getNowDate());
tPipeMapper.updateTPipe(pipe);
} else {
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
device.setInspectionTime(DateUtils.getNowDate());
tDeviceInfoMapper.updateTDeviceInfo(device);
}
} else if("2".equals(orderType)) {
THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(order.getResourceId());
trouble.setDealStatus(dealStatus);
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ 198dd281
......@@ -7,6 +7,7 @@ import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.*;
import com.zehong.system.domain.form.TWorkOrderForm;
import com.zehong.system.domain.vo.OrderFeedbackVo;
import com.zehong.system.domain.vo.WorkOrderVo;
import com.zehong.system.mapper.*;
import org.springframework.beans.BeanUtils;
......@@ -139,8 +140,31 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
workOrderVo.setDeviceInfoList(deviceInfoList);
List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
List<OrderFeedbackVo> feedbackVoList = new ArrayList<>();
TDeviceInfo device = null;
if(feedbackList.size() != 0) {
workOrderVo.setFeedbackList(feedbackList);
for (TOrderFeedback feedback : feedbackList) {
OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
if (feedback != null) {
BeanUtils.copyProperties(feedback, feedbackVo);
}
device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
if (device != null) {
feedbackVo.setDeviceName(device.getDeviceName());
feedbackVo.setDeviceType(device.getDeviceType());
}
if (feedbackVo != null) {
feedbackVoList.add(feedbackVo);
}
}
if (feedbackVoList.size() != 0) {
workOrderVo.setFeedbackList(feedbackVoList);
}
}
return workOrderVo;
......
gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml
View file @ 198dd281
......@@ -15,11 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pictureUrl1" column="picture_url_1" />
<result property="pictureUrl2" column="picture_url_2" />
<result property="pictureUrl3" column="picture_url_3" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTOrderFeedbackVo">
select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3, remarks from t_order_feedback
select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
</sql>
<select id="selectTOrderFeedbackList" parameterType="TOrderFeedback" resultMap="TOrderFeedbackResult">
......@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pictureUrl1 != null and pictureUrl1 != ''"> and picture_url_1 = #{pictureUrl1}</if>
<if test="pictureUrl2 != null and pictureUrl2 != ''"> and picture_url_2 = #{pictureUrl2}</if>
<if test="pictureUrl3 != null and pictureUrl3 != ''"> and picture_url_3 = #{pictureUrl3}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
......@@ -61,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pictureUrl1 != null">picture_url_1,</if>
<if test="pictureUrl2 != null">picture_url_2,</if>
<if test="pictureUrl3 != null">picture_url_3,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
......@@ -73,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pictureUrl1 != null">#{pictureUrl1},</if>
<if test="pictureUrl2 != null">#{pictureUrl2},</if>
<if test="pictureUrl3 != null">#{pictureUrl3},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
......@@ -89,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pictureUrl1 != null">picture_url_1 = #{pictureUrl1},</if>
<if test="pictureUrl2 != null">picture_url_2 = #{pictureUrl2},</if>
<if test="pictureUrl3 != null">picture_url_3 = #{pictureUrl3},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where feedback_id = #{feedbackId}
</update>
......
gassafety-web/src/assets/styles/fonticon.scss
View file @ 198dd281
@font-face {
font-family: "iconfont"; /* Project id 2692138 */
src: url('//at.alicdn.com/t/font_2692138_75daec8zfbv.woff2?t=1627011828763') format('woff2'),
url('//at.alicdn.com/t/font_2692138_75daec8zfbv.woff?t=1627011828763') format('woff'),
url('//at.alicdn.com/t/font_2692138_75daec8zfbv.ttf?t=1627011828763') format('truetype');
src: url('//at.alicdn.com/t/font_2692138_r2b0jk88vrj.woff2?t=1627616466373') format('woff2'),
url('//at.alicdn.com/t/font_2692138_r2b0jk88vrj.woff?t=1627616466373') format('woff'),
url('//at.alicdn.com/t/font_2692138_r2b0jk88vrj.ttf?t=1627616466373') format('truetype');
}
.iconfont {
......@@ -13,6 +13,26 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-gdcd:before {
content: "\e615";
}
.icon-tyxgs:before {
content: "\e610";
}
.icon-fmjgs:before {
content: "\e612";
}
.icon-rqbgs:before {
content: "\e613";
}
.icon-ljsgs:before {
content: "\e614";
}
.icon-ylb:before {
content: "\e60f";
}
......
gassafety-web/src/components/MyFileUpload/index.vue
View file @ 198dd281
......@@ -15,7 +15,7 @@
:show-file-list="true"
:headers="headers"
class="upload-file-uploader"
:class="{hide:addShow}"
:class="{ hide: addShow }"
ref="upload"
>
<!-- 上传按钮 -->
......@@ -33,8 +33,13 @@
的文件
</div>
</el-upload>
<el-dialog :modal="modal" :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="" />
<el-dialog
:center="true"
width="50%"
:modal="modal"
:visible.sync="dialogVisible"
>
<img :src="dialogImageUrl" alt="" />
</el-dialog>
<!-- 文件列表 -->
<!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
......@@ -80,7 +85,6 @@ export default {
type: Boolean,
default: false,
},
},
data() {
return {
......@@ -89,10 +93,10 @@ export default {
Authorization: "Bearer " + getToken(),
},
fileList: [],
modal:false,
dialogVisible:false,
dialogImageUrl:"",
addShow:true,
modal: false,
dialogVisible: false,
dialogImageUrl: "",
addShow: true,
};
},
computed: {
......@@ -167,7 +171,7 @@ export default {
// 文件列表移除文件
handleRemove(file, fileList) {
console.log("列表移除", file, fileList);
this.addShow = fileList.length>0 ?true:false;
this.addShow = fileList.length > 0 ? true : false;
this.$emit("remove", file);
},
// 删除文件
......@@ -189,10 +193,13 @@ export default {
// }
// });
},
handleFileClick(file) {
this.dialogImageUrl = file.response.url;
this.dialogVisible=true;
handleFileClick(file, fileList) {
this.dialogImageUrl = file.response ? file.response.url : file.url;
// this.dialogImageUrl =if(this.fileArr) this.fileArr[0].url;
this.dialogVisible = true;
console.log(file);
// console.log(file.response.url)
},
// 获取文件名称
getFileName(name) {
......@@ -203,19 +210,21 @@ export default {
}
},
// 当改变列表改变时
fileChange(file,fileList){
this.addShow = fileList.length>0 ?true:false;
}
fileChange(file, fileList) {
this.addShow = fileList.length > 0 ? true : false;
},
},
created() {
// this.fileList = this.list;
this.addShow = this.fileArr.length>0 ?true:false;
this.addShow = this.fileArr.length > 0 ? true : false;
},
};
</script>
<style scoped lang="scss">
img {
width: 100%;
}
.upload-file-uploader {
margin-bottom: 5px;
}
......@@ -234,5 +243,4 @@ export default {
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
gassafety-web/src/components/PopWindow/lineInfoWindow.vue
View file @ 198dd281
......@@ -121,6 +121,7 @@ export default {
}
}
.content {
position: relative;
max-height: 400px;
overflow: hidden;
overflow-y: auto;
......
gassafety-web/src/utils/gaodeMap.js
View file @ 198dd281
......@@ -208,6 +208,22 @@ class gaodeMap {
editWindow.form.longitude = e.lnglat.lng;
editWindow.form.latitude = e.lnglat.lat;
});
}else{
marker.on("mouseover",function(){
marker.setLabel({
offset: new AMap.Pixel(0, -10), //设置文本标注偏移量
content: "<div class='info'>"+data.deviceName+"</div>", //设置文本标注内容
direction: 'top' //设置文本标注方位
});
});
marker.on("mouseout",function(){
marker.setLabel({
content: null
});
});
}
this.markers.push(marker);
......
gassafety-web/src/utils/gaodeMapView.js 0 → 100644
View file @ 198dd281
This diff is collapsed.
gassafety-web/src/views/device/map/index.vue
View file @ 198dd281
......@@ -416,7 +416,15 @@ export default {
<style lang="scss" scoped>
// 解决地图下拉框
#container{
position: fixed;
top: 80px;
bottom:0;
width: 100%;
}
// 左边的bar
.leftBar-wrapper {
position: fixed;
left: 100px;
......
gassafety-web/src/views/enterprise/mapView/components/RightBototmData.vue 0 → 100644
View file @ 198dd281
<template>
<div class="wrapper">
<div class="left">
<div class="top">设备报警最新记录</div>
<div class="bottom">
<div class="one">设备编号:<span>1123123123</span></div>
<div class="two">报警时间:<span>34523452345</span></div>
</div>
</div>
<div class="right">
<template v-for="item in list" >
<div class="right-content" :key="item.type">
<div class="text-icon">
<i class="iconfont icon-gdcd"></i>
</div>
<div class="text">
<div class="top">{{typeName[item.type]}}</div>
<div class="bottom">{{item.number}}{{item.type==99?"KM":"个" }}</div>
</div>
</div>
</template>
</div>
</div>
</template>
<script>
export default {
props: {
list: {
type: Array,
},
},
data(){
return {
typeName:{
"1":"调压箱",
"2":"阀门井",
"3":"流量计",
"4":"压力表",
"99":"管道",
},
// type
}
},
created() {
console.log("list", this.list);
},
};
</script>
<style lang="scss" scoped>
.wrapper {
width: 778px;
height: 304px;
position: fixed;
right: 32px;
bottom: 22px;
// background-color: #fff;
display: flex;
justify-content: space-between;
& > div {
}
.left {
width: 278px;
margin-right: 12px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
background-color: #fff;
color: #fff;
font-size: 14px;
font-weight: 400;
.top {
height: 32px;
background-color: #053b6a;
line-height: 32px;
padding-left: 12px;
}
.bottom {
& > div {
height: 20px;
padding-left: 32px;
padding-bottom: 2px;
&.one {
background-color: #f0f0f0;
color: #2788ea;
}
&.two {
color: #676767;
}
}
}
}
.right {
width: 500px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-content: flex-start;
& > .right-content {
background-color: #fff;
width: 238px;
height: 82px;
margin-bottom: 29px;
box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.16);
display: flex;
// align-items: center;
.text-icon {
line-height: 82px;
padding-left: 22px;
margin-right: 22px;
i {
color: #053b6a;
font-size: 60px;
}
}
.text {
font-size: 14px;
padding-top: 16px;
.top {
color: #000;
margin-bottom: 10px;
font-weight: 600;
}
.bottom {
color: #2788ea;
}
}
}
}
}
</style>
\ No newline at end of file
gassafety-web/src/views/workOrder/basicsInfo/detail.vue
View file @ 198dd281
......@@ -108,108 +108,61 @@
<div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>反馈信息</li></ul>
</div>
<!-- <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-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 style="width: 600px;float: left;">
<div style=" width: 600px;">
<div style="float: left;margin-left: 50px; width: 250px;">
<p>设备类型：
<span v-if="activity.deviceType == 0">管道</span>
<span v-if="activity.deviceType == 1">调压箱</span>
<span v-if="activity.deviceType == 2">阀门井</span>
<span v-if="activity.deviceType == 3">流量计</span>
<span v-if="activity.deviceType == 4">压力表</span>
</p>
<p>设备名称：{{activity.deviceName}}</p>
<p>是否有隐患：
<span v-if="activity.isHiddenDanger == 1">是</span>
<span v-if="activity.isHiddenDanger == 2">否</span>
</p>
<div style="width: 600px;">
<p>反馈信息：
<span>{{activity.contents}}</span>
</p>
</div>
</div>
<div style="float: left;margin-left: 50px; width: 250px;">
<p v-if="activity.dealStatus == 3">是否解决：未解决</p>
<p v-if="activity.dealStatus != 3">是否解决：已解决</p>
<p>反馈时间：{{activity.feedbackTime}}</p>
<p v-if="activity.isHiddenDanger == 1">处理状态：
<span v-if="activity.dealStatus == 1">不需要处理</span>
<span v-if="activity.dealStatus == 2">已处理完成</span>
<span v-if="activity.dealStatus == 3">未处理完成</span>
</p>
</div>
</div>
</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>
<el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl2" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 70px;"></el-image>
<el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 9s0px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl3" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 70px;"></el-image>
<el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></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>
<el-image :src="form.pictureUrl2" fit="cover" v-if="form.pictureUrl2 != null && form.pictureUrl2 != ''" style="width: 100px;height: 100px;">
</el-image>
<el-image :src="form.pictureUrl3" fit="cover" v-if="form.pictureUrl3 != null && form.pictureUrl3 != ''" style="width: 100px;height: 100px;">
</el-image>
</div>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;" >
<el-form-item label="反馈信息:" prop="contents">
<font>{{form.contents}}</font>
</el-form-item>
<el-form-item label="反馈时间:" prop="feedbackTime">
<font>{{form.feedbackTime}}</font>
</el-form-item>
<el-form-item label="是否解决:" prop="dealStatus">
<font v-if="form.dealStatus == 3">未解决</font>
<font v-if="form.dealStatus != 3 && form.dealStatus != null">已解决</font>
</el-form-item>
</el-form>
</div>-->
</div>
</div>
<!-- 返回按钮 -->
</div>
......@@ -333,7 +286,7 @@ export default {
getBasicsInfo (){
getBasicsInfo(this.orderId).then(response =>{
this.form = response.data;
console.log(this.form,"00000000000")
console.log(this.form.feedbackList,"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]);
......@@ -472,10 +425,11 @@ export default {
float: left;margin-left: 150px;margin-top: 10px;
}
.feedbackTime{
height: 100px;
width: 100px;
height: 120px;
width: 120px;
float: left;
margin-left: 15px;
margin-top: 5px;
margin-bottom: 15px;
display: flex;
justify-content: center;
......@@ -490,6 +444,9 @@ export default {
.detail .el-form-item{
margin-bottom: 0px;
}
.el-tree{
margin-top: 5px;
}
.avatar-uploader{
width: 25%;
float: left;
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ 198dd281
......@@ -154,17 +154,12 @@
/>
</el-form-item>
<el-form-item label="是否存在隐患" prop="isHiddenDanger">
<!--<el-radio-group v-model="form.isHiddenDanger">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>-->
<el-switch
v-model="isHiddenDanger"
active-text="是"
inactive-text="否">
</el-switch>
</el-form-item>
<!-- <el-form-item label="处理结果" prop="dealStatus">-->
<el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">
<el-radio-group v-model="form.dealStatus">
<el-radio :label="2">已处理完成</el-radio>
......@@ -347,11 +342,6 @@
const orderId = row.orderId || this.ids
getBasicsInfo(orderId).then(response => {
this.form = response.data;
this.form.pictureUrl1 = null;
this.form.pictureUrl2 = null;
this.form.pictureUrl3 = null;
this.form.contents = null;
this.form.remarks = null;
this.open = true;
this.title = "工单反馈";
});
......
gassafety-web/vue.config.js
View file @ 198dd281
......@@ -33,7 +33,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://36.148.23.59:8901/gassafety`,
target: `http://localhost:8903/gassafety`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
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