diff --git a/index.html b/index.html index c2ee4ab..38ca04f 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - + diff --git a/src/assets/map/gangkou_index/point/ico31_offline.png b/src/assets/map/gangkou_index/point/ico31_offline.png new file mode 100644 index 0000000..ca6bed6 Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico31_offline.png differ diff --git a/src/assets/map/gangkou_index/point/ico31_online.png b/src/assets/map/gangkou_index/point/ico31_online.png new file mode 100644 index 0000000..a7e3222 Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico31_online.png differ diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue index 03f6c24..da5f635 100644 --- a/src/components/OutSourced/index.vue +++ b/src/components/OutSourced/index.vue @@ -68,7 +68,11 @@ - + + + @@ -97,28 +103,30 @@ {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} - 编制人：{{ pd.CONFIRM_USER_NAME }} +
+ 安全措施确认人：{{ pd.SAFETY_USER_MEASURES }} +
+
+ 作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }} +
+
+ 项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} + 属地监管单位：{{ pd.LEADER_USER_MEASURES }}
- 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} - 编制人：{{ pd.AUDIT_USER_NAME }} + 安全管理部门：{{ pd.AUDIT_USER_MEASURES }}
- 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} - 编制人：{{ pd.APPROVE_USER_NAME }} + 动火审批人：{{ pd.APPROVE_USER_MEASURES }}
- 其他安全措施：{{ pd.MONITOR_USER_MEASURES }} - 编制人：{{ pd.MONITOR_USER_NAME }} + 动火前验票：{{ pd.MONITOR_USER_MEASURES }}
@@ -128,10 +136,10 @@ 安全交底人 -
+
签字： - - {{ pd.CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
@@ -155,6 +163,16 @@
+ + 安全措施确认人 + +
+ 签字： + + {{ pd.SAFETY_SIGNATURE_TIME }} +
+ +
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
@@ -165,6 +183,16 @@
+ + +
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
+ 签字： + + {{ pd.BELONGING_SIGNATURE_TIME }} +
+ +
所在单位意见：{{ pd.LEADER_CONTENT }}
@@ -197,7 +225,7 @@ -
动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
签字： @@ -238,7 +266,8 @@ export default { gasList: [], imgList: [], imgList1: [], - otherProtectiveMeasures: [] + otherProtectiveMeasures: [], + confessList: [] } }, created() { @@ -278,6 +307,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 + data.pd.confessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.confessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') @@ -313,6 +347,13 @@ export default { this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] } + const dongHuoCaoZuoRenPic = data.imgList2 + if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { + this.pd.dongHuoCaoZuoRenPic = [] + for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { + this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH) + } + } }).catch((e) => { this.listLoading = false }) diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue index 1612a84..a138821 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue @@ -52,12 +52,14 @@ - + diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue index eed2851..5b9035e 100644 --- a/src/views/keyprojects/videomanager/components/list.vue +++ b/src/views/keyprojects/videomanager/components/list.vue @@ -145,7 +145,11 @@ - + + + + + + @@ -89,28 +95,33 @@ {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} - 编制人：{{ pd.CONFIRM_USER_NAME }} +
+ 安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}
+
+ 作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }} +
+
+ 项目责任负责人：{{ pd.BELONGING_USER_MEASURES }} +
+ + +
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} + 属地监管单位：{{ pd.LEADER_USER_MEASURES }}
- 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} - 编制人：{{ pd.AUDIT_USER_NAME }} + 安全管理部门：{{ pd.AUDIT_USER_MEASURES }}
- 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} - 编制人：{{ pd.APPROVE_USER_NAME }} + 动火审批人：{{ pd.APPROVE_USER_MEASURES }}
- 其他安全措施：{{ pd.MONITOR_USER_MEASURES }} - 编制人：{{ pd.MONITOR_USER_NAME }} + 动火前验票：{{ pd.MONITOR_USER_MEASURES }}
@@ -120,10 +131,10 @@ 安全交底人 -
+
签字： - - {{ pd.CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
@@ -147,6 +158,16 @@
+ + 安全措施确认人 + +
+ 签字： + + {{ pd.SAFETY_SIGNATURE_TIME }} +
+ +
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
@@ -157,9 +178,19 @@
+ + +
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
+ 签字： + + {{ pd.BELONGING_SIGNATURE_TIME }} +
+ + -
所在单位意见：{{ pd.LEADER_CONTENT }}
+
属地监管单位意见：{{ pd.LEADER_CONTENT }}
签字： @@ -189,7 +220,7 @@ -
动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
签字： @@ -241,7 +272,8 @@ export default { gasList: [], imgList: [], imgList1: [], - otherProtectiveMeasures: [] + otherProtectiveMeasures: [], + confessList: [] } }, created() { @@ -283,6 +315,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 + data.pd.confessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.confessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') @@ -318,6 +355,13 @@ export default { this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] } + let dongHuoCaoZuoRenPic = data.imgList2 + if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { + this.pd.dongHuoCaoZuoRenPic = [] + for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { + this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH) + } + } }).catch((e) => { this.listLoading = false }) diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 7a15a2a..69bd9b9 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -27,7 +27,7 @@ - + diff --git a/src/views/map/dialog/outSourceVideoInfo.vue b/src/views/map/dialog/outSourceVideoInfo.vue index 3a43c90..c72788b 100644 --- a/src/views/map/dialog/outSourceVideoInfo.vue +++ b/src/views/map/dialog/outSourceVideoInfo.vue @@ -7,7 +7,9 @@ - + + + diff --git a/src/views/map/dialog/video_play_plat.vue b/src/views/map/dialog/video_play_plat.vue index 422e14f..1b8d201 100644 --- a/src/views/map/dialog/video_play_plat.vue +++ b/src/views/map/dialog/video_play_plat.vue @@ -16,7 +16,7 @@
视频名称{{ pd.VIDEONAME }}{{ pd.VIDEONAME }}在线状态{{ pd.ONLINE_STATUS }}
所属重点工程