From 52cc054b20045c9751e6b80a22063eede2a5326a Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 11 Jun 2024 09:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?= =?UTF-8?q?=E4=BA=BA=E7=94=B1=E4=B8=80=E4=B8=AA=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=A4=9A=E4=B8=AA=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8E=B0=E5=9C=BA=E6=98=AF=E5=90=A6=E6=B8=85?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E9=81=97?= =?UTF-8?q?=E7=95=99=E7=81=AB=E7=A7=8D=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- .../hotwork_cfd/hotwork/components/detail.vue | 32 +++++++++++++++++-- .../pigeonhole/components/detail.vue | 32 ++++++++++++++++--- src/views/map/dialog/hotworkFirst.vue | 12 +++++-- static/config.js | 4 +-- 5 files changed, 69 insertions(+), 13 deletions(-) diff --git a/config/index.js b/config/index.js index f15bf6e..eb65708 100644 --- a/config/index.js +++ b/config/index.js @@ -11,7 +11,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'http://192.168.151.43:8091/', + target: 'http://192.168.0.49:8091/', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue index 6c90e95..2bcb9b9 100644 --- a/src/views/hotwork_cfd/hotwork/components/detail.vue +++ b/src/views/hotwork_cfd/hotwork/components/detail.vue @@ -75,6 +75,25 @@ 动火作业实施时间 {{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止 + + 动火是否完成 + + 已完成 + 未完成 + + 作业现场是否清理 + + 已清理 + 未清理 + + + + 是否存在遗留火种 + + 无遗留火种 + 未确定现场是否存在遗留火种 + + @@ -149,13 +168,14 @@ + - + + + + + + + + + +
接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
监护人 @@ -270,6 +290,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -315,6 +336,11 @@ 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) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') diff --git a/src/views/hotwork_cfd/pigeonhole/components/detail.vue b/src/views/hotwork_cfd/pigeonhole/components/detail.vue index 7a570fe..a60dc40 100644 --- a/src/views/hotwork_cfd/pigeonhole/components/detail.vue +++ b/src/views/hotwork_cfd/pigeonhole/components/detail.vue @@ -74,7 +74,25 @@ 动火作业实施时间 {{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止
动火是否完成 + 已完成 + 未完成 + 作业现场是否清理 + 已清理 + 未清理 +
是否存在遗留火种 + 无遗留火种 + 未确定现场是否存在遗留火种 +
@@ -149,10 +167,10 @@ @@ -274,6 +292,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -399,6 +418,11 @@ 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) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue index a10ce5e..19a8b7f 100644 --- a/src/views/map/dialog/hotworkFirst.vue +++ b/src/views/map/dialog/hotworkFirst.vue @@ -138,10 +138,10 @@ @@ -271,6 +271,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -318,6 +319,11 @@ 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) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') diff --git a/static/config.js b/static/config.js index e50846a..509d709 100644 --- a/static/config.js +++ b/static/config.js @@ -1,7 +1,7 @@ // eslint-disable-next-line no-unused-vars const config = { - weburl: 'http://192.168.151.43:8080/', // 前台地址 - httpurl: 'http://192.168.151.43:8091/', // 后台地址 + weburl: 'http://192.168.0.49:8080/', // 前台地址 + httpurl: 'http://192.168.0.49:8091/', // 后台地址 qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台 adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/', // 正式
接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}