From 66fcc4e31dabeff491e694503f1e281d78e953ac Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Fri, 29 Dec 2023 16:44:12 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=B7=A5=E7=A8=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/index.vue | 40 +++++++++++++++++----------------- src/views/map/js/dragentity.js | 10 ++++----- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 154a964..7151670 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -686,26 +686,6 @@ export default { } ] }, - { - img: require('../../assets/map/gangkou_index/img11.png'), - checkImg: require('../../assets/map/gangkou_index/img11_on.png'), - label: '边界入侵', - containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], - eliminateAuthorization: [], - pointUrl: '/map/mapPlatformelectronic/listAllLocation', - list: [ - { - label: '摄像头', - dialog_width: '1200px', - check: false, - type: 'bianjieruqin', - img: require('../../assets/map/gangkou_index/buttom/ico26.png'), - checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'), - containAuthorization: [], - eliminateAuthorization: [] - } - ] - }, { img: require('../../assets/map/gangkou_index/img12.png'), checkImg: require('../../assets/map/gangkou_index/img12_on.png'), @@ -736,6 +716,26 @@ export default { } ] }, + { + img: require('../../assets/map/gangkou_index/img11.png'), + checkImg: require('../../assets/map/gangkou_index/img11_on.png'), + label: '边界入侵', + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], + eliminateAuthorization: [], + pointUrl: '/map/mapPlatformelectronic/listAllLocation', + list: [ + { + label: '摄像头', + dialog_width: '1200px', + check: false, + type: 'bianjieruqin', + img: require('../../assets/map/gangkou_index/buttom/ico26.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'), + containAuthorization: [], + eliminateAuthorization: [] + } + ] + }, { img: require('../../assets/map/gangkou_index/img9.png'), checkImg: require('../../assets/map/gangkou_index/img9_on.png'), diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index f538118..7049e45 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -41,10 +41,10 @@ const cfd_img1_0_3 = require('../../../assets/map/gangkou_index/point/icon29.png const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png') -const img6_0 = require('../../../assets/map/gangkou_index/point/ico26.png') +const img6_0 = require('../../../assets/map/gangkou_index/point/ico30.png') +const img6_1 = require('../../../assets/map/gangkou_index/point/ico31.png') -const img7_0 = require('../../../assets/map/gangkou_index/point/ico30.png') -const img7_1 = require('../../../assets/map/gangkou_index/point/ico31.png') +const img7_0 = require('../../../assets/map/gangkou_index/point/ico26.png') const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png') const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png') @@ -58,8 +58,8 @@ const imgMap = { cfd_img3_0, img3_0, img3_1, img4_0, img4_0_1, img4_0_2, img4_0_3, img4_1, img5_0, - img6_0, - img7_0, img7_1, + img6_0, img6_1, + img7_0, img8_0, img8_1, img8_2, img8_3, cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3 } From c8fe830e31bb5946acadd4b1554e1393b8c45366 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 3 Jan 2024 10:31:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=9C=89=E9=99=90?= =?UTF-8?q?=E7=A9=BA=E9=97=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/dialog/confinedspace.vue | 371 ++++++++++++------------- src/views/map/dialog/index.vue | 34 +-- 2 files changed, 187 insertions(+), 218 deletions(-) diff --git a/src/views/map/dialog/confinedspace.vue b/src/views/map/dialog/confinedspace.vue index 29aae12..d6fbf90 100644 --- a/src/views/map/dialog/confinedspace.vue +++ b/src/views/map/dialog/confinedspace.vue @@ -2,219 +2,179 @@

有限空间作业许可证

-
编号:{{ info.WORK_PERMIT_NUMBER }}
+
编号:{{ info.CHECK_NO }}
- - - - + + + + - - - - - + + + + - - - - - - - - - + - - + + + + + From fdbecc3f17f8a3387a3db798325d143dac32f385 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 4 Jan 2024 16:44:12 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=85=B7=E4=BD=93=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/outsourced/components/info.vue | 2 -- src/views/map/dialog/outSourceInfo.vue | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/keyprojects/outsourced/components/info.vue b/src/views/keyprojects/outsourced/components/info.vue index 90ead19..8da1a64 100644 --- a/src/views/keyprojects/outsourced/components/info.vue +++ b/src/views/keyprojects/outsourced/components/info.vue @@ -113,8 +113,6 @@ - diff --git a/src/views/map/dialog/outSourceInfo.vue b/src/views/map/dialog/outSourceInfo.vue index 417c973..224088b 100644 --- a/src/views/map/dialog/outSourceInfo.vue +++ b/src/views/map/dialog/outSourceInfo.vue @@ -76,6 +76,10 @@ 结束申请中 + + + + From d027db8bb74f426fd6c39747cd3d0306162d3578 Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 8 Jan 2024 16:39:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/supervision/components/info.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/application/supervision/components/info.vue b/src/views/application/supervision/components/info.vue index 1ee567f..a30efe9 100644 --- a/src/views/application/supervision/components/info.vue +++ b/src/views/application/supervision/components/info.vue @@ -403,7 +403,11 @@ export default { this.pd = data.pd this.hotUserList = data.hotUserList for (let i = 0; i < data.hotOperator.length; i++) { - this.hotOperatorNames += data.hotOperator[i].userName2 + ';' + if (i === data.hotOperator.length - 1) { + this.hotOperatorNames += data.hotOperator[i].userName2 + } else { + this.hotOperatorNames += data.hotOperator[i].userName2 + ';' + } } this.corpinfo = data.corpinfo From ec260804250824c8d583f6a52266722d23f8ba0b Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 8 Jan 2024 19:10:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/pigeonhole/components/info.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/application/pigeonhole/components/info.vue b/src/views/application/pigeonhole/components/info.vue index ce54bcf..b7a86c3 100644 --- a/src/views/application/pigeonhole/components/info.vue +++ b/src/views/application/pigeonhole/components/info.vue @@ -74,7 +74,7 @@ - {{ formatTime(hotUserList[1].OPERATTIME) }} + {{ formatTime(hotUserList[1].OPERATTIME) }} @@ -87,7 +87,7 @@ - {{ formatTime(hotUserList[2].OPERATTIME) }} + {{ formatTime(hotUserList[2].OPERATTIME) }} @@ -100,7 +100,7 @@ - {{ formatTime(hotUserList[3].OPERATTIME) }} + {{ formatTime(hotUserList[3].OPERATTIME) }} @@ -113,7 +113,7 @@ - {{ formatTime(hotUserList[4].OPERATTIME) }} + {{ formatTime(hotUserList[4].OPERATTIME) }} @@ -130,7 +130,7 @@ - {{ formatTime(hotUserList[5].OPERATTIME) }} + {{ formatTime(hotUserList[5].OPERATTIME) }} @@ -143,7 +143,7 @@ - {{ formatTime(hotUserList[6].OPERATTIME) }} + {{ formatTime(hotUserList[6].OPERATTIME) }} @@ -156,7 +156,7 @@ - {{ formatTime(hotUserList[7].OPERATTIME) }} + {{ formatTime(hotUserList[7].OPERATTIME) }} @@ -169,7 +169,7 @@ - {{ formatTime(hotUserList[8].OPERATTIME) }} + {{ formatTime(hotUserList[8].OPERATTIME) }} @@ -182,7 +182,7 @@ - {{ formatTime(hotUserList[9].OPERATTIME) }} + {{ formatTime(hotUserList[9].OPERATTIME) }}
管理单位{{ info.MANAGEMENT_UNIT_NAME }}作业单位{{ info.WORK_UNIT_NAME }}作业申请单位{{ info.APPLY_DEPARTMENT_NAME }}作业申请时间{{ info.CREATTIME }}
作业地点{{ info.WORK_LOCATION }}有限空间名称及编号{{ info.RESTRICTED_SPACE_NAME }}受限空间名称{{ info.LIMITSPACE_NAME }}受限空间内原有介质名称{{ info.MEDIUM_NAME }}
主要介质{{ info.MAIN_MEDIUM }}主要危险因素{{ info.MAJOR_RISK_FACTORS }}
作业内容{{ info.CONTENTS_OF_HOMEWORK }}{{ info.WORK_CONTENT }}
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + - - + - - - - - - -
作业单位{{ info.CONFIRM_DEPARTMENT_NAME }}作业负责人{{ info.CONFIRM_USER_NAME }}
作业人{{ info.WORK_USER }}监护人 +
+ 签字： + + {{ info.GUARDIAN_USER_SIGNER_TIME }} +
+
关联的其他特殊作业及安全作业票编号{{ info.SPECIAL_WORK }}
风险辨识结果{{ info.RISK_IDENTIFICATION }}
气体分析分析项目有毒有害气体名称可燃气体名称氧气含量取样分析时间分析部位分析人
{{ gas.GAS_NAME1 }}{{ gas.GAS_NAME2 }}{{ gas.GAS_NAME3 }}{{ gas.GAS_NAME4 }}
合格标准{{ gas.GAS_STANDARD1 }}{{ gas.GAS_STANDARD2 }}{{ gas.GAS_STANDARD3 }}{{ gas.GAS_STANDARD4 }}19.5% 〜21%（体积分数）
分析数据{{ item.DATA1 }}{{ item.DATA2 }}{{ item.DATA3 }}{{ item.DATA4 }}{{ item.OXYGEN_CONTENT }}{{ item.ANALYZE_TIME }}{{ item.ANALYZE_PLACE }}{{ item.ANALYZE_USER }}
作业实施时间{{ info.WORK_START_DATE }}至{{ info.WORK_END_DATE }}止
+ - - - - + + + + -
作业人{{ info.WORKER }}监护人{{ info.GUARDIAN }}序号安全措施是否涉及确认人
-
作业时间 - 自 {{ formatDate(info.WORK_START_DATE, 'YYYY年MM月DD日HH时mm分') }} 至 - {{ formatDate(info.WORK_END_DATE, 'YYYY年MM月DD日HH时mm分') }} 止 -
- - - - - - - - - - - - - - - -
采样分析分析项目有毒有害物质可燃气含氧量取样时间取样部位分析人
暂无数据
-
- - - - - - - + + + + + + + + - - - -
序号主要安全措施是否合格
{{ index + 1 }} - {{ index + 1 }} + {{ item.PROTECTIVE_MEASURES }} + + 涉   及 + 不涉及 + + {{ item.CONFIRM_NAME }} +
{{ measuresList.length + 1 }} +
+ 其他安全措施：{{ info.CONFIRM_USER_MEASURES }} + 编制人：{{ info.CONFIRM_USER_NAME }} +
+
+ 其他安全措施：{{ info.APPROVE_USER_MEASURES }} + 编制人：{{ info.APPROVE_USER_NAME }} +
{{ item.PROTECTIVE_MEASURES }}合格不合格
- - - - - - - -
危害因素辨识
{{ item }}
+
安全交底人 +
+ 签字： + + {{ info.CONFESS_USER_SIGNER_TIME }} +
+
接受交底人 +
+ 签字： + + {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} +
+
+
作业负责人意见：{{ info.CONFIRM_CONTENT }}
+
+ 签字： + + {{ info.CONFIRM_USER_SIGNER_TIME }} +
- - - - - - - -
作业安全措施
{{ item }}
-
-
作业单位负责人意见： - - {{ info.WORK_UNIT_MANAGER_OPINION }} - -
-
- - - - {{ - formatDate(info.WORK_UNIT_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分') - }} +
+
所在单位意见：{{ info.APPROVE_CONTENT }}
+
+ 签字： + + {{ info.APPROVE_USER_SIGNER_TIME }}
-
作业现场负责人意见： - - {{ info.JOB_SITE_MANAGER_OPINION }} - -
-
- - - - {{ - formatDate(info.JOB_SITE_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分') - }} +
+
完工验收：{{ info.ACCEPT_CONTENT }}
+
+ 签字： + + {{ item.ACCEPT_USER_SIGNER_TIME }}
-
管理单位负责人意见： - - {{ info.MANAGEMENT_UNIT_OPINION }} - -
-
- - - - {{ - formatDate(info.MANAGEMENT_UNIT_TIME, 'YYYY年MM月DD日HH时mm分') - }} -
-
-
完工验收作业单位负责人意见： - - {{ info.COMPLETION_ACCEPTANCE_OPINION }} - -
-
- - - - {{ - formatDate(info.COMPLETION_ACCEPTANCE_TIME, 'YYYY年MM月DD日HH时mm分') - }} -
-
@@ -249,7 +209,11 @@ export default { measuresList: [], gasList: [], oldHazardIdentification: [], - oldWorkSafetyMeasures: [] + oldWorkSafetyMeasures: [], + imgList: [], + imgList1: [], + gas: {}, + otherProtectiveMeasures: [] } }, created() { @@ -266,7 +230,7 @@ export default { }, getData() { requestFN( - '/map/Eight/getById', + '/map/Eight/getByIdOrder', { id: this.id, TYPE: this.type, @@ -275,15 +239,30 @@ export default { ).then((data) => { this.listLoading = false this.info = data.pd - this.measuresList = data.measuresList || [] - this.gasList = data.gasList || [] - - if (this.info.HARM) { - this.oldHazardIdentification = this.info.HARM.split('$$$') - } - if (this.info.SAFTETY) { - this.oldWorkSafetyMeasures = this.info.SAFTETY.split('$$$') + this.imgList = data.imgList + this.imgList1 = data.imgList1 + for (let i = 0; i < data.measuresList.length; i++) { + // 将字符串转成数组 + const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') + for (let j = 1; j <= 3; j++) { + // 判断字符串是否存在 + if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { + // 给字符串后面添加上需要的数据 + PROTECTIVE_MEASURES.splice( + this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, + 0, + data.measuresList[i]['ANSWER' + j] + ) + } + } + // 将数组转回字符串 + data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') } + this.measuresList = data.measuresList // 参数map + this.gasList = data.gasList // 参数map + this.gas = data.gas || {} // 参数map + this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] }).catch((e) => { }) } diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 0af7f06..1857048 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -18,23 +18,21 @@ - + + + + + - - - - - - - - - - - - - + + + + + + + @@ -65,10 +63,6 @@ import weatherstation from './weatherstation.vue' import temperaturestation from './weatherstation.vue' import humiditystation from './weatherstation.vue' import windspeedstation from './weatherstation.vue' -import electricity from './electricity.vue' -import highwork from './highwork.vue' -import hoisting from './hoisting.vue' -import blindboard from './blindboard.vue' import XfControl from './xfControl.vue' import XfPoint from './xfPoint.vue' import MkGateMachine from './mkGateMachine.vue' @@ -112,10 +106,6 @@ export default { temperaturestation, humiditystation, windspeedstation, - electricity, - highwork, - hoisting, - blindboard, electricityOrder, highworkOrder, cutroadOrder, From f4bd5401627aadc0af72c16b889367511f9ac602 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 3 Jan 2024 16:58:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E8=80=83=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluation.vue | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue index 090f743..7039d49 100644 --- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue +++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue @@ -164,6 +164,12 @@ icon="el-icon-view" @click="fnEvaluation(row.HIDDEN_ID,row.SOURCE, row.CREATOR,'edit')">考评 + 删除 + @@ -420,6 +426,34 @@ export default { }) } }) + }, + fnDelvaluation(hiddenId) { + this.$confirm('确定要删除选中的评审记录吗?', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.listLoading = true + requestFN( + '/hiddenevaluationrecord/deleteEvaluation', + { + HIDDEN_ID: hiddenId + } + ).then((data) => { + this.listLoading = false + if (data.result === 'success') { + this.$message.success('删除成功') + this.getList() + } else { + this.$message({ + message: data.message, + type: 'error' + }) + } + }).catch((e) => { + }) + }).catch(() => { + }) } } } From beea017dbb266a3f8cb9b2c3150565fa8d4a5d01 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 4 Jan 2024 16:43:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=85=B7=E4=BD=93=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/outsourced/components/info.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/keyprojects/outsourced/components/info.vue b/src/views/keyprojects/outsourced/components/info.vue index 9c82aa0..90ead19 100644 --- a/src/views/keyprojects/outsourced/components/info.vue +++ b/src/views/keyprojects/outsourced/components/info.vue @@ -112,6 +112,12 @@ 		未定位 查看定位
具体位置{{ pd.LOCATION }}
安全管理协议{{ index + 1 }} {{ item.FILE_NAME }}查看定位
具体位置 {{ pd.LOCATION }}
具体位置{{ pd.LOCATION }}
安全管理协议{{ index + 1 }} {{ item.FILE_NAME }}