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

Compare commits

base: guoyuepeng:9ea27fbb7f1225352c600f7647194321227655b5
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-12-11_humanResource
guoyuepeng:hyx_2024-9-11_changeUpload
guoyuepeng:hyx_2024-9-25_tongbu
guoyuepeng:hyx_2024-9-9_prevention
guoyuepeng:hyx_门口门禁
guoyuepeng:liujun-2024-09-05-九公司人员定位
guoyuepeng:liujun-26-应急管理
guoyuepeng:liujun-267公司新增人员定位
guoyuepeng:liujun0703-新项目开发
guoyuepeng:pet
guoyuepeng:pet_门口门禁
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_20241128
guoyuepeng:zhy_new_1203
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:c56058b74de87bd31780b1609fefbefd33336c1b
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-12-11_humanResource
guoyuepeng:hyx_2024-9-11_changeUpload
guoyuepeng:hyx_2024-9-25_tongbu
guoyuepeng:hyx_2024-9-9_prevention
guoyuepeng:hyx_门口门禁
guoyuepeng:liujun-2024-09-05-九公司人员定位
guoyuepeng:liujun-26-应急管理
guoyuepeng:liujun-267公司新增人员定位
guoyuepeng:liujun0703-新项目开发
guoyuepeng:pet
guoyuepeng:pet_门口门禁
guoyuepeng:xuyifeng-0724-人员中台对接-dev
guoyuepeng:zhy_20241128
guoyuepeng:zhy_new_1203
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. "9ea27fbb7f1225352c600f7647194321227655b5" and "c56058b74de87bd31780b1609fefbefd33336c1b" have entirely different histories.
9ea27fbb7f ... c56058b74d

11 changed files with 23634 additions and 623 deletions
Show Stats Expand all files Collapse all files

2
config/index.js
View File

@ -11,7 +11,7 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
'/api': { '/api': {
target: 'http://192.168.0.49:8091/', target: 'http://192.168.151.43:8091/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/api': ''

24072
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -5,7 +5,7 @@
"author": "", "author": "",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.0.90", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.43",
"start": "npm run dev", "start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage", "unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",

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

@ -75,22 +75,6 @@
<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 v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
<td class="bbg">动火是否完成</td>
<td>
<span>已完成</span>
</td>
<td class="bbg">动火是否完成</td>
<td>
<span>已清理</span>
</td>
</tr>
<tr v-if="pd.NO_REMAINING_EMBERS === '1'">
<td class="bbg">是否存在遗留火种</td>
<td>
<span>无遗留火种</span>
</td>
</tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<table class="table-ui"> <table class="table-ui">
@ -165,12 +149,10 @@
<tr> <tr>
<td class="bbg">接受交底人</td> <td class="bbg">接受交底人</td>
<td colspan="10"> <td colspan="10">
<div v-for="item in acceptConfessList" :key="item.USER_ID"> <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" 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 + signature.trim()" alt="" width="100" height="100"> <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
</div> </div>
</td> </td>
</tr> </tr>
@ -196,7 +178,7 @@
</tr> </tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH"> <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div> <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -206,7 +188,7 @@
</tr> </tr>
<tr v-if="pd.BELONGING_SIGNATURE"> <tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6"> <td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div> <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -216,7 +198,7 @@
</tr> </tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH"> <tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div> <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -226,7 +208,7 @@
</tr> </tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH"> <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div> <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -236,7 +218,7 @@
</tr> </tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH"> <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div> <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -246,7 +228,7 @@
</tr> </tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH"> <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div> <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -256,7 +238,7 @@
</tr> </tr>
<tr v-if="imgList1.length>0"> <tr v-if="imgList1.length>0">
<td colspan="10"> <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"> <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -288,7 +270,6 @@ export default {
imgList: [], imgList: [],
imgList1: [], imgList1: [],
otherProtectiveMeasures: [], otherProtectiveMeasures: [],
acceptConfessList: [],
confessList: [] confessList: []
} }
}, },
@ -334,20 +315,6 @@ 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)
// }
// })
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)
}
})
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('')

6
src/views/hotwork_cfd/hotwork/components/list.vue
View File

