From 117daa34d04f2d90f95afec212cb897df08c2488 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 27 Jun 2024 19:01:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../limitspace/components/corpInfo.vue | 2 +- .../limitspace/components/detail.vue | 252 ++++++++++-------- .../limitspace/components/list.vue | 188 ++++++------- src/views/dangerousWork/limitspace/index.vue | 8 +- 4 files changed, 230 insertions(+), 220 deletions(-) diff --git a/src/views/dangerousWork/limitspace/components/corpInfo.vue b/src/views/dangerousWork/limitspace/components/corpInfo.vue index 66c7651..112ca76 100644 --- a/src/views/dangerousWork/limitspace/components/corpInfo.vue +++ b/src/views/dangerousWork/limitspace/components/corpInfo.vue @@ -108,7 +108,7 @@ export default { return new Promise((resolve) => { this.listLoading = true requestFN( - '/gfLimitSpace/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/gfConfinedSpace/corpCountlist?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { COPRINF_ID: sessionStorage.getItem('user').CORPINFO_ID || '', KEYWORDS: this.KEYWORDS diff --git a/src/views/dangerousWork/limitspace/components/detail.vue b/src/views/dangerousWork/limitspace/components/detail.vue index d253af5..eb287ab 100644 --- a/src/views/dangerousWork/limitspace/components/detail.vue +++ b/src/views/dangerousWork/limitspace/components/detail.vue @@ -5,65 +5,112 @@ - - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + -
+
-

断路安全作业票

-
编号:{{ pd.CHECK_NO }}
+

受限空间安全作业票

+
编号:{{ pd.CHECK_NO }}
申请单位{{ pd.APPLY_DEPARTMENT_NAME }}作业单位{{ pd.CONSTRUCTION_DEPARTMENT_NAME }}作业负责人{{ pd.CONSTRUCTION_USER_NAME }}作业申请单位{{ pd.APPLY_DEPARTMENT_NAME }}作业申请时间{{ pd.CREATTIME }}
涉及相关单位（部门）{{ pd.OTHER_DEPT }}受限空间名称{{ pd.LIMITSPACE_NAME }}受限空间内原有介质名称{{ pd.MEDIUM_NAME }}
作业内容{{ pd.WORK_CONTENT }}受限空间所属单位{{ pd.BELONG_CORP }}
作业单位{{ pd.CONFIRM_DEPARTMENT_NAME }}作业负责人{{ pd.CONFIRM_USER_NAME }}
作业人{{ pd.WORK_USER }} 监护人 +
签字： {{ pd.GUARDIAN_USER_SIGNER_TIME }}
断路原因{{ pd.WORK_REASON }}
关联的其他特殊作业及安全作业票编号{{ pd.SPECIAL_WORK }}
-
断路地段示意图（可另附图）及相关说明：{{ pd.WORK_CONTENT }}
-
- -
- 编制人： - - {{ pd.APPLY_USER_SIGNER_TIME }} -
-
- 		{{ pd.SPECIAL_WORK }}
风险辨识结果{{ pd.HAZARD_IDENTIFICATION.split(";_;")[0] }}{{ pd.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 }}
作业实施时间{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止{{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止
+ @@ -73,7 +120,12 @@ - + - - + + @@ -130,43 +170,23 @@ - - + - - + - - - - - - @@ -181,10 +201,10 @@
序号
{{ index + 1 }}{{ item.PROTECTIVE_MEASURES }} + {{ item.PROTECTIVE_MEASURES }} + {{ item.QUESTION1 }}:{{ item.ANSWER1? item.ANSWER1 : 0 }} + {{ item.QUESTION2 }}:{{ item.ANSWER2? item.ANSWER2 : 0 }} + {{ item.QUESTION3 }}:{{ item.ANSWER3? item.ANSWER3 : 0 }} + 涉   及 不涉及 @@ -82,28 +134,16 @@ {{ item.CONFIRM_NAME }}
{{ measuresList.length + 1 }}
{{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.APPLY_USER_MEASURES }} - 编制人：{{ pd.APPLY_USER_NAME }} +
+ 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} + 编制人：{{ pd.CONFIRM_USER_NAME }}
-
- 其他安全措施：{{ pd.CONSTRUCTION_USER_MEASURES }} - 编制人：{{ pd.CONSTRUCTION_USER_NAME }} -
-
- 其他安全措施：{{ pd.PRODUCTION_USER_MEASURES }} - 编制人：{{ pd.PRODUCTION_USER_NAME }} -
-
- 其他安全措施：{{ pd.SAFETY_USER_MEASURES }} - 编制人：{{ pd.SAFETY_USER_NAME }} -
-
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} +
+ 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} + 编制人：{{ pd.APPROVE_USER_NAME }}
-
作业负责人意见：{{ pd.CONSTRUCTION_CONTENT }}
+
+
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
签字： - - {{ pd.CONSTRUCTION_USER_SIGNER_TIME }} + + {{ pd.CONFIRM_USER_SIGNER_TIME }}
-
所在单位意见：{{ pd.PRODUCTION_CONTENT }}
+
+
所在单位意见：{{ pd.APPROVE_CONTENT }}
签字： - - {{ pd.PRODUCTION_USER_SIGNER_TIME }} -
-
-
消防、安全管理部门意见：{{ pd.SAFETY_CONTENT }}
-
- 签字： - - {{ pd.SAFETY_USER_SIGNER_TIME }} -
-
-
审批部门意见：{{ pd.LEADER_CONTENT }}
-
- 签字： - - {{ pd.LEADER_USER_SIGNER_TIME }} + + {{ pd.APPROVE_USER_SIGNER_TIME }}
- -
-
- 返 回 +
+
+ 返 回 +
@@ -196,13 +216,14 @@ export default { data() { return { config: config, - CUTROAD_ID: this.$parent.CUTROAD_ID, // 主键ID + CONFINEDSPACE_ID: this.$parent.CONFINEDSPACE_ID, // 主键ID pd: [], // 存放字段参数 measuresList: [], - otherProtectiveMeasures: [], + gasList: [], + gas: {}, imgList: [], imgList1: [], - hazardIdentification: [] + otherProtectiveMeasures: [] } }, created() { @@ -228,32 +249,56 @@ export default { } }, getRowKey(row) { - return row.CUTROAD_ID + return row.CONFINEDSPACE_ID }, getData() { this.listLoading = true requestFN( - '/dangerousWork/gfcutroad/goEdit', + '/gfConfinedSpace/goEdit', { - CUTROAD_ID: this.CUTROAD_ID + CONFINEDSPACE_ID: this.CONFINEDSPACE_ID } ).then((data) => { this.listLoading = false this.pd = data.pd // 参数map - this.measuresList = data.measuresList // 参数map + 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.imgList = data.imgList - this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] - this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] - this.pd.PRODUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] - this.pd.SAFETY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] - this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + this.imgList1 = data.imgList + 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) => { this.listLoading = false }) }, + // 查找字符串第几次出现的位置 + findCharIndex(str, char, num) { + let index = str.indexOf(char) + for (let i = 0; i < num - 1; i++) { + index = str.indexOf(char, index + 1) + } + return index + }, goBack() { - this.$parent.activeName = 'circuit_list' - this.$parent.CUTROAD_ID = '' + this.$parent.activeName = 'LimitSpace' } } @@ -265,8 +310,7 @@ export default { padding: 20px 0 span vertical-align: middle -.bbg - width: 270px + .print-approval-img width: 200px height: 97px diff --git a/src/views/dangerousWork/limitspace/components/list.vue b/src/views/dangerousWork/limitspace/components/list.vue index 6241d41..a0c0e57 100644 --- a/src/views/dangerousWork/limitspace/components/list.vue +++ b/src/views/dangerousWork/limitspace/components/list.vue @@ -1,6 +1,6 @@