From 38c75bc6ea0e938d0ea0d1ae7d204b35cd04ac5a Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 5 Aug 2022 18:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/organization/organization.vue | 13 +++++++++++-- src/views/modules/visual/command/index.vue | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 88be90743..3782d13af 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1376,7 +1376,7 @@ export default { // 添加人员 async submitPeo () { const url = "/gov/org/staff/addstaffv2" - + const {peoForm:{orgType}} = this; let params = { orgType: this.peoForm.orgType, name: this.peoForm.name, @@ -1385,7 +1385,7 @@ export default { workType: this.peoForm.post, roles: this.peoForm.duty, newRoles: this.peoForm.newRoles, - orgId: this.currentAgencyId, + orgId: orgType=='agency' ? this.currentAgencyId : (orgType=='dept' ? this.currentDepartmentId : this.currentGridOrgId), } @@ -1401,6 +1401,13 @@ export default { this.getGridList() this.getAgencyStaffListData() this.insertFormRest() + if(orgType=='dept'){ + this.getDepartmentStaffListData() + } else if(orgType=='grid'){ + this.getGridStaffListData() + } else { + this.getAgencyStaffListData() + } } else { this.$message.error(msg) } @@ -1648,6 +1655,7 @@ export default { }, // 进入网格,查询网格所属人员 entryGrid (gridId) { + console.log(gridId) this.gridStaffTableListData = [] this.departmentStaffTableListData = [] this.agencyStaffTableListData = [] @@ -1663,6 +1671,7 @@ export default { }, // 进入部门,查询部门所属人员 entryDepartment (row) { + console.log(row) this.gridStaffTableListData = [] this.departmentStaffTableListData = [] this.agencyStaffTableListData = [] diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index 1b2fa81c7..577754cff 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -442,9 +442,12 @@ export default { categoryKeys2() { this.requestMapDot2(); }, - searchName() { + searchName(val) { this.showedSearchResult = false; this.searchResult = iniSearchResult(); + if (val == "") { + this.$refs.map.removeDotMarker(); + } }, },