From 1aabe41ecbb7772c85aa5697095239765b326aff Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 28 Aug 2024 16:26:01 +0800 Subject: [PATCH] =?UTF-8?q?696=20=E8=B5=B0=E4=B8=8D=E4=BA=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BA=86=20=E6=95=91=E6=8F=B4=E5=90=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=8F=98=20695=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=93=E6=8A=A5=E5=90=8E=20=E6=9F=A5=E7=9C=8B=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=B2=A1=E6=9C=89=E4=BB=BB=E4=BD=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20692=20=E8=83=BD=E5=88=A0=E9=99=A4=E5=90=97=20690=20=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=BA=E5=91=98=E5=BC=B9=E7=AA=97=20=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E4=B8=8D=E5=A5=BD=E4=BD=BF=20680=20?= =?UTF-8?q?=E6=9C=89=E4=B8=A4=E4=B8=AA=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=20=E6=8A=8A=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=20676=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E5=90=8E=E8=BF=98=E8=AE=A9?= =?UTF-8?q?=E8=BE=93=E5=85=A5=20=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=20674=20=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=88=90=E5=8A=9F=20658=20=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E5=86=85=E6=96=87=E5=AD=97=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=20657=20=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E4=B8=8D=E5=A5=BD?= =?UTF-8?q?=E4=BD=BF=20588=201=E3=80=81=E4=B8=8D=E6=98=AF=E6=8E=A5?= =?UTF-8?q?=E6=8A=A5=E4=BA=BA=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9C=8B=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=90=97=202=E3=80=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/grouplist.vue | 4 ++- .../emergency_agencies/components/list.vue | 5 +++- .../emergency_personnel/components/list.vue | 5 +++- .../assurance_management/components/list.vue | 5 +++- .../components/list.vue | 5 +++- .../technical_management/components/list.vue | 4 ++- .../components/list.vue | 5 +++- .../emergency_map/components/mapAssembly.vue | 4 +-- .../company_plan-check/components/list.vue | 25 +++++++++++++----- .../duty_log/components/selectZhiBanUser.vue | 12 ++++++++- .../components/selectZhiBanUser.vue | 10 +++++-- .../incident_report/components/list.vue | 19 +++++++------- .../rescue_expert/components/list.vue | 2 +- .../emergency_shelter/components/list.vue | 26 +++++++++---------- .../emergency/equipment/components/list.vue | 1 + 15 files changed, 91 insertions(+), 41 deletions(-) diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue index df6dcf4..c0a9124 100644 --- a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue +++ b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue @@ -199,6 +199,7 @@ export default { GROUP_TYPE: '', GROUP_TYPE_NAME: '' } + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -218,8 +219,9 @@ export default { id: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_agencies/components/list.vue b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_agencies/components/list.vue index ff8290e..4ac6c2f 100644 --- a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_agencies/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_agencies/components/list.vue @@ -587,6 +587,7 @@ export default { this.dialogFormEdit = false this.varList = [] this.listQuery.page = 1 + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -606,8 +607,9 @@ export default { id: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -645,6 +647,7 @@ export default { this.varList = [] this.listQuery.page = 1 this.$refs.multipleTable.clearSelection() + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listLoading = false diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue index cb72769..6840e94 100644 --- a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue @@ -203,7 +203,7 @@ export default { }, rules: { ORG_ID: [{ required: true, message: '请选择机构', trigger: 'blur' }], - USER_NAME: [{ required: true, message: '请输入姓名', trigger: 'blur' }], + USER_NAME: [{ required: true, message: '请选择用户', trigger: 'blur' }], GENDER: [{ required: true, message: '请输入性别', trigger: 'blur' }], ADMINISTRATIVE_POSITION: [{ required: true, message: '请输入行政职务', trigger: 'blur' }], ADMINISTRATIVE_LEVEL: [{ required: true, message: '请输入行政级别', trigger: 'blur' }], @@ -343,6 +343,7 @@ export default { requestFN('/major/personnel/save', payload).then((data) => { this.listLoading = false this.dialogFormEdit = false + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -358,6 +359,7 @@ export default { requestFN('/major/personnel/delete', { id }).then((data) => { if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -384,6 +386,7 @@ export default { this.listLoading = true requestFN('/major/personnel/deleteAll', { ids }).then(() => { this.listLoading = false + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listLoading = false diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue index fddc588..ba217c4 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue @@ -765,6 +765,7 @@ export default { this.dialogFormEdit = false this.varList = [] this.listQuery.page = 1 + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -784,8 +785,9 @@ export default { id: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -825,6 +827,7 @@ export default { this.varList = [] this.listQuery.page = 1 this.$refs.multipleTable.clearSelection() + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listLoading = false diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue index ab6c372..aff6c2e 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue @@ -828,6 +828,7 @@ export default { this.dialogFormEdit = false this.varList = [] this.listQuery.page = 1 + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -847,8 +848,9 @@ export default { id: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -888,6 +890,7 @@ export default { this.varList = [] this.listQuery.page = 1 this.$refs.multipleTable.clearSelection() + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listLoading = false diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue index 75be453..8ff465a 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue @@ -548,8 +548,9 @@ export default { id: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listISLOADing = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -589,6 +590,7 @@ export default { this.varList = [] this.listQuery.page = 1 this.$refs.multipleTable.clearSelection() + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listISLOADing = false diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue index 203d4a3..4e1b70c 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue @@ -718,6 +718,7 @@ export default { this.dialogFormEdit = false this.varList = [] this.listQuery.page = 1 + this.$message.success('保存成功') this.getList() }).catch((e) => { this.listLoading = false @@ -737,8 +738,9 @@ export default { ID: id } ).then((data) => { - if (data.result == 'success') { + if (data.result === 'success') { this.listLoading = false + this.$message.success('删除成功') this.getList() } }).catch((e) => { @@ -778,6 +780,7 @@ export default { this.varList = [] this.listQuery.page = 1 this.$refs.multipleTable.clearSelection() + this.$message.success('删除成功') this.getList() }).catch((e) => { this.listLoading = false diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue index 5a945a0..c917d09 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue @@ -483,8 +483,8 @@ export default { // 二级坐标点位点击事件 subToggleCheck(sos, ind) { mapInstance.clearOverlays() - var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标（例如北京天安门） - mapInstance.centerAndZoom(point, 10) // 设置中心点和缩放级别 + var point = new window.BMapGL.Point(this.firstPoint.y, this.firstPoint.x) // 设置中心点坐标 + mapInstance.centerAndZoom(point, 15) // 设置中心点和缩放级别 mapInstance.enableScrollWheelZoom(true) var circle = new window.BMapGL.Circle(point, this.range, { // 2000米半径 strokeColor: 'blue', diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue index dd53879..85e5c90 100644 --- a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue @@ -1,10 +1,19 @@