guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

main
zhaoyu 2023-12-22 16:27:47 +08:00
parent b0db6e3e4d
commit f750e41a25
7 changed files with 151 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/views/map/dialog/blindboardOrder.vue
View File

@ -45,10 +45,10 @@
<td colspan="8">
<div>盲板位置图（可另附图）及编号：</div>
<div style="display: flex;justify-content: space-between;margin-top: 20px;">
<img v-viewer :src="config.cfdfileUrl + info.BOARD_PATH" alt="" width="100" height="100">
<img v-viewer :src="config.fileUrl + info.BOARD_PATH" alt="" width="100" height="100">
<div>
编制人：
<img v-viewer :src="config.cfdfileUrl + info.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
<img v-viewer :src="config.fileUrl + info.APPLY_USER_SIGNER_PATH" alt="" width="100" height="100">
{{ info.APPLY_USER_SIGNER_TIME }}
</div>
</div>
@ -63,7 +63,7 @@
<td v-if="info.GUARDIAN_USER_SIGNER_PATH" colspan="5">
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.cfdfileUrl + info.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<img v-viewer :src="config.fileUrl + info.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.GUARDIAN_USER_SIGNER_TIME }}</span>
</div>
</td>
@ -117,20 +117,20 @@
</td>
</tr>
<tr>
<td class="bbg-transparent">安全交底人</td>
<td colspan="3">
<td v-if="info.CONFESS_USER_SIGNER_PATH" class="bbg-transparent">安全交底人</td>
<td v-if="info.CONFESS_USER_SIGNER_PATH" colspan="3">
<div v-if="info.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.cfdfileUrl + info.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<img v-viewer :src="config.fileUrl + info.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
<td class="bbg-transparent">接受交底人</td>
<td colspan="3">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<td v-if="imgList.length>0" class="bbg-transparent">接受交底人</td>
<td v-if="imgList.length>0" colspan="3">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.cfdfileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
@ -146,7 +146,7 @@
<div>
签字：
<span class="print-approval-img">
<img v-if="info.CONSTRUCTION_USER_SIGNER_PATH" :src="config.cfdfileUrl+info.CONSTRUCTION_USER_SIGNER_PATH">
<img v-if="info.CONSTRUCTION_USER_SIGNER_PATH" :src="config.fileUrl+info.CONSTRUCTION_USER_SIGNER_PATH">
</span>
</div>
<div style="float: right">
@ -166,7 +166,7 @@
<div>
签字：
<span class="print-approval-img">
<img v-if="info.LEADER_USER_SIGNER_PATH" :src="config.cfdfileUrl+info.LEADER_USER_SIGNER_PATH">
<img v-if="info.LEADER_USER_SIGNER_PATH" :src="config.fileUrl+info.LEADER_USER_SIGNER_PATH">
</span>
</div>
<div style="float: right">
@ -208,6 +208,7 @@ export default {
info: {},
ImgList: [],
measuresList: [],
imgList: []
}
},
created() {
@ -223,7 +224,7 @@ export default {
},
getData() {
requestFN(
'/map/Eight/getByIdCfdD',
'/map/Eight/getByIdOrder',
{
id: this.id,
TYPE: this.type,
@ -232,7 +233,11 @@ export default {
).then((data) => {
this.info = { ...data.pd, ...data.Info }
this.ImgList = data.ImgList
this.imgList = data.imgList
this.measuresList = data.measuresList
this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}).catch((e) => {
})
}

30
src/views/map/dialog/breakgroundOrder.vue
View File

@ -114,7 +114,6 @@
</td>
</tr>
<tr>
<td class="bbg-transparent">安全交底人</td>
<td colspan="5">
@ -126,12 +125,12 @@
</td>
</tr>
<tr>
<td class="bbg-transparent">接受交底人</td>
<td colspan="5">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<td v-if="imgList.length>0" class="bbg-transparent">接受交底人</td>
<td v-if="imgList.length>0" colspan="5">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
@ -247,7 +246,8 @@ export default {
config: config,
info: {},
ImgList: [],
measuresList: []
measuresList: [],
imgList: []
}
},
created() {
@ -273,6 +273,22 @@ export default {
this.info = { ...data.pd, ...data.Info }
this.ImgList = data.ImgList
this.measuresList = data.measuresList
this.imgList = data.imgList
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) {
this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) {
this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) {
this.info.PRODUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) {
this.info.SAFETY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 4) {
this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
}).catch((e) => {
})
}

30
src/views/map/dialog/cutroadOrder.vue
View File

@ -113,12 +113,12 @@
</td>
</tr>
<tr>
<td class="bbg-transparent">接受交底人</td>
<td colspan="5">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<td v-if="imgList.length>0" class="bbg-transparent">接受交底人</td>
<td v-if="imgList.length>0" colspan="5">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
@ -235,7 +235,8 @@ export default {
config: config,
info: {},
ImgList: [],
measuresList: []
measuresList: [],
imgList: []
}
},
created() {
@ -258,9 +259,26 @@ export default {
GANGKOU: this.gangkou
}
).then((data) => {
debugger
this.info = { ...data.pd, ...data.Info }
this.ImgList = data.ImgList
this.measuresList = data.measuresList
this.imgList = data.imgList
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) {
this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) {
this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) {
this.info.PRODUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) {
this.info.SAFETY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 4) {
this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
}).catch((e) => {
})
}

