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

Compare commits

base: guoyuepeng:094bd9a3e894e1d0e246d4b9bf1afc46422ad26c
Branches Tags
guoyuepeng:dev
guoyuepeng:dev-shanao
guoyuepeng:hyx_2024-10-30_new
guoyuepeng:hyx_2024-11-06_newInspect
guoyuepeng:hyx_2024-11-12_newInspect
guoyuepeng:hyx_2024-11-15_temporary
guoyuepeng:hyx_2024-9-11_changeUpload
guoyuepeng:hyx_2024-9-25_tongbu
guoyuepeng:hyx_2024-9-9_prevention
guoyuepeng:liujun-2024-09-05-九公司人员定位
guoyuepeng:liujun-26-应急管理
guoyuepeng:liujun0703-新项目开发
guoyuepeng:pet
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_20241128
guoyuepeng:2023年12月28日V01.00.50
guoyuepeng:20240528Test
guoyuepeng:2024年1月19日V01.00.51
guoyuepeng:2024年2月1日V1.0.53
guoyuepeng:2024年2月1日V1.0.53.2
guoyuepeng:2024年2月22日v1.0.55
guoyuepeng:240109Dev
guoyuepeng:cmt1.0
guoyuepeng:csy1.0
guoyuepeng:dev-2024年1月8日
guoyuepeng:div-51
guoyuepeng:gypXg
guoyuepeng:liujun-07-22-风向模块迁移
guoyuepeng:liujun0708-动火作业流程图逻辑修改
guoyuepeng:main
guoyuepeng:2024-05-09版本
guoyuepeng:2024-04-24版本
guoyuepeng:2024-04-19升级
..
compare: guoyuepeng:8685c9663f146279f80a7675a192ca6cdbb67314
Branches Tags
guoyuepeng:dev
guoyuepeng:dev-shanao
guoyuepeng:hyx_2024-10-30_new
guoyuepeng:hyx_2024-11-06_newInspect
guoyuepeng:hyx_2024-11-12_newInspect
guoyuepeng:hyx_2024-11-15_temporary
guoyuepeng:hyx_2024-9-11_changeUpload
guoyuepeng:hyx_2024-9-25_tongbu
guoyuepeng:hyx_2024-9-9_prevention
guoyuepeng:liujun-2024-09-05-九公司人员定位
guoyuepeng:liujun-26-应急管理
guoyuepeng:liujun0703-新项目开发
guoyuepeng:pet
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_20241128
guoyuepeng:2023年12月28日V01.00.50
guoyuepeng:20240528Test
guoyuepeng:2024年1月19日V01.00.51
guoyuepeng:2024年2月1日V1.0.53
guoyuepeng:2024年2月1日V1.0.53.2
guoyuepeng:2024年2月22日v1.0.55
guoyuepeng:240109Dev
guoyuepeng:cmt1.0
guoyuepeng:csy1.0
guoyuepeng:dev-2024年1月8日
guoyuepeng:div-51
guoyuepeng:gypXg
guoyuepeng:liujun-07-22-风向模块迁移
guoyuepeng:liujun0708-动火作业流程图逻辑修改
guoyuepeng:main
guoyuepeng:2024-05-09版本
guoyuepeng:2024-04-24版本
guoyuepeng:2024-04-19升级

No commits in common. "094bd9a3e894e1d0e246d4b9bf1afc46422ad26c" and "8685c9663f146279f80a7675a192ca6cdbb67314" have entirely different histories.
094bd9a3e8 ... 8685c9663f

3 changed files with 20 additions and 52 deletions
Show Stats Expand all files Collapse all files

20
src/views/hotwork_cfd/hotwork/components/detail.vue
View File

@ -165,15 +165,14 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
<div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr>
<td class="bbg">监护人</td>
<td colspan="3">
@ -334,16 +333,7 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}

19
src/views/hotwork_cfd/pigeonhole/components/detail.vue
View File

@ -164,12 +164,10 @@
<tr>
<td class="bbg">接受交底人</td>
<td colspan="10">
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
<div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -417,16 +415,7 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}

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

@ -138,12 +138,10 @@
<tr>
<td class="bbg-transparent">接受交底人</td>
<td colspan="10">
<div v-for="item in acceptConfessList" :key="item.USER_ID">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + signature.trim()" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
<div v-for="item in acceptConfessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -169,7 +167,7 @@
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div>
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -179,7 +177,7 @@
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div>
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -189,7 +187,7 @@
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div>
<div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -199,7 +197,7 @@
</tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div>
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -209,7 +207,7 @@
</tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div>
<div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -219,7 +217,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div>
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -229,7 +227,7 @@
</tr>
<tr v-if="imgList1.length>0">
<td colspan="10">
<div>完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}</div>
<div>完工验收：{{ pd.ACCEPT_CONTENT }}</div>
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -321,16 +319,7 @@ export default {
this.confessList.push(item)
}
})
// data.pd.acceptConfessList.forEach(item => {
// if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
// this.acceptConfessList.push(item)
// }
// })
data.pd.acceptConfessList.forEach(item => {
// 将 APPROVAL_SIGNATURE 转换为数组
if (item.APPROVAL_SIGNATURE) {
item.APPROVAL_SIGNATURE = item.APPROVAL_SIGNATURE.split(';')
}
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.acceptConfessList.push(item)
}