监管端危险作业->动火作业详情页面->接受交底人从显示一个修改为显示多个;
监管端危险作业->动火作业详情页面->新增显示动火是否完成,作业现成是否清理,是否存在遗留火种三个字段;20240528Test
parent
1cdca25e3c
commit
fcf94011d3
|
@ -75,6 +75,25 @@
|
||||||
<td class="bbg">动火作业实施时间</td>
|
<td class="bbg">动火作业实施时间</td>
|
||||||
<td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
|
<td colspan="3">{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="bbg">动火是否完成</td>
|
||||||
|
<td>
|
||||||
|
<span v-if="pd.FIRE_COMPLETED == 1">已完成</span>
|
||||||
|
<span v-else-if ="pd.FIRE_COMPLETED == 0">未完成</span>
|
||||||
|
</td>
|
||||||
|
<td class="bbg">作业现场是否清理</td>
|
||||||
|
<td>
|
||||||
|
<span v-if="pd.SITE_CLEANED == 1">已清理</span>
|
||||||
|
<span v-else-if ="pd.SITE_CLEANED == 0">未清理</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="bbg">是否存在遗留火种</td>
|
||||||
|
<td>
|
||||||
|
<span v-if="pd.NO_REMAINING_EMBERS == 1">无遗留</span>
|
||||||
|
<span v-else-if ="pd.NO_REMAINING_EMBERS == 0">未确定无遗留火种</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="4">
|
<td colspan="4">
|
||||||
<table class="table-ui">
|
<table class="table-ui">
|
||||||
|
@ -146,13 +165,23 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bbg">接受交底人</td>
|
<td class="bbg">接受交底人</td>
|
||||||
<td colspan="10">
|
<td colspan="10">
|
||||||
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
|
<div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
|
||||||
<span>签字:</span>
|
<span>签字:</span>
|
||||||
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
|
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
|
||||||
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
|
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<!-- <tr>-->
|
||||||
|
<!-- <td class="bbg">接受交底人</td>-->
|
||||||
|
<!-- <td colspan="10">-->
|
||||||
|
<!-- <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">-->
|
||||||
|
<!-- <span>签字:</span>-->
|
||||||
|
<!-- <img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">-->
|
||||||
|
<!-- <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </td>-->
|
||||||
|
<!-- </tr>-->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bbg">监护人</td>
|
<td class="bbg">监护人</td>
|
||||||
<td colspan="3">
|
<td colspan="3">
|
||||||
|
@ -267,6 +296,7 @@ export default {
|
||||||
imgList: [],
|
imgList: [],
|
||||||
imgList1: [],
|
imgList1: [],
|
||||||
otherProtectiveMeasures: [],
|
otherProtectiveMeasures: [],
|
||||||
|
acceptConfessList: [],
|
||||||
confessList: []
|
confessList: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -312,6 +342,11 @@ export default {
|
||||||
this.confessList.push(item)
|
this.confessList.push(item)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
data.pd.acceptConfessList.forEach(item => {
|
||||||
|
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
|
||||||
|
this.acceptConfessList.push(item)
|
||||||
|
}
|
||||||
|
})
|
||||||
for (let i = 0; i < data.measuresList.length; i++) {
|
for (let i = 0; i < data.measuresList.length; i++) {
|
||||||
// 将字符串转成数组
|
// 将字符串转成数组
|
||||||
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
|
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
|
||||||
|
|
Loading…
Reference in New Issue