From 2e6112e585b99da71d8d8951781b004cff53d24a Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 19 Apr 2022 10:36:12 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9A=82=E5=AD=98=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/poweraxis.vue | 262 ++++++++++++++++++ 1 file changed, 262 insertions(+) create mode 100644 src/views/modules/plugins/power/poweraxis.vue diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue new file mode 100644 index 00000000..91f10720 --- /dev/null +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -0,0 +1,262 @@ + + + + + \ No newline at end of file From 12629a4befcce2845caca8568150de7a21bd8bf2 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 19 Apr 2022 16:32:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/poweraxis.vue | 195 +++++++++++++++--- 1 file changed, 165 insertions(+), 30 deletions(-) diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index 91f10720..c60bf68f 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -28,19 +28,11 @@ >新增 - - 展开/折叠 - + 修改 + + 删除 + + + + + + + + + + + + + + + @@ -95,6 +116,19 @@ + + + 确认删除吗？ +
+ 取 消 + 确 定 +
+ @@ -103,8 +137,11 @@ import { requestPost } from "@/js/dai/request"; export default { data(){ return{ + // 删除标签 + delId:'', // 客户Id customerId:'', + agencyId:'', // 查询参数 queryParams:{ name:'' @@ -118,26 +155,35 @@ export default { agencyType:'', pid:'', categoryCode:'', - sort:0 + sort:'' }, // 树状结构列表 treeList:[], // 查询动力主轴机构标签 listSimple:[], - + // 绑定组织列表 + agencytree:[], + // 上级网格党支部列表 + GridPartyBranchList:[], // 重新渲染表格状态 refreshTable: true, // 是否展开，默认全部展开 isExpandAll: true, // 新增对话框 addDialogBox:false, + // 组织列表开关 + orgListSwitch:false, + // 确认删除弹窗 + delWindow:false, } }, created(){ - this.getTreeList() + // this.getTreeList() + this.getList4Tree() }, mounted(){ this.customerId = localStorage.getItem('customerId') + this.agencyId = localStorage.getItem('agencyId') }, methods:{ // 查询按钮操作 @@ -158,19 +204,19 @@ export default { }, // 获取树状列表数据 - async getTreeList(){ - const url = '/pli/power/axisStruct/getTreeList' + // async getTreeList(){ + // const url = '/pli/power/axisStruct/getTreeList' - let params = {} + // let params = {} - const { data,code,msg } = await requestPost(url) + // const { data,code,msg } = await requestPost(url) - if(code === 0){ - this.treeList = data - } else { - this.$message.error(msg) - } - }, + // if(code === 0){ + // this.treeList = data + // } else { + // this.$message.error(msg) + // } + // }, // 确定新增按钮 async submitAddNewOrg(){ const url = '/pli/power/axisStruct/addOrg' @@ -178,7 +224,11 @@ export default { let params = { name:this.addOrgForm.name, sort:this.addOrgForm.sort, - customerId:this.customerId + customerId:this.customerId, + agencyId:this.addOrgForm.agencyId, + agencyName:this.addOrgForm.agencyName, + agencyType:this.addOrgForm.agencyType, + categoryCode:this.addOrgForm.categoryCode } const { data, code, msg } = await requestPost(url,params) @@ -187,11 +237,12 @@ export default { this.$message.success("新增成功") this.addDialogBox = false this.addOrgFormRest() - this.getTreeList() + this.getList4Tree() } else { this.$message.error(msg) } }, + // 获取动力主轴标签 async getListSimple(){ const url = '/pli/power/axisTag/listSimple/struct' @@ -200,22 +251,63 @@ export default { const { data, code, msg } = await requestPost(url,params) if (code === 0) { - console.log(data) this.listSimple = data } else { this.$message.error(msg) } }, + // 获取组织列表 + async getAgencyTree(){ + const url = '/data/aggregator/org/agencytree' + + let params = { + agencyId:this.agencyId, + client:'gov' + } + + const { data, code, msg } = await requestPost(url,params) + + if (code === 0) { + this.agencytree = data[0].subOrgList + } else { + this.$message.error(msg) + } + }, + // 获取组织树 + async getList4Tree(){ + const url = '/pli/power/axisStruct/list4Tree' + + let params = {} + + const { data, code, msg } = await requestPost(url,params) + + if (code === 0) { + this.treeList = data + } else { + this.$message.error(msg) + + } + }, + // 获取上级网格党支部 + async getGridPartyBranchList(){ + const url = '/pli/power/axisStruct/GridPartyBranchList' + + let params = {} + + + }, + // 新增按钮 addNewOrg(){ this.addDialogBox = true this.getListSimple() + this.getAgencyTree() }, /** 重置按钮操作 */ resetQuery() { this.queryParams.name = '' - this.getTreeList() + this.getList4Tree() }, /** 展开/折叠操作 */ toggleExpandAll() { @@ -229,6 +321,7 @@ export default { handleClose(done) { this.$confirm('确认关闭？') .then(_ => { + this.addOrgFormRest() done(); }) .catch(_ => {}); @@ -236,6 +329,7 @@ export default { // 取消新增按钮 cancelAdd(){ this.addDialogBox = false + this.addOrgFormRest() }, // 清空新增表单 addOrgFormRest(){ @@ -246,13 +340,54 @@ export default { this.addOrgForm.agencyName = '', this.addOrgForm.agencyType = '', this.addOrgForm.pid = '' + this.addOrgForm.categoryCode = '' }, // 动力主轴选中后的操作 - handelChange(event){ - console.log(event) - } + handelChange(val){ + this.addOrgForm.categoryCode = val + if (val === 'community_party') { + this.orgListSwitch = true + } + if(val === 'grid_party') { + this.orgListSwitch = false + } + }, + handelAgencyTree(val){ + let obj = {} + obj = this.agencytree.find(item => { + return item.orgId === val + }) + this.addOrgForm.agencyName = obj.orgName + this.addOrgForm.agencyType = obj.orgType + this.addOrgForm.agencyId = val + }, + // 删除按钮 + del(row){ + this.delWindow = true + this.delId = row.row.id + }, + async submitDelete(){ + const url = '/pli/power/axisStruct/deleteById/'+this.delId + + let params = {} + const { data, code, msg } = await requestPost(url,params) + if (code === 0) { + this.$message.success("删除成功") + this.delWindow = false + this.getList4Tree() + } else { + this.$message.error(msg) + } + }, + // 取消删除按钮 + canceldelWindow(){ + this.delWindow = false + }, + + + } } From a2481ad34f62dd35eb28c6011711f51c9e2d6706 Mon Sep 17 00:00:00 2001 From: YUJT Date: Tue, 19 Apr 2022 17:32:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9EtreeSelect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/utils/treeSelect.js | 50 ++++++++ src/views/modules/plugins/power/.gitkeep | 0 src/views/modules/plugins/power/poweraxis.vue | 109 ++++++------------ 4 files changed, 86 insertions(+), 74 deletions(-) create mode 100644 src/utils/treeSelect.js delete mode 100644 src/views/modules/plugins/power/.gitkeep diff --git a/package.json b/package.json index 3deef137..dcecc12f 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "et:list": "gulp themes" }, "dependencies": { + "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^4.0.4", "axios": "^0.19.0", "babel-eslint": "^8.0.1", diff --git a/src/utils/treeSelect.js b/src/utils/treeSelect.js new file mode 100644 index 00000000..4ff8cfd0 --- /dev/null +++ b/src/utils/treeSelect.js @@ -0,0 +1,50 @@ +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ + export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} diff --git a/src/views/modules/plugins/power/.gitkeep b/src/views/modules/plugins/power/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index c60bf68f..2c37816a 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -2,15 +2,10 @@
- + - 搜索 重置 @@ -33,29 +28,21 @@ - - - + + + + + + @@ -134,7 +121,11 @@ \ No newline at end of file From f0a336726433796f861874c94759557195bc7128 Mon Sep 17 00:00:00 2001 From: YUJT Date: Wed, 20 Apr 2022 10:22:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/power/poweraxis.vue | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index f1815311..1fbfe7c9 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -1,6 +1,13 @@