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

Merge remote-tracking branch 'origin/pet' into pet

pet_li_6.6
liujun 2024-04-30 11:39:07 +08:00
parent a9e4a77107 a4605baf7e
commit 7e6046ec0c
4 changed files with 129 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue
View File

@ -35,6 +35,12 @@
<td class="bbg">动火人及证书编号</td>
<td colspan="3">{{ pd.WORK_USER }}</td>
</tr>
<tr>
<td class="bbg">动火操作人图片</td>
<td colspan="3">
<img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
</td>
</tr>
<tr>
<td class="bbg">作业单位</td>
<td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@ -52,7 +58,7 @@
<tr :key="index">
<td class="bbg">分析结果/%</td>
<td>{{ item.ANALYZE_RESULT }}</td>
<td class="bbg">分析人</td>
<td class="bbg">气体分析单位负责人</td>
<td>{{ item.ANALYZE_USER }}</td>
</tr>
</template>
@ -97,28 +103,30 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<tr
v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES|| pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
<div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
</div>
<div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
</div>
<div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
</div>
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
<span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
</div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
<span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
<span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
</div>
<div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
<span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
<span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
</div>
</td>
</tr>
@ -128,10 +136,10 @@
<tr>
<td class="bbg">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -155,6 +163,16 @@
</div>
</td>
</tr>
<tr>
<td class="bbg">安全措施确认人</td>
<td colspan="3">
<div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@ -165,6 +183,16 @@
</div>
</td>
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<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">
<span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ pd.LEADER_CONTENT }}</div>
@ -197,7 +225,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前，岗位当班班长验票情况：{{ 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">
@ -238,7 +266,8 @@ export default {
gasList: [],
imgList: [],
imgList1: [],
otherProtectiveMeasures: []
otherProtectiveMeasures: [],
confessList: []
}
},
created() {
@ -278,6 +307,11 @@ export default {
this.pd = data.pd // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList1
data.pd.confessList.forEach(item => {
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.confessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@ -313,6 +347,13 @@ export default {
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
const dongHuoCaoZuoRenPic = data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
}
}
}).catch((e) => {
this.listLoading = false
})

9
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
View File

@ -52,12 +52,14 @@
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">所在单位待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</span>
<span v-else-if="row.APPLY_STATUS==5">动火审批人待审核</span>
<span v-else-if="row.APPLY_STATUS==6">班长待验票</span>
<span v-else-if="row.APPLY_STATUS==7">待验收</span>
<span v-else-if="row.APPLY_STATUS==8">验收归档</span>
<span v-else-if="row.APPLY_STATUS==-1.5">项目负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-4">所在单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@ -72,12 +74,14 @@
<template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==1">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==1.5">{{ row.BELONGING_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==2">{{ row.LEADER_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==4">{{ row.AUDIT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==5">{{ row.APPROVE_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==6">{{ row.MONITOR_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==7">{{ row.ACCEPT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==8">{{ row.ACCEPT_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-1.5">{{ row.BELONGING_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-2">{{ row.CONFIRM_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-4">{{ row.LEADER_USER_NAME }}</span>
<span v-else-if="row.APPLY_STATUS==-5">{{ row.AUDIT_USER_NAME }}</span>
@ -144,8 +148,7 @@ export default {
statusList: [
{ ID: '0', NAME: '特级' },
{ ID: '1', NAME: '一级' },
{ ID: '2', NAME: '二级' },
{ ID: '4', NAME: '三级' }
{ ID: '2', NAME: '二级' }
],
STATUS: '',
DEPTIDS: ''

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

@ -27,6 +27,12 @@
<td class="bbg-transparent">动火人及证书编号</td>
<td colspan="3">{{ pd.WORK_USER }}</td>
</tr>
<tr>
<td class="bbg-transparent">动火操作人图片</td>
<td colspan="3">
<img v-viewer v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :src="pd.dongHuoCaoZuoRenPic[index]" :key="index" alt="" width="100" height="100">
</td>
</tr>
<tr>
<td class="bbg-transparent">作业单位</td>
<td>{{ pd.CONFIRM_DEPARTMENT_NAME }}</td>
@ -44,7 +50,7 @@
<tr :key="index">
<td class="bbg-transparent">分析结果/%</td>
<td>{{ item.ANALYZE_RESULT }}</td>
<td class="bbg-transparent">分析人</td>
<td class="bbg-transparent">气体单位负责人</td>
<td>{{ item.ANALYZE_USER }}</td>
</tr>
</template>
@ -89,28 +95,33 @@
{{ item.CONFIRM_NAME }}
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_MEASURES || pd.LEADER_USER_MEASURES || pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<tr v-if="pd.SAFETY_USER_MEASURES || pd.CONFIRM_OTHER_CONTENT || pd.BELONGING_USER_MEASURES || pd.GUARDIAN_USER_MEASURES || pd.LEADER_USER_MEASURES
|| pd.AUDIT_USER_MEASURES || pd.APPROVE_USER_MEASURES || pd.MONITOR_USER_MEASURES">
<td>{{ measuresList.length + 1 }}</td>
<td colspan="3">
<div v-if="pd.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>其他安全措施：{{ pd.CONFIRM_USER_MEASURES }}</span>
<span>编制人：{{ pd.CONFIRM_USER_NAME }}</span>
<div v-if="pd.SAFETY_USER_MEASURES" style="display: flex;justify-content: space-between;">
<span>安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}</span>
</div>
<div v-if="pd.CONFIRM_OTHER_CONTENT" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }}</span>
</div>
<div v-if="pd.BELONGING_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}</span>
</div>
<!-- <div v-if="pd.GUARDIAN_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">-->
<!-- <span>属地监管单位：{{ pd.GUARDIAN_USER_MEASURES }}</span>-->
<!-- </div>-->
<div v-if="pd.LEADER_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.LEADER_USER_MEASURES }}</span>
<span>编制人：{{ pd.LEADER_USER_NAME }}</span>
<span>属地监管单位：{{ pd.LEADER_USER_MEASURES }}</span>
</div>
<div v-if="pd.AUDIT_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.AUDIT_USER_MEASURES }}</span>
<span>编制人：{{ pd.AUDIT_USER_NAME }}</span>
<span>安全管理部门：{{ pd.AUDIT_USER_MEASURES }}</span>
</div>
<div v-if="pd.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.APPROVE_USER_MEASURES }}</span>
<span>编制人：{{ pd.APPROVE_USER_NAME }}</span>
<span>动火审批人：{{ pd.APPROVE_USER_MEASURES }}</span>
</div>
<div v-if="pd.MONITOR_USER_MEASURES" style="display: flex;justify-content: space-between;margin-top: 10px;">
<span>其他安全措施：{{ pd.MONITOR_USER_MEASURES }}</span>
<span>编制人：{{ pd.MONITOR_USER_NAME }}</span>
<span>动火前验票：{{ pd.MONITOR_USER_MEASURES }}</span>
</div>
</td>
</tr>
@ -120,10 +131,10 @@
<tr>
<td class="bbg-transparent">安全交底人</td>
<td colspan="10">
<div v-if="pd.CONFESS_USER_SIGNER_PATH" style="text-align: right">
<div v-for="item in confessList" :key="item.USER_ID" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
<span>{{ pd.CONFESS_USER_SIGNER_TIME }}</span>
<img v-viewer :src="config.fileUrl + item.APPROVAL_SIGNATURE" alt="" width="100" height="100">
<span>{{ item.APPROVAL_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
@ -147,6 +158,16 @@
</div>
</td>
</tr>
<tr>
<td class="bbg-transparent">安全措施确认人</td>
<td colspan="3">
<div v-if="pd.SAFETY_SIGNATURE" style="text-align: right">
<span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.SAFETY_SIGNATURE" alt="" width="100" height="100">
<span>{{ pd.SAFETY_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
@ -157,9 +178,19 @@
</div>
</td>
</tr>
<tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6">
<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">
<span>{{ pd.BELONGING_SIGNATURE_TIME }}</span>
</div>
</td>
</tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6">
<div>所在单位意见：{{ 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">
@ -189,7 +220,7 @@
</tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6">
<div>动火前，岗位当班班长验票情况：{{ 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">
@ -241,7 +272,8 @@ export default {
gasList: [],
imgList: [],
imgList1: [],
otherProtectiveMeasures: []
otherProtectiveMeasures: [],
confessList: []
}
},
created() {
@ -283,6 +315,11 @@ export default {
this.pd = data.pd // 参数map
this.imgList = data.imgList
this.imgList1 = data.imgList1
data.pd.confessList.forEach(item => {
if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') {
this.confessList.push(item)
}
})
for (let i = 0; i < data.measuresList.length; i++) {
// 将字符串转成数组
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
@ -318,6 +355,13 @@ export default {
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4]
}
let dongHuoCaoZuoRenPic = data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH)
}
}
}).catch((e) => {
this.listLoading = false
})

2
src/views/map/dialog/index.vue
View File

@ -27,7 +27,7 @@
<hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
<!--秦港一公司 动火作业 详细页面 end-->
<!--其他公司 动火作业 详细页面 start-->
<hotwork v-if="type === 'HOTWORK' || type === 'HOTWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
<hotwork v-if="(type === 'HOTWORK' || type === 'HOTWORK00005') && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
<!--其他公司 动火作业 详细页面 end-->
<!--其他七项作业共用一个详细页面 start-->
<confinedspace v-if="type === 'CONFINEDSPACE' || type === 'CONFINEDSPACE00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>