diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index 1747fe6..381096a 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -14,14 +14,22 @@
{{jobForm.alarmContentName}}
{{jobForm.createTime}}
-
+
接单
到这里去
转单
@@ -134,11 +150,13 @@
jobForm: {
id: '', // 工单id
jobCode:'',//工单编号
+ jobBelongTo:'',
createTime:'',//工单创建时间
+ jobFlag: '', //工单延时标志,1为超时未接单,2位超时未处理
wellId:1,
- wellCode: '', // 闸井编号
- wellType: '', // 闸井类型
- wellTypeName: '', // 闸井类型名称
+ wellCode: '', // 窨井编号
+ wellType: '', // 窨井类型
+ wellTypeName: '', // 窨井类型名称
deptid: '', // 权属单位
deptName: '', // 权属单位名称
deep: '', // 井深,
@@ -155,8 +173,13 @@
flow:[],
firstState:'',
firstStatePhotos:'',
+ confirmJobPerson:'',
+ shouldGetTime:'',
+ shouldHandleTime:'',
handleMessage:'',
- handlePhotos:''
+ handlePhotos:'',
+ handleJobPerson:'',
+ editable:1
}, // 表单
isLoading:true, //是否显示加载按钮
multiple:true,//是否允许多张图片
@@ -188,18 +211,27 @@
value:this.jobForm.jobCode
},
{
- title:'闸井编号',
+ title:'窨井编号',
value:this.jobForm.wellCode,
islink:true,
class:'text-blue'
},
{
- title:'告警数值',
- value:this.jobForm.alarmValue,
+ title:'设备编号',
+ value:this.jobForm.devcode,
+ },
+ {
+ title:'告警等级',
+ value: this.computeLevel(this.jobForm.alarmLevel),
class:'text-red'
},
{
- title:'位置描述',
+ title:'告警数值',
+ value:this.jobForm.alarmValue.replace(/,/g,'\n'),
+ class:'text-red'
+ },
+ {
+ title:'详细地址',
value:this.jobForm.position
}
]
@@ -219,26 +251,31 @@
const timeList = []
const jobForm = this.jobForm
if(jobForm.createTime && jobForm.createTime!='0000-00-00 00:00:00'){
- timeList.push({time:jobForm.createTime,name:'派单时间'})
+ timeList.push({time:jobForm.createTime,name:'派单时间',num :1})
}
if(jobForm.getJobTime && jobForm.getJobTime!='0000-00-00 00:00:00'){
- timeList.push({time:jobForm.getJobTime,name:'接单时间'})
+ timeList.push({time:jobForm.getJobTime,name:'接单时间',num :2})
}
if(jobForm.confirmJobTime && jobForm.confirmJobTime!='0000-00-00 00:00:00'){
- timeList.push({time:jobForm.confirmJobTime,name:'确认时间'})
+ timeList.push({time:jobForm.confirmJobTime,name:'确认时间',num :3})
}
if(jobForm.handleJobTime && jobForm.handleJobTime!='0000-00-00 00:00:00'){
- timeList.push({time:jobForm.handleJobTime,name:'完成时间'})
+ timeList.push({time:jobForm.handleJobTime,name:'完成时间',num :4})
}
if(jobForm.flow && jobForm.flow.length>0){
for(const item of jobForm.flow){
- timeList.push({time:item.time, name:'转单时间'})
+ timeList.push({time:item.time, name:'转单时间',num :4})
}
}
if(timeList.length>1){
timeList.sort((a,b)=>{
- console.log(compareCalendar(a.time,b.time))
- return compareCalendar(a.time,b.time)
+ const cmp = compareCalendar(a.time,b.time)
+ if(cmp==0){
+ if(a.num>b.num) return -1
+ else return 1
+ }else{
+ return compareCalendar(a.time,b.time)
+ }
})
}
return timeList
@@ -250,6 +287,19 @@
}
},
methods:{
+ // 等级转换
+ computeLevel(val){
+ switch (val) {
+ case 1:
+ return '一级'
+ case 2:
+ return '二级'
+ case 3:
+ return '三级'
+ default:
+ return ''
+ }
+ },
//跳转地图
goToMap(){
openMapWindow(this.jobForm.lngGaode,this.jobForm.latGaode,this.jobForm.wellName)
@@ -293,7 +343,7 @@
}
})
},
- //跳转显示闸井详情
+ //跳转显示窨井详情
showWellDetail(){
const id = this.jobForm.wellId
this.$router.push({
@@ -349,7 +399,7 @@
}
if(this.needHandle.trim().length<1){
Toast({
- message: '请选择闸井当前情况',
+ message: '请选择窨井当前情况',
position: 'bottom',
})
return
@@ -452,6 +502,8 @@
line-height 2rem
margin-bottom 0.6rem
.title-left{
+ display: inline-block;
+ max-width: 45vw;
font-size 1.2rem
font-weight 600
color: #000
@@ -485,39 +537,39 @@
color: #1d55c6
}
}
+ }
+ .well-info-button{
+ overflow auto
+ padding 0.2rem 1rem 0.2rem 1rem
+ line-height:1.2rem
+ font-size:0.9rem
+ .info-name{
+ float left
}
- .well-info-button{
- overflow auto
- padding 0.2rem 1rem 0.2rem 1rem
- line-height:1.2rem
- font-size:0.9rem
- .info-name{
- float left
- }
- .info-value{
- float right
- color #4b4b4b
- max-width 60%
- text-align right
- }
+ .info-value{
+ float right
+ color #4b4b4b
+ max-width 60%
+ text-align right
}
- .mint-cell{
- font-size:0.9rem
- }
- .well-info:last-child{
- border-bottom none
- }
- textarea{
- width: 80vw
- margin-left 5px
- }
- .img-area{
- padding 0.5rem 0.5rem
- }
- .imgzip{
- height 20vw
- margin 0.2rem
- }
+ }
+ .mint-cell{
+ font-size:0.9rem
+ }
+ .well-info:last-child{
+ border-bottom none
+ }
+ textarea{
+ width: 80vw
+ margin-left 5px
+ }
+ .img-area{
+ padding 0.5rem 0.5rem
+ }
+ .imgzip{
+ height 20vw
+ margin 0.2rem
+ }
.firststate{
padding-top 0.4rem
}