diff --git a/src/views/map/dialog/blindboardOrder.vue b/src/views/map/dialog/blindboardOrder.vue index d6bac58..d69c6ff 100644 --- a/src/views/map/dialog/blindboardOrder.vue +++ b/src/views/map/dialog/blindboardOrder.vue @@ -45,10 +45,10 @@
安全交底人 |
@@ -132,17 +130,17 @@
|
|||||||||
接受交底人 |
-
+
签字:
-
- {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+
+ {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
|
|||||||||
作业负责人意见:{{ info.CONFIRM_CONTENT }}
@@ -152,7 +150,7 @@
|
||||||||||
用电单位意见:{{ info.AUDIT_CONTENT }}
@@ -162,7 +160,7 @@
|
||||||||||
配送电单位意见:{{ info.APPROVE_CONTENT }}
@@ -209,6 +207,7 @@ export default {
},
measuresList: [],
gasList: [],
+ imgList: [],
otherProtectiveMeasures: []
}
},
@@ -235,23 +234,11 @@ export default {
this.info = data.pd
this.measuresList = data.measuresList
this.gasList = data.gasList
+ this.imgList = data.imgList
this.otherProtectiveMeasures = this.validStr(this.info.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.info.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
- console.info(this.otherProtectiveMeasures)
- if (!this.info.WORK_OPERATOR_ID) {
- this.$set(this.info, 'WORK_OPERATOR_ID', [])
- } else {
- this.info.WORK_OPERATOR_ID = this.info.WORK_OPERATOR_ID.split(',')
- }
- if (!this.info.WORK_USER) {
- this.$set(this.info, 'WORK_USER', [])
- } else {
- this.info.WORK_OPERATOR_NAME = this.info.WORK_USER.split(',')
- }
- if (!this.info.CARD_NO) {
- this.$set(this.info, 'CARD_NO', [])
- } else {
- this.info.WORK_OPERATOR_NUMBER = this.info.CARD_NO.split(',')
- }
+ this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+ this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
+ this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
})
}
}
diff --git a/src/views/map/dialog/highworkOrder.vue b/src/views/map/dialog/highworkOrder.vue
index 00b30c8..af40220 100644
--- a/src/views/map/dialog/highworkOrder.vue
+++ b/src/views/map/dialog/highworkOrder.vue
@@ -113,18 +113,18 @@
|
||||||||||
接受交底人 |
-
+
签字:
-
- {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+
+ {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
|
|||||||||
作业负责人意见:{{ info.CONSTRUCTION_CONTENT }}
@@ -134,7 +134,7 @@
|
||||||||||
所在单位意见:{{ info.LEADER_CONTENT }}
@@ -144,7 +144,7 @@
|
||||||||||
审核部门意见:{{ info.AUDIT_CONTENT }}
@@ -154,7 +154,7 @@
|
||||||||||
审批部门意见:{{ info.APPROVE_CONTENT }}
@@ -198,7 +198,8 @@ export default {
info: {
OTHER_PROTECTIVE_MEASURES: []
},
- measuresList: []
+ measuresList: [],
+ imgList: []
}
},
created() {
@@ -223,7 +224,19 @@ export default {
).then((data) => {
this.info = data.pd
this.measuresList = data.measuresList
-
+ this.imgList = data.imgList
+ if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) {
+ this.info.CONFIRM_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
+ }
+ if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) {
+ this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
+ }
+ if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) {
+ this.info.AUDIT_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
+ }
+ if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) {
+ this.info.APPROVE_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3]
+ }
if (!this.info.OTHER_PROTECTIVE_MEASURES) {
this.info.OTHER_PROTECTIVE_MEASURES = []
} else {
diff --git a/src/views/map/dialog/hoistingOrder.vue b/src/views/map/dialog/hoistingOrder.vue
index 9c1c27e..c0670f8 100644
--- a/src/views/map/dialog/hoistingOrder.vue
+++ b/src/views/map/dialog/hoistingOrder.vue
@@ -42,12 +42,16 @@
{{ info.PART_WEIGHT }}t
- {{ info.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
- {{ info.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
- {{ info.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
-
+ {{ info.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
+ {{ info.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
+ {{ info.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
+
|
| |||||||||
关联的其他特殊作业及安全作业票编号 | +{{ info.SPECIAL_WORK }} | +|||||||||
风险辨识结果 | {{ info.HAZARD_IDENTIFICATION }} | @@ -78,7 +82,7 @@|||||||||
{{ measuresList.length + 1 }} | -+ |
其他安全措施:{{ info.LEADER_USER_MEASURES }}
编制人:{{ info.LEADER_USER_NAME }}
@@ -110,13 +114,13 @@
|
||||||||
接受交底人 |
-
+
签字:
-
- {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+
+ {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
|