From 763cd7cb9baf66bda74e9fe25de3699d91ae9fc8 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Wed, 8 Nov 2023 09:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserBaseInfo/UserBaseInfoUpd.vue | 981 ++++++++++++++++++ .../UserBaseInfo/UserBaseInfoView.vue | 283 +++++ src/views/BI/index.vue | 7 +- .../corpInfo/info/components/indexAdd.vue | 12 + .../retrieval/components/index_view.vue | 14 +- .../apivideomanager/apiComponents/list.vue | 2 +- .../outsourced/components/list.vue | 11 +- .../videoinfomanager/components/list.vue | 30 +- .../videomanager/components/bobileCamer.vue | 65 +- .../videomanager/components/list.vue | 15 +- .../videomanager/components/video-list.vue | 38 +- .../components/corpUserList.vue | 98 +- .../risk/corpinfo/components/corpInfo.vue | 1 + src/views/xgf/flow_audit/users.vue | 233 ++--- 14 files changed, 1547 insertions(+), 243 deletions(-) create mode 100644 src/components/UserBaseInfo/UserBaseInfoUpd.vue create mode 100644 src/components/UserBaseInfo/UserBaseInfoView.vue diff --git a/src/components/UserBaseInfo/UserBaseInfoUpd.vue b/src/components/UserBaseInfo/UserBaseInfoUpd.vue new file mode 100644 index 0000000..5c26066 --- /dev/null +++ b/src/components/UserBaseInfo/UserBaseInfoUpd.vue @@ -0,0 +1,981 @@ + + diff --git a/src/components/UserBaseInfo/UserBaseInfoView.vue b/src/components/UserBaseInfo/UserBaseInfoView.vue new file mode 100644 index 0000000..2d7f00e --- /dev/null +++ b/src/components/UserBaseInfo/UserBaseInfoView.vue @@ -0,0 +1,283 @@ + + diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue index 757cdd5..06c0c50 100644 --- a/src/views/BI/index.vue +++ b/src/views/BI/index.vue @@ -178,7 +178,7 @@
安全动态
-
通过安全风险分级管控隐患排查治理减少或消除生产安全事故
+
本质安全：通过消除隐患减少并杜绝事故
消除{{ hiddenAllCount1 }}
起严重事故
避免{{ hiddenAllCount2 }}次轻微事故
避免{{ hiddenAllCount3 }}次未遂事故征兆
@@ -250,7 +250,7 @@
-
高危作业占比
+
危险作业占比
@@ -1842,16 +1842,19 @@ export default { } &.two { + font-size: 13px; clip-path: polygon(37.5% 0%, 62.5% 0%, 75% 100%, 25% 100%); background-color: #f97a1d; } &.three { + font-size: 17px; clip-path: polygon(25% 0%, 75% 0%, 87.5% 100%, 12.5% 100%); background-color: #fac858; } &.four { + font-size: 25px; clip-path: polygon(12.5% 0%, 87.5% 0%, 100% 100%, 0% 100%); background-color: #416aea; } diff --git a/src/views/corpInfo/info/components/indexAdd.vue b/src/views/corpInfo/info/components/indexAdd.vue index b4dd6cc..cc43fc4 100644 --- a/src/views/corpInfo/info/components/indexAdd.vue +++ b/src/views/corpInfo/info/components/indexAdd.vue @@ -81,6 +81,16 @@ + + + + + + + + + + @@ -221,6 +231,8 @@ export default { form: { shudi: [], CORP_NAME: '', + SAFETY_NAME: '', + SAFETY_PHONE: '', POSTAL_CODE: '', CODE: '', PROVINCE: '', diff --git a/src/views/corpInfo/retrieval/components/index_view.vue b/src/views/corpInfo/retrieval/components/index_view.vue index 74c879e..912b8be 100644 --- a/src/views/corpInfo/retrieval/components/index_view.vue +++ b/src/views/corpInfo/retrieval/components/index_view.vue @@ -162,7 +162,6 @@ 主要负责人信息 - @@ -175,6 +174,19 @@ + 安全负责人信息 + + + + + + + + + + + + 企业相关属性 diff --git a/src/views/keyprojects/apivideomanager/apiComponents/list.vue b/src/views/keyprojects/apivideomanager/apiComponents/list.vue index 50f12fa..0511a8b 100644 --- a/src/views/keyprojects/apivideomanager/apiComponents/list.vue +++ b/src/views/keyprojects/apivideomanager/apiComponents/list.vue @@ -46,7 +46,7 @@ - + diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue index c5b77f2..185031b 100644 --- a/src/views/keyprojects/outsourced/components/list.vue +++ b/src/views/keyprojects/outsourced/components/list.vue @@ -361,12 +361,19 @@ export default { { OUTSOURCED_ID: id } - ).then(() => { + ).then((data) => { + if (data.code == '500') { + this.listLoading = false + this.$message({ + message: data.msg, + type: 'error' + }) + return + } this.$message({ message: '已结束', type: 'success' }) - this.listLoading = false this.varList = [] this.listQuery.page = 1 this.getList() diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue index 017fb67..f2abc65 100644 --- a/src/views/keyprojects/videoinfomanager/components/list.vue +++ b/src/views/keyprojects/videoinfomanager/components/list.vue @@ -4,8 +4,8 @@ - - + + @@ -222,6 +222,7 @@ export default { add: false, del: false, edit: false, + timer: '', form: { VIDEONAME: '', UNITS_USER_ID: '', @@ -305,7 +306,29 @@ export default { await this.getUnitsList() await this.getList() }, + beforeDestroy() { + console.log('定时器关闭') + clearInterval(this.timer) + }, methods: { + // 五分钟关闭视频播放页面定时任务 + start() { + console.log('定时器开启') + this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟 + }, + over() { + // 定时器手动关闭 + console.log('定时器手动关闭') + this.$message.warning('单次播放时长已到5分钟自动关闭') + clearInterval(this.timer) + }, + closeVideoStart() { + this.dialogVideo = false + this.dialogVideoHLS = false + this.dialogVideoBack = false + this.dialogVideoAll = false + this.over() + }, changeSelUid(event) { this.unitsUserList = [] this.form.UNITS_USER_ID = '' @@ -355,6 +378,8 @@ export default { } }, showVideo(row) { + this.$message.warning('单次播放最多五分钟') + this.start() if (!row.PLATFORMVIDEOMANAGEMENT_ID) { this.VIDEOURL = row.VIDEOURL this.dialogVideo = true @@ -385,6 +410,7 @@ export default { }) }) }).catch((e) => { + this.over() this.listLoading = false }) } diff --git a/src/views/keyprojects/videomanager/components/bobileCamer.vue b/src/views/keyprojects/videomanager/components/bobileCamer.vue index f99055e..46f4294 100644 --- a/src/views/keyprojects/videomanager/components/bobileCamer.vue +++ b/src/views/keyprojects/videomanager/components/bobileCamer.vue @@ -6,24 +6,41 @@ :before-close="handleClose" :append-to-body="true" title="移动摄像头" - width="60%"> + width="85%">
- - - - - - - - - 搜索 - - - 重置 - + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + +
@@ -37,6 +54,7 @@ style="width: 100%"> + @@ -94,6 +112,12 @@ export default { total: 0, KEYWORDS: '', UNITS_ID: '', + serachForm: { + KEYWORDS: '', + UNITS_USER_ID: '', + UNIT_USE: '', + UNITS_ID: '' + }, varList: [], unitsList: [], allCodes: [] @@ -105,7 +129,6 @@ export default { this.visible = true this.UNITS_ID = UNITS_ID this.varList = [] - this.KEYWORDS = '' await this.getUnitsList() this.getList() }, @@ -206,7 +229,10 @@ export default { requestFN( '/videoResources/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { - VIDEONAME: this.KEYWORDS + VIDEONAME: this.serachForm.KEYWORDS, + PERSONNELMANAGEMENT_ID: this.serachForm.UNITS_USER_ID, + UNIT_USE: this.serachForm.UNIT_USE, + UNITS_ID: this.serachForm.UNITS_ID } ).then((data) => { this.listLoading = false @@ -223,7 +249,12 @@ export default { }, goKeyReset() { - this.KEYWORDS = '' + this.serachForm = { + KEYWORDS: '', + UNITS_USER_ID: '', + UNIT_USE: '', + UNITS_ID: '' + } this.getList() }, diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue index 7b1d828..4d5a01d 100644 --- a/src/views/keyprojects/videomanager/components/list.vue +++ b/src/views/keyprojects/videomanager/components/list.vue @@ -59,9 +59,15 @@ + + + @@ -122,9 +128,10 @@ export default { }) }, // 查看 - goDetail(ID, UNITS_ID) { - this.$parent.OUTSOURCED_ID = ID - this.$parent.UNITS_ID = UNITS_ID + goDetail(row) { + this.$parent.OUTSOURCED_ID = row.OUTSOURCED_ID + this.$parent.UNITS_ID = row.UNITS_ID + this.$parent.STATE = row.STATE this.$parent.activeName = 'videoList' } } diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue index e18bd66..a709776 100644 --- a/src/views/keyprojects/videomanager/components/video-list.vue +++ b/src/views/keyprojects/videomanager/components/video-list.vue @@ -52,19 +52,19 @@
- 新增 - 播放全部 + 新增 + 播放全部
@@ -175,8 +175,10 @@ export default { data() { return { map: null, + timer: '', marker: null, BMap: '', + STATE: this.$parent.STATE, clientHeight: 500, inputLocation: '', msg: 'add', @@ -236,8 +238,27 @@ export default { }, beforeDestroy() { this.map && this.map.removeEventListener('click', this.MapClick) + console.log('定时器关闭') + clearInterval(this.timer) }, methods: { + // 五分钟关闭视频播放页面定时任务 + start() { + console.log('定时器开启') + this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟; + }, + over() { + // 定时器手动关闭 + console.log('定时器手动关闭') + clearInterval(this.timer) + }, + closeVideoStart() { + this.dialogVideo = false + this.dialogVideoHLS = false + this.dialogVideoBack = false + this.dialogVideoAll = false + this.over() + }, getVideoResourcesSelect() { requestFN( '/videoResources/listAll', { @@ -331,6 +352,8 @@ export default { }, // 播放 showVideo(row) { + this.$message.warning('单次播放最多五分钟') + this.start() if (!row.PLATFORMVIDEOMANAGEMENT_ID) { this.VIDEOURL = row.VIDEOURL this.dialogVideo = true @@ -362,6 +385,7 @@ export default { }) }).catch((e) => { this.listLoading = false + this.over() }) } }, diff --git a/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue b/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue index 7a73843..80bfabe 100644 --- a/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue +++ b/src/views/relativeUnitPerson/personBaseInfo/components/corpUserList.vue @@ -22,17 +22,17 @@ 返回 --> - + - + - + @@ -41,74 +41,28 @@ - - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - + @@ -116,7 +70,20 @@ - + + + + + + + + + + + + + + 搜索 @@ -151,7 +118,7 @@ - +