@ -51,14 +51,14 @@
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span> <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span> <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</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==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</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==5">动火审批人待审核</span>
<span v-else-if="row.APPLY_STATUS==6">班长待验票</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==7">待验收</span>
<span v-else-if="row.APPLY_STATUS==8">验收归档</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==-1.5">项目负责人审核打回</span>
<span v-else-if="row.APPLY_STATUS==-2">作业负责人审核打回</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==-4">属地监管单位审核打回</span>
<span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span> <span v-else-if="row.APPLY_STATUS==-5">安全管理部门审核打回</span>
@ -217,7 +217,7 @@ export default {
{ ID: '', NAME: '请选择' }, { ID: '', NAME: '请选择' },
{ ID: '0', NAME: '动火作业待提交' }, { ID: '0', NAME: '动火作业待提交' },
{ ID: '1', NAME: '作业负责人待审核' }, { ID: '1', NAME: '作业负责人待审核' },
{ ID: '1.5', NAME: '项目主管部门待审核' }, { ID: '1.5', NAME: '项目负责人待审核' },
{ ID: '2', NAME: '属地监管单位待审核' }, { ID: '2', NAME: '属地监管单位待审核' },
{ ID: '4', NAME: '安全管理部门待审核' }, { ID: '4', NAME: '安全管理部门待审核' },
{ ID: '5', NAME: '动火审批人待审核' }, { ID: '5', NAME: '动火审批人待审核' },

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

@ -74,22 +74,7 @@
<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 v-if="pd.FIRE_COMPLETED === '1' && pd.SITE_CLEANED === '1'">
<td class="bbg">动火是否完成</td>
<td>
<span>已完成</span>
</td>
<td class="bbg">动火是否完成</td>
<td>
<span>已清理</span>
</td>
</tr>
<tr v-if="pd.NO_REMAINING_EMBERS === '1'">
<td class="bbg">是否存在遗留火种</td>
<td>
<span>无遗留火种</span>
</td>
</tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<table class="table-ui"> <table class="table-ui">
@ -164,12 +149,10 @@
<tr> <tr>
<td class="bbg">接受交底人</td> <td class="bbg">接受交底人</td>
<td colspan="10"> <td colspan="10">
<div v-for="item in acceptConfessList" :key="item.USER_ID"> <div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<div v-for="(signature, index) in item.APPROVAL_SIGNATURE" :key="index" 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 + signature.trim()" alt="" width="100" height="100"> <span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
<span>{{ item.APPROVAL_SIGNATURE_TIME.split(',')[0] }}</span>
</div>
</div> </div>
</td> </td>
</tr> </tr>
@ -195,7 +178,7 @@
</tr> </tr>
<tr v-if="pd.CONFIRM_USER_SIGNER_PATH"> <tr v-if="pd.CONFIRM_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}</div> <div>作业负责人意见：{{ pd.CONFIRM_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -205,7 +188,7 @@
</tr> </tr>
<tr v-if="pd.BELONGING_SIGNATURE"> <tr v-if="pd.BELONGING_SIGNATURE">
<td colspan="6"> <td colspan="6">
<div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}</div> <div>项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.BELONGING_SIGNATURE" alt="" width="100" height="100">
@ -215,7 +198,7 @@
</tr> </tr>
<tr v-if="pd.LEADER_USER_SIGNER_PATH"> <tr v-if="pd.LEADER_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>属地监管单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}</div> <div>属地监管单位意见：{{ pd.LEADER_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.LEADER_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -225,7 +208,7 @@
</tr> </tr>
<tr v-if="pd.AUDIT_USER_SIGNER_PATH"> <tr v-if="pd.AUDIT_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}</div> <div>安全管理部门意见：{{ pd.AUDIT_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.AUDIT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -235,7 +218,7 @@
</tr> </tr>
<tr v-if="pd.APPROVE_USER_SIGNER_PATH"> <tr v-if="pd.APPROVE_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}</div> <div>动火审批人意见：{{ pd.APPROVE_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -245,7 +228,7 @@
</tr> </tr>
<tr v-if="pd.MONITOR_USER_SIGNER_PATH"> <tr v-if="pd.MONITOR_USER_SIGNER_PATH">
<td colspan="6"> <td colspan="6">
<div>动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}</div> <div>动火前验票负责人：{{ pd.MONITOR_CONTENT }}</div>
<div style="text-align: right"> <div style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + pd.MONITOR_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -255,7 +238,7 @@
</tr> </tr>
<tr v-if="imgList1.length>0"> <tr v-if="imgList1.length>0">
<td colspan="10"> <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"> <div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
<span>签字：</span> <span>签字：</span>
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100"> <img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
@ -291,7 +274,6 @@ export default {
imgList: [], imgList: [],
imgList1: [], imgList1: [],
otherProtectiveMeasures: [], otherProtectiveMeasures: [],
acceptConfessList: [],
confessList: [] confessList: []
} }
}, },
@ -417,20 +399,6 @@ 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)
// }
// })
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)
}
})
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('')

2
src/views/hotwork_cfd/pigeonhole/components/list.vue
View File

@ -44,7 +44,7 @@
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.APPLY_STATUS==0">动火作业待提交</span> <span v-if="row.APPLY_STATUS==0">动火作业待提交</span>
<span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span> <span v-else-if="row.APPLY_STATUS==1">作业负责人待审核</span>
<span v-else-if="row.APPLY_STATUS==1.5">项目主管部门待审核</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==2">属地监管单位待审核</span>
<span v-else-if="row.APPLY_STATUS==4">安全管理部门待审核</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==5">动火审批人待审核</span>

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

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

13
src/views/xgf/flow/components/sendUtil.vue
View File

@ -292,15 +292,10 @@ export default {
} }
upload('/xgf/user/approveMax', formData) upload('/xgf/user/approveMax', formData)
.then((data) => { .then((data) => {
if (data.code !== '0') { this.$message.success('推送成功')
this.$message.error(data.errorMessage) this.visible = false
} else { this.$emit('refresh', '')
this.$message.success('推送成功') this.handleClose()
this.visible = false
this.handleClose()
this.$emit('refresh', '')
}
this.loading = false this.loading = false
}) })
.catch((e) => { .catch((e) => {

4
static/config.js
View File

@ -1,7 +1,7 @@
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const config = { const config = {
weburl: 'http://192.168.0.49:8080/', // 前台地址 weburl: 'http://192.168.151.43:8080/', // 前台地址
httpurl: 'http://192.168.0.49:8091/', // 后台地址 httpurl: 'http://192.168.151.43:8091/', // 后台地址
qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台 qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/', adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式 // 正式

6
static/config_dev.js
View File

@ -1,9 +1,7 @@
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const config = { const config = {
// weburl: 'http://192.168.151.43:8080/', // 前台地址 weburl: 'http://192.168.151.43:8080/', // 前台地址
// httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址 httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
weburl: 'http://192.168.0.49:8080/', // 前台地址
httpurl: 'http://192.168.0.49:8091/', // 后台地址
qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台 qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/', adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式 // 正式