From 1a0f8011f8e9251081bb7a5cf39fbae944459812 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Tue, 25 Feb 2025 11:05:03 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=B7=B3=E8=BD=AC=E8=80=81=E7=B3=BB=E7=BB=9F=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/asyncRouter.js | 6 +++++- src/views/map/index.vue | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/asyncRouter.js b/src/asyncRouter.js index f9e507c..3a23a8e 100644 --- a/src/asyncRouter.js +++ b/src/asyncRouter.js @@ -46,7 +46,11 @@ router.beforeEach((to, from, next) => { if (to.path == `/login` || to.path == '/apiMonitoringCenter' || to.path == '/apiMajorHazardSources') { next() } else { - next(`/login`) + if (to.path == '/map' && to.query.userId) { + next() + } else { + next(`/login`) + } } } }) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 7115566..849fb7e 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -1614,6 +1614,10 @@ export default { handleClickRightTools(index) { if (this.rightOptionsList[index].check !== '') this.rightOptionsList[index].check = !this.rightOptionsList[index].check if (index === 0) { + if (this.$route.query.userId) { + window.close() + return + } if (this.gangkouActive === '00004') { if (this.timer) { clearInterval(this.timer) @@ -2922,10 +2926,28 @@ export default { this.corpInfo.CORP_INFO_ID = data.info.CORP_INFO_ID this.corpInfo.latitude = data.info.latitude this.corpInfo.longitude = data.info.longitude + this.initUser() this.initMap() }).catch((e) => { console.log(e) }) + }, + initUser() { + const { userId } = this.$route.query + if (!userId) return + requestFN( + '/admin/v2/login', + { userId } + ).then((res) => { + console.log(res) + if (res.result !== 'success') { + alert('登录失败') + window.close() + } + }).catch((e) => { + alert('登录失败') + window.close() + }) } } } From 4a5b0dc000ec28fe6e70524e8a460de43ae33005 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 4 Mar 2025 14:04:24 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hy?= =?UTF-8?q?x=5F2024-03-04=5FfireWork):=20=20=20-=20=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E5=8F=8A=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork/otherUnit/components/detail.vue | 414 +++++++++++++ .../hotwork/otherUnit/components/info.vue | 568 ++++++++++++++++++ .../hotwork/otherUnit/components/list.vue | 368 ++++++++++++ src/views/hotwork/otherUnit/index.vue | 37 ++ 4 files changed, 1387 insertions(+) create mode 100644 src/views/hotwork/otherUnit/components/detail.vue create mode 100644 src/views/hotwork/otherUnit/components/info.vue create mode 100644 src/views/hotwork/otherUnit/components/list.vue create mode 100644 src/views/hotwork/otherUnit/index.vue diff --git a/src/views/hotwork/otherUnit/components/detail.vue b/src/views/hotwork/otherUnit/components/detail.vue new file mode 100644 index 0000000..36c48fa --- /dev/null +++ b/src/views/hotwork/otherUnit/components/detail.vue @@ -0,0 +1,414 @@ + + + + + diff --git a/src/views/hotwork/otherUnit/components/info.vue b/src/views/hotwork/otherUnit/components/info.vue new file mode 100644 index 0000000..48225a7 --- /dev/null +++ b/src/views/hotwork/otherUnit/components/info.vue @@ -0,0 +1,568 @@ + + + + + diff --git a/src/views/hotwork/otherUnit/components/list.vue b/src/views/hotwork/otherUnit/components/list.vue new file mode 100644 index 0000000..2061ac6 --- /dev/null +++ b/src/views/hotwork/otherUnit/components/list.vue @@ -0,0 +1,368 @@ + + diff --git a/src/views/hotwork/otherUnit/index.vue b/src/views/hotwork/otherUnit/index.vue new file mode 100644 index 0000000..8d1885c --- /dev/null +++ b/src/views/hotwork/otherUnit/index.vue @@ -0,0 +1,37 @@ + + + + + From e13f27b446b083c75d0db479169447577da4121c Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Wed, 5 Mar 2025 14:56:55 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=E5=AE=89=E5=85=A8=E6=89=BF=E8=AF=BA?= =?UTF-8?q?=E4=B9=A6=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=202.=E5=AE=89=E5=85=A8=E6=89=BF=E8=AF=BA=E4=B9=A6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promise_book/components/add.vue | 11 +++++++++-- .../promise_book/components/details.vue | 2 +- .../promise_book/components/promise_book_dialog.vue | 2 +- .../promise_book/components/see.vue | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/views/security_commitment/promise_book/components/add.vue b/src/views/security_commitment/promise_book/components/add.vue index 0b94653..9249496 100644 --- a/src/views/security_commitment/promise_book/components/add.vue +++ b/src/views/security_commitment/promise_book/components/add.vue @@ -146,7 +146,7 @@ - + + + + + + @@ -297,6 +302,7 @@ export default { DEPARTMENT_ID: null, POST_ID: '', USER_ID: [], + NICKNAME: '', id: Math.random() } ], @@ -379,6 +385,7 @@ export default { DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID, POST_ID: data.coverpeople[i].POST_ID, USER_ID: [], + NICKNAME: data.coverpeople[i].NICKNAME, id: data.coverpeople[i].PROMISEPEOPLE_ID }) for (let j = 0; j < this.form.coverpeople.length; j++) { @@ -557,7 +564,7 @@ export default { { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID } )) const coverpeople = this.form.coverpeople.map(item => ( - { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID } + { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, NICKNAME: item.NICKNAME } )) let url if (this.$parent.PROMISE_ID) { diff --git a/src/views/security_commitment/promise_book/components/details.vue b/src/views/security_commitment/promise_book/components/details.vue index fd52cc9..423ef04 100644 --- a/src/views/security_commitment/promise_book/components/details.vue +++ b/src/views/security_commitment/promise_book/components/details.vue @@ -113,7 +113,7 @@ export default { ).then((data) => { const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID })) this.dialog.visible = true - this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME } + this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, NICKNAME: data.COVERPEOPLE[0].NICKNAME } }).catch((e) => { }) }, diff --git a/src/views/security_commitment/promise_book/components/promise_book_dialog.vue b/src/views/security_commitment/promise_book/components/promise_book_dialog.vue index ca2cd81..dfc5954 100644 --- a/src/views/security_commitment/promise_book/components/promise_book_dialog.vue +++ b/src/views/security_commitment/promise_book/components/promise_book_dialog.vue @@ -9,7 +9,7 @@

{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}

-
{{ dialogData.COVERPEOPLE }}：
+
{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}：
{{ dialogData.TEXT }}
diff --git a/src/views/security_commitment/promise_book/components/see.vue b/src/views/security_commitment/promise_book/components/see.vue index 86b9f4f..894fbe3 100644 --- a/src/views/security_commitment/promise_book/components/see.vue +++ b/src/views/security_commitment/promise_book/components/see.vue @@ -39,6 +39,8 @@ {{ item.POSTNAME }} {{ '人员' + (index + 1) }} {{ item.USERNAME && item.USERNAME.join('、') }} + {{ '岗位名称' + (index + 1) }} + {{ item.NICKNAME }} 承诺内容 @@ -119,6 +121,7 @@ export default { DEPTNAME: data.coverpeople[i].DEPTNAME, POST_ID: data.coverpeople[i].POST_ID, POSTNAME: data.coverpeople[i].POSTNAME, + NICKNAME: data.coverpeople[i].NICKNAME, USER_ID: [], USERNAME: [], id: data.coverpeople[i].PROMISEPEOPLE_ID @@ -135,7 +138,7 @@ export default { }, goView() { this.dialog.visible = true - this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0] } + this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0], NICKNAME: this.form.coverpeople[0].NICKNAME } }, goBack() { this.$parent.activeName = 'List' From 3d566a4c78ea12733a266b89876ab742c472ce24 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Thu, 6 Mar 2025 08:48:39 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hy?= =?UTF-8?q?x=5F2024-03-04=5FfireWork):=20=20=20-=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=9C=89=E6=95=88=E6=9C=9F=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=A1=AB=E5=86=99=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xgf/flow/components/list.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue index 8e40fb1..a105f3d 100644 --- a/src/views/xgf/flow/components/list.vue +++ b/src/views/xgf/flow/components/list.vue @@ -39,8 +39,7 @@ - - +