From 0e0853569be92bf60ec8d57eb870bf719ca77060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 31 Jul 2024 15:12:38 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index c53791e5f..0e68de892 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1755,6 +1755,7 @@ export default { // 调用递归函数提取 level 与 agencyId 组合成的字符串 this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); // 将 Set 对象转换为数组 + const manageScopeArray = Array.from(result); const url = "/gov/org/staff/editstaff"; let params = { @@ -2137,11 +2138,10 @@ export default { // 修改人员 async xiuPeo (row) { console.log("修改人员"); + console.log(row); this.modifyPeo = true; this.peoForm.orgType = "agency"; - this.userStaffId = row.staffId; - const url = "/gov/org/staff/editstaffinit"; let params = { staffId: row.staffId, @@ -2152,9 +2152,9 @@ export default { this.peoForm.name = data.name; this.peoForm.mobile = data.mobile; this.peoForm.post = data.workType; - // this.peoForm.gender = data.gender === 1 ? '男' : '女' this.peoForm.gender = data.gender; this.peoForm.idCard = data.idCard; + this.peoForm.agencyName=data.agencyName; // 已有的权限（角色） let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2164,24 +2164,25 @@ export default { }); this.peoForm.newRoles = existedRoleArr; var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); + console.log(paths,"shskdjfhkjsaf"); this.peoForm.manageScopes = paths; } else { this.$message.error(msg); } }, findParentPath(data,agencyIds) { + console.log(data,agencyIds,"dskck"); let paths = []; - function findPathRecursive(agencyId, node, path) { - if (node.agencyId === agencyId) { + console.log(agencyId, node, path); + if (node.id === agencyId) { path.push(agencyId); paths.push(path.slice()); // Make a copy of the path array before pushing return true; } - - if (node.subAgencyList) { - for (let i = 0; i < node.subAgencyList.length; i++) { - if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) { + if (node.manageScopes) { + for (let i = 0; i < node.manageScopes.length; i++) { + if (findPathRecursive(agencyId, node.manageScopes[i], path.concat(node.id))) { return true; } } @@ -2193,7 +2194,7 @@ export default { agencyIds.forEach(agencyId => { findPathRecursive(agencyId, data, []); }); - + console.log(paths,"paths"); return paths; }, // 修改社区人员 From 2777aa62aa61177737586189c9f22e37fe08d815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 2 Aug 2024 09:47:13 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=84=E7=BB=87=E8=BF=9B=E8=A1=8C=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 86 +++++++++---------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 0e68de892..586fdd937 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1346,14 +1346,13 @@ export default { orgOptionProps :{ multiple: true, emitPath: true, - value: 'id', - label: 'label', - children: 'children', - checkStrictly: true, - lazy: true, - lazyLoad: (node, resolve) => { - this.loadOptions(node, resolve) - }, + value: 'agencyId', + label: 'agencyName', + children: 'subAgencyList', + checkStrictly: true + // lazyLoad: (node, resolve) => { + // this.loadOptions(node, resolve) + // }, }, dialogVisiblePeoAgency:false,//通过组织添加 @@ -1421,40 +1420,42 @@ export default { methods: { getOrgTreeList () { this.$http - .get('/actual/base/communityBuilding/tree/initTree', {}) + .post('/gov/org/customeragency/agencygridtree', {}) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } else { + console.log('获取组织树成功', res.data) this.orgOptions = [] this.orgOptions.push(res.data) + console.log(this.orgOptions,"sdkfhkjdfs"); } }) .catch(() => { return this.$message.error('网络错误') }) }, - async loadOptions(node, resolve) { - let data1 =node.data; - if (data1.level == 'district') { - resolve(this.orgOptions); - - } else { - if(data1.level !== "building"){ - const url = "/actual/base/communityBuilding/tree/nextTreeNode"; - let params = { - level:data1.level, - id:data1.id - }; - const { data, code, msg } =await requestGet(url, params); - data1.children=data - resolve(data); - }else{ - return resolve() - } - - } - }, + // async loadOptions(node, resolve) { + // let data1 =node.data; + // if (data1.level == 'district') { + // resolve(this.orgOptions); + + // } else { + // if(data1.level !== "building"){ + // const url = "/actual/base/communityBuilding/tree/nextTreeNode"; + // let params = { + // level:data1.level, + // id:data1.id + // }; + // const { data, code, msg } =await requestGet(url, params); + // data1.children=data + // resolve(data); + // }else{ + // return resolve() + // } + + // } + // }, // 点击后获取id handleChangeTransferCascader (e) { function findItem (valueArr, coll) { @@ -1790,14 +1791,12 @@ export default { // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串 extractLevelAndAgencyId(obj, agencyIds, result) { - if (obj && typeof obj === 'object') { - console.log(obj,"1111"); - if (obj.level && obj.id && agencyIds.includes(obj.id)) { - result.add(`${obj.level}:${obj.id}`); + if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) { + result.add(`${obj.level}:${obj.agencyId}`); } - if (Array.isArray(obj.children)) { - obj.children.forEach(subObj => { + if (Array.isArray(obj.subAgencyList)) { + obj.subAgencyList.forEach(subObj => { this.extractLevelAndAgencyId(subObj, agencyIds, result); }); } @@ -2149,6 +2148,8 @@ export default { }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { + console.log("修改人员", data); + this.peoForm.name = data.name; this.peoForm.mobile = data.mobile; this.peoForm.post = data.workType; @@ -2164,7 +2165,6 @@ export default { }); this.peoForm.newRoles = existedRoleArr; var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); - console.log(paths,"shskdjfhkjsaf"); this.peoForm.manageScopes = paths; } else { this.$message.error(msg); @@ -2173,16 +2173,15 @@ export default { findParentPath(data,agencyIds) { console.log(data,agencyIds,"dskck"); let paths = []; - function findPathRecursive(agencyId, node, path) { - console.log(agencyId, node, path); - if (node.id === agencyId) { + function findPathRecursive(agencyId, node, path) {; + if (node.agencyId === agencyId) { path.push(agencyId); paths.push(path.slice()); // Make a copy of the path array before pushing return true; } - if (node.manageScopes) { - for (let i = 0; i < node.manageScopes.length; i++) { - if (findPathRecursive(agencyId, node.manageScopes[i], path.concat(node.id))) { + if (node.subAgencyList) { + for (let i = 0; i < node.subAgencyList.length; i++) { + if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) { return true; } } @@ -2190,7 +2189,6 @@ export default { return false; } - agencyIds.forEach(agencyId => { findPathRecursive(agencyId, data, []); }); From f5124546cb69e415140d27068a22aa64740fd963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 7 Aug 2024 16:09:21 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=8F=98=E4=B8=BAlevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/eventOld/cpts/process-form-designate.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue index be3cd8530..3d5265f0f 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue @@ -205,11 +205,11 @@ export default { handleChangeAgency(val) { let obj = this.$refs["agencyIdArray"].getCheckedNodes()[0].data if (obj) { - this.formData.orgType = obj.level === 'grid' ? 'grid' : 'agency' + this.formData.level = obj.level === 'grid' ? 'grid' : 'agency' this.formData.deptId = obj.agencyId this.formData.deptName = obj.agencyName } else { - this.form.orgType = '' + this.form.level = '' this.form.orgId = '' } }, From 48e649d2d2b619778c2d0d5d99bb1147ac489362 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 12 Aug 2024 12:34:48 +0800 Subject: [PATCH 04/14] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8D=95=E5=85=83=E9=97=A8=E7=89=8C=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/communityTable.vue | 55 +++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index bb1f03bab..99333f554 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -39,12 +39,12 @@ 导入房屋数据 - + 导入 - + 导出 @@ -75,7 +75,11 @@ -->
下载电子门牌 + @click="handleExportHouseDoorplate()">下载房屋电子门牌 +
+
+ 下载单元电子门牌
导入 - 下载模板 + Date: Tue, 13 Aug 2024 12:59:14 +0800 Subject: [PATCH 06/14] =?UTF-8?q?edit:=E3=80=90=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/modules/workSys/role/role.vue | 12 ++++++-- src/views/modules/workSys/role/roleForm.vue | 31 +++++++++++++++++---- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index 0fde813fa..9c8490046 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api # VUE_APP_API_SERVER = http://192.168.1.60:8080/api -VUE_APP_API_SERVER = http://219.146.91.110:30801/api +VUE_APP_API_SERVER = http://localhost:8080/api # VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801 # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index f00869619..b875a5d57 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -38,7 +38,7 @@ class="diy-button--white" @click="resetSearch">重置 - +
@@ -55,7 +55,7 @@ border :height="tableHeight" v-loading="tableLoading" - + style="width: 100%"> + + + + + + + + + { + this.orgLevels = data + console.log("行政组织级别:", data) + }) } }, computed: { @@ -321,8 +344,6 @@ export default { name: [ { required: true, message: '角色名称不能为空', trigger: 'change' } ], - - } }, From 017a3745acf2f3c611e946f036549c245b9152cc Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 13 Aug 2024 13:00:49 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fi=EF=BC=9A=E5=A4=9A=E4=BD=99=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 9c8490046..0fde813fa 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api # VUE_APP_API_SERVER = http://192.168.1.60:8080/api -VUE_APP_API_SERVER = http://localhost:8080/api +VUE_APP_API_SERVER = http://219.146.91.110:30801/api # VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801 # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api From a7b28e03c11a744cd2ccbb30ecf62f88cdd0ad13 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 13 Aug 2024 16:07:40 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fi:=E8=A7=92=E8=89=B2=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/role/roleForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 456bdd335..f736aeb58 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -333,7 +333,7 @@ export default { // 加载行政组织级别 listOrgLevels4Roles() { - requestGet('/gov/access/govrole/listOrgLevels4Roles').then(({code, data, msg}) => { + requestGet('/gov/access/govrole/orgLevels/list').then(({code, data, msg}) => { this.orgLevels = data console.log("行政组织级别:", data) }) From 35d5d6072b096b7bf857b6644fec9f9d9d151ba7 Mon Sep 17 00:00:00 2001 From: duanliangtao <48194157+duanliangtao@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:39:46 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E7=9A=84=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/eventOld/cpts/event-info.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index ca929bc52..334a07add 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -113,34 +113,34 @@