From 1a0f8011f8e9251081bb7a5cf39fbae944459812 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 25 Feb 2025 11:05:03 +0800
Subject: [PATCH 1/3] =?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 e13f27b446b083c75d0db479169447577da4121c Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Wed, 5 Mar 2025 14:56:55 +0800
Subject: [PATCH 2/3] =?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 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item
:label="'人员' + (index + 1)"
:prop="'coverpeople.' + index + '.USER_ID'"
@@ -162,6 +162,11 @@
</div>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="岗位名称">
+ <el-input v-model="item.NICKNAME" placeholder="请输入"/>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="24">
@@ -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 @@
</div>
</div>
<h1 class="title">{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}</h1>
- <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}：</div>
+ <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}：</div>
<div class="text">{{ dialogData.TEXT }}</div>
<div class="collateral">
<div v-for="(item,index) in dialogData.DETAIL" :key="index" class="item">
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 @@
<td class="trwidth">{{ item.POSTNAME }}</td>
<td class="bbg">{{ '人员' + (index + 1) }}</td>
<td class="trwidth">{{ item.USERNAME && item.USERNAME.join('、') }}</td>
+ <td class="bbg">{{ '岗位名称' + (index + 1) }}</td>
+ <td class="trwidth">{{ item.NICKNAME }}</td>
</tr>
</table>
<el-divider content-position="left">承诺内容</el-divider>
@@ -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 717c47d059c8f7b10f652ae839f7bd4f26e7fb26 Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Thu, 6 Mar 2025 11:43:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=B6=88=E9=98=B2?=
=?UTF-8?q?=E5=99=A8=E6=9D=90=E6=B2=A1=E6=9C=89undefined=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/firefighting/device/components/edit.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/firefighting/device/components/edit.vue b/src/views/firefighting/device/components/edit.vue
index b6ab6a6..3130bbb 100644
--- a/src/views/firefighting/device/components/edit.vue
+++ b/src/views/firefighting/device/components/edit.vue
@@ -311,7 +311,7 @@ export default {
}
this.$refs.form.validate(valid => {
if (valid) {
- if (this.$parent.FIRE_DEVICE_ID === '') {
+ if (this.$parent.FIRE_DEVICE_ID === '' || this.$parent.FIRE_DEVICE_ID === undefined) {
this.handleAdd()
} else {
this.handleUpdate()