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/utils/upload.js b/src/utils/upload.js index 9d15443..19f9687 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -67,7 +67,7 @@ service.interceptors.response.use( }) } else { Message({ - message: res.exception || '系统开小差了，请联系管理员', + message: res.exception || res.msg || '系统开小差了，请联系管理员', type: 'error', duration: 5 * 1000 }) diff --git a/src/views/firefighting/device/components/edit.vue b/src/views/firefighting/device/components/edit.vue index 66c4b68..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.fireDeviceId === '') { + if (this.$parent.FIRE_DEVICE_ID === '' || this.$parent.FIRE_DEVICE_ID === undefined) { this.handleAdd() } else { this.handleUpdate() diff --git a/src/views/firefighting/device/components/list.vue b/src/views/firefighting/device/components/list.vue index c5ff5ff..87de2ce 100644 --- a/src/views/firefighting/device/components/list.vue +++ b/src/views/firefighting/device/components/list.vue @@ -384,11 +384,14 @@ export default { formData ).then((data) => { this.$message({ - message: data.msg, - type: data.result === 'success' ? 'error' : 'success' + dangerouslyUseHTMLString: true, + message: data.msg.replaceAll('\r\n', '
').replaceAll('\n', '
'), + type: data.code === 200 ? 'success' : 'error' }) - this.getList() - this.dialogFormDaoru = false + if (data.code === 200) { + this.getList() + this.dialogFormDaoru = false + } }).catch(() => { this.listLoading = false }) diff --git a/src/views/firefighting/region/components/edit.vue b/src/views/firefighting/region/components/edit.vue index 7120aae..f2bccec 100644 --- a/src/views/firefighting/region/components/edit.vue +++ b/src/views/firefighting/region/components/edit.vue @@ -116,12 +116,12 @@ export default { '/fire/region/v2/update', { fireRegionId: this.fireRegionId, - fireRegionName: this.form.FIRE_REGION_NAME, - fireRegionCode: this.form.FIRE_REGION_CODE, - departmentId: this.form.DEPARTMENT_ID, - departmentIdOld: this.DEPARTMENT_ID_OLD, - remake: this.form.REMAKE, - photoUploadMethod: this.form.PHOTO_UPLOAD_METHOD + fireRegionName: this.form.fireRegionName, + fireRegionCode: this.form.fireRegionCode, + departmentId: this.form.departmentId, + departmentIdOld: this.departmentIdOld, + remake: this.form.remake, + photoUploadMethod: this.form.photoUploadMethod } ).then((data) => { if (data.code === 0 || data.code === 200) { 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..19075f3 --- /dev/null +++ b/src/views/hotwork/otherUnit/components/list.vue @@ -0,0 +1,345 @@ + + 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 @@ + + + + + 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() + }) } } } diff --git a/src/views/meteorologicalMonitoring/meteorologicalHY/index.vue b/src/views/meteorologicalMonitoring/meteorologicalHY/index.vue new file mode 100644 index 0000000..97b6c5b --- /dev/null +++ b/src/views/meteorologicalMonitoring/meteorologicalHY/index.vue @@ -0,0 +1,52 @@ +