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 @@
盲板位置图(可另附图)及编号:
- +
编制人: - + {{ info.APPLY_USER_SIGNER_TIME }}
@@ -63,7 +63,7 @@
签字: - + {{ info.GUARDIAN_USER_SIGNER_TIME }}
@@ -117,20 +117,20 @@ - 安全交底人 - + 安全交底人 +
签字: - + {{ info.CONFESS_USER_SIGNER_TIME }}
- 接受交底人 - -
+ 接受交底人 + +
签字: - - {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -146,7 +146,7 @@
签字: - +
@@ -166,7 +166,7 @@
签字: - +
@@ -208,6 +208,7 @@ export default { info: {}, ImgList: [], measuresList: [], + imgList: [] } }, created() { @@ -223,7 +224,7 @@ export default { }, getData() { requestFN( - '/map/Eight/getByIdCfdD', + '/map/Eight/getByIdOrder', { id: this.id, TYPE: this.type, @@ -232,7 +233,11 @@ export default { ).then((data) => { this.info = { ...data.pd, ...data.Info } this.ImgList = data.ImgList + this.imgList = data.imgList this.measuresList = data.measuresList + this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] }).catch((e) => { }) } diff --git a/src/views/map/dialog/breakgroundOrder.vue b/src/views/map/dialog/breakgroundOrder.vue index 738449c..79c8fc4 100644 --- a/src/views/map/dialog/breakgroundOrder.vue +++ b/src/views/map/dialog/breakgroundOrder.vue @@ -114,7 +114,6 @@ - 安全交底人 @@ -126,12 +125,12 @@ - 接受交底人 - -
+ 接受交底人 + +
签字: - - {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -247,7 +246,8 @@ export default { config: config, info: {}, ImgList: [], - measuresList: [] + measuresList: [], + imgList: [] } }, created() { @@ -273,6 +273,22 @@ export default { this.info = { ...data.pd, ...data.Info } this.ImgList = data.ImgList this.measuresList = data.measuresList + this.imgList = data.imgList + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) { + this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) { + this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) { + this.info.PRODUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) { + this.info.SAFETY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 4) { + this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + } }).catch((e) => { }) } diff --git a/src/views/map/dialog/cutroadOrder.vue b/src/views/map/dialog/cutroadOrder.vue index e65c83d..1f4e69d 100644 --- a/src/views/map/dialog/cutroadOrder.vue +++ b/src/views/map/dialog/cutroadOrder.vue @@ -8,9 +8,9 @@ 申请单位 {{ info.APPLY_DEPARTMENT_NAME }} - 作业单位 + 作业单位 {{ info.CONSTRUCTION_DEPARTMENT_NAME }} - 作业负责人 + 作业负责人 {{ info.CONSTRUCTION_USER_NAME }} @@ -113,12 +113,12 @@ - 接受交底人 - -
+ 接受交底人 + +
签字: - - {{ info.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ imgList[0].ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -235,7 +235,8 @@ export default { config: config, info: {}, ImgList: [], - measuresList: [] + measuresList: [], + imgList: [] } }, created() { @@ -258,9 +259,26 @@ export default { GANGKOU: this.gangkou } ).then((data) => { + debugger this.info = { ...data.pd, ...data.Info } this.ImgList = data.ImgList this.measuresList = data.measuresList + this.imgList = data.imgList + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 0) { + this.info.APPLY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 1) { + this.info.CONSTRUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 2) { + this.info.PRODUCTION_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 3) { + this.info.SAFETY_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] + } + if (this.info.OTHER_PROTECTIVE_MEASURES.split(';_;').length > 4) { + this.info.LEADER_USER_MEASURES = this.info.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + } }).catch((e) => { }) } diff --git a/src/views/map/dialog/electricityCfdD.vue b/src/views/map/dialog/electricityCfdD.vue index 43422c1..f5d05b5 100644 --- a/src/views/map/dialog/electricityCfdD.vue +++ b/src/views/map/dialog/electricityCfdD.vue @@ -58,7 +58,7 @@ 风险辨识结果 {{ pd.RISK_IDENTIFICATION }} - + 可燃气体分析(运行的生产装置、罐区和具有火灾爆炸危险场所)