5
src/views/map/dialog/electricityCfdD.vue
View File

@ -58,7 +58,7 @@
<td class="bbg-transparent">风险辨识结果</td>
<td colspan="5">{{ pd.RISK_IDENTIFICATION }}</td>
</tr>
<tr>
<tr v-if="gasList">
<td class="bbg-transparent" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
</tr>
<template v-for="(item,index) in gasList">
@ -246,6 +246,9 @@ export default {
this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map
this.otherProtectiveMeasures = this.validStr(this.pd.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}).catch((e) => {
this.listLoading = false
})

43
src/views/map/dialog/electricityOrder.vue
View File

@ -57,7 +57,7 @@
<td class="bbg-transparent">风险辨识结果</td>
<td colspan="5">{{ info.RISK_IDENTIFICATION }}</td>
</tr>
<tr>
<tr v-if="gasList.length>0">
<td class="bbg-transparent" colspan="6">可燃气体分析（运行的生产装置、罐区和具有火灾爆炸危险场所）</td>
</tr>
<template v-for="(item,index) in gasList">
@ -79,7 +79,7 @@
<td colspan="5">{{ formatDate(info.WORK_START_DATE,'YYYY年MM月DD日HH时mm分') }} 至 {{ formatDate(info.WORK_END_DATE,'YYYY年MM月DD日HH时mm分') }}</td>
</tr>
<tr>
<tr v-if="measuresList.length>0">
<td colspan="6">
<table class="table-vi">
<tr class="bbg-transparent">
@ -120,9 +120,7 @@
</td>
</tr>
<tr>
<tr v-if="info.CONFESS_USER_SIGNER_TIME">
<td class="bbg-transparent">安全交底人</td>
<td colspan="10">
<div v-if="info.CONFESS_USER_SIGNER_PATH" style="text-align: right">
@ -132,17 +130,17 @@
</div>
</td>
</tr>
<tr>
<tr v-if="imgList.length>0">
<td class="bbg-transparent">接受交底人</td>
<td colspan="10">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<tr v-if="info.CONFIRM_USER_SIGNER_TIME">
<td colspan="6">
<div>作业负责人意见：{{ info.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
@ -152,7 +150,7 @@
</div>
</td>
</tr>
<tr>
<tr v-if="info.AUDIT_USER_SIGNER_TIME">
<td colspan="6">
<div>用电单位意见：{{ info.AUDIT_CONTENT }}</div>
<div style="text-align: right">
@ -162,7 +160,7 @@
</div>
</td>
</tr>
<tr>
<tr v-if="info.APPROVE_USER_SIGNER_TIME">
<td colspan="6">
<div>配送电单位意见：{{ info.APPROVE_CONTENT }}</div>
<div style="text-align: right">
@ -209,6 +207,7 @@ export default {
},
measuresList: [],
gasList: [],
imgList: [],
otherProtectiveMeasures: []
}
},
@ -235,23 +234,11 @@ export default {
this.info = data.pd
this.measuresList = data.measuresList
this.gasList = data.gasList
this.imgList = data.imgList
this.otherProtectiveMeasures = this.validStr(this.info.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.info.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
console.info(this.otherProtectiveMeasures)
if (!this.info.WORK_OPERATOR_ID) {
this.$set(this.info, 'WORK_OPERATOR_ID', [])
} else {
this.info.WORK_OPERATOR_ID = this.info.WORK_OPERATOR_ID.split(',')
}
if (!this.info.WORK_USER) {
this.$set(this.info, 'WORK_USER', [])
} else {
this.info.WORK_OPERATOR_NAME = this.info.WORK_USER.split(',')
}
if (!this.info.CARD_NO) {
this.$set(this.info, 'CARD_NO', [])
} else {
this.info.WORK_OPERATOR_NUMBER = this.info.CARD_NO.split(',')
}
this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
})
}
}

33
src/views/map/dialog/highworkOrder.vue
View File

@ -113,18 +113,18 @@
</div>
</td>
</tr>
<tr>
<tr v-if="imgList.length>0">
<td class="bbg-transparent">接受交底人</td>
<td colspan="4">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
<tr>
<tr v-if="info.CONSTRUCTION_USER_SIGNER_TIME">
<td colspan="4">
<div>作业负责人意见：{{ info.CONSTRUCTION_CONTENT }}</div>
<div style="text-align: right">
@ -134,7 +134,7 @@
</div>
</td>
</tr>
<tr v-if="info.LEADER_USER_ID">
<tr v-if="info.LEADER_USER_SIGNER_TIME">
<td colspan="4">
<div>所在单位意见：{{ info.LEADER_CONTENT }}</div>
<div style="text-align: right">
@ -144,7 +144,7 @@
</div>
</td>
</tr>
<tr v-if="info.AUDIT_USER_ID">
<tr v-if="info.AUDIT_USER_SIGNER_TIME">
<td colspan="4">
<div>审核部门意见：{{ info.AUDIT_CONTENT }}</div>
<div style="text-align: right">
@ -154,7 +154,7 @@
</div>
</td>
</tr>
<tr v-if="info.APPROVE_USER_ID">
<tr v-if="info.APPROVE_USER_SIGNER_TIME">
<td colspan="4">
<div>审批部门意见：{{ info.APPROVE_CONTENT }}</div>
<div style="text-align: right">
@ -198,7 +198,8 @@ export default {
info: {
OTHER_PROTECTIVE_MEASURES: []
},
measuresList: []
measuresList: [],
imgList: []
}
},
created() {
@ -223,7 +224,19 @@ export default {
).then((data) => {
this.info = data.pd
this.measuresList = data.measuresList
this.imgList = data.imgList
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) {
this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) {
this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) {
this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}
if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) {
this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
}
if (!this.info.OTHER_PROTECTIVE_MEASURES) {
this.info.OTHER_PROTECTIVE_MEASURES = []
} else {

44
src/views/map/dialog/hoistingOrder.vue
View File

@ -48,6 +48,10 @@
</span>
</td>
</tr>
<tr>
<td class="bbg-transparent">关联的其他特殊作业及安全作业票编号</td>
<td colspan="5">{{ info.SPECIAL_WORK }}</td>
</tr>
<tr>
<td class="bbg-transparent">风险辨识结果</td>
<td colspan="5">{{ info.HAZARD_IDENTIFICATION }}</td>
@ -78,7 +82,7 @@
</tr>
<tr v-if="info.LEADER_USER_MEASURES || info.CONFIRM_USER_MEASURES || info.AUDIT_USER_MEASURES || info.APPROVE_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="2">
<td colspan="3">
<div v-if="info.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ info.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ info.LEADER_USER_NAME }}</span>
@ -110,13 +114,13 @@
</div>
</td>
</tr>
<tr>
<tr v-if="imgList.length>0">
<td class="bbg-transparent">接受交底人</td>
<td colspan="5">
<div v-if="info.ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-if="imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + info.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + imgList[0].ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
</div>
</td>
</tr>
@ -237,13 +241,34 @@ export default {
CRANE_DRIVER_NUMBER: []
},
measuresList: [],
oldSupplementaryMeasures: []
oldSupplementaryMeasures: [],
imgList: []
}
},
created() {
this.getData()
},
methods: {
handleStr(measuresList) {
for (let i = 0; i < measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = measuresList[i].PROTECTIVE_MEASURES.split('')
for (let j = 1; j <= 3; j++) {
// 判断字符串是否存在
if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
// 给字符串后面添加上需要的数据
PROTECTIVE_MEASURES.splice(
this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
0,
measuresList[i]['ANSWER' + j]
)
}
}
// 将数组转回字符串
measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
}
return measuresList
},
formatDate(date, format) {
if (date) {
return moment(date).format(format)
@ -261,7 +286,12 @@ export default {
}
).then((data) => {
this.info = data.pd
this.measuresList = data.measuresList
this.measuresList = data.measuresList // 参数map
this.imgList = data.imgList
this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
if (!this.info.CRANE_DRIVER_ID) {
this.$set(this.info, 'CRANE_DRIVER_ID', [])
} else {