From bab515e6ecfb16c042d455fdd2f042b2fd277dda Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 11 十月 2023 00:43:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/views/integration/systemInfo.vue | 220 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 194 insertions(+), 26 deletions(-) diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue index 7cd24b1..ab7958a 100644 --- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue +++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue @@ -20,41 +20,60 @@ @clear="handleClear" @keyup.enter.native="handleEnter"></el-input> </template> <template #menu="{row,index,size}"> - <el-button type="text" icon="el-icon-menu" size="small" @click="classifyHandler">鍒嗙被鎺堟潈</el-button> + <el-button icon="el-icon-menu" size="small" type="text" @click="classifyHandler(row)">鍒嗙被鎺堟潈</el-button> </template> </avue-crud> - <el-dialog :visible.sync="dialogVisible" append-to-body title="鍒嗙被鎺堟潈"> + <el-dialog :visible.sync="dialogVisible" append-to-body class="avue-dialog avue-dialog--top" title="鍒嗙被鎺堟潈" + top="-50px"> <el-row> - <el-col :span="14"> + <el-col :span="10"> <avue-tree ref="tree" - :option="TreeOption" - :data="TreeData" v-model="TreeForm" + :data="TreeData" + :option="TreeOption" @check-change="checkChange"> </avue-tree> </el-col> </el-row> + + <div slot="footer" class="dialog-footer" style="height: 50px;line-height: 50px"> + <el-button icon="el-icon-plus" size="small" type="primary" @click="empower">鎺� 鏉�</el-button> + <el-button icon="el-icon-close" size="small" type="danger" @click="resetting">閲� 缃�</el-button> + </div> </el-dialog> </basic-container> </template> <script> -import {getSysInfoList, sysInfoAdd, sysInfoEdit, sysInfoDel} from '@/api/integration/sysInfo.js' +import { + getSysInfoList, + sysInfoAdd, + sysInfoEdit, + sysInfoDel, + sysInfoTree, + batchAddSave +} from '@/api/integration/sysInfo.js' export default { data() { return { - TreeOption:{ - defaultExpandAll: true, + checkAll: {}, + ParentList: [], + ParentRemoveList: [], + //閬垮厤缂撳瓨 + reload: Math.random(), + TreeLoading: false, + TreeOption: { + defaultExpandAll: false, multiple: true, - addBtn:false, - filter:false + addBtn: false, + filter: false }, - TreeData:[], - TreeForm:{}, + TreeData: [], + TreeForm: {}, loading: false, - dialogVisible:false, + dialogVisible: false, page: { currentPage: 1, pageSize: 10, @@ -118,19 +137,171 @@ }, } }, + created() { + }, methods: { + //閲嶇疆 + resetting(){ + this.$refs.tree.setCheckedKeys([]) + // console.log(this.ParentList) + }, + empower() { + batchAddSave(this.checkAll.oid, this.checkAll.id, this.ParentList).then(res => { + // console.log(res.data) + if(res.data.code === 200){ + this.$message.success(res.data.msg) + this.dialogVisible=false; + } + }) + }, //鍒嗙被鎺堟潈澶氶�夊洖璋� - checkChange(){ - + checkChange(row, checked) { + if (checked) { + this.addAllChildren(row.children); + this.addToParentList(row); + // 鍕鹃�夎鏃跺皢鎵�鏈夎妭鐐规坊鍔犲埌ParentList涓� + } else { + this.removeAllChildren(row.children); + this.removeFromParentList(row); + // 鍙栨秷鍕鹃�夊皢鎵�鏈夎妭鐐规坊鍔犱粠ParentList涓Щ闄� + } + // console.table(this.ParentList); + }, + //瀛愯妭鐐规坊鍔� + addAllChildren(children) { + for (let child of children) { + this.addToParentList(child); + // 灏嗗瓙鑺傜偣娣诲姞鍒� ParentList 涓� + if (child.children && child.children.length > 0) { + this.addAllChildren(child.children); + } + } + }, + //瀛愯妭鐐圭Щ闄� + removeAllChildren(children) { + for (let child of children) { + this.removeFromParentList(child); + // 灏嗗瓙鑺傜偣浠� ParentList 涓Щ闄� + if (child.children && child.children.length > 0) { + this.removeAllChildren(child.children); + } + } + }, + //褰撳墠鐖惰妭鐐规坊鍔� + addToParentList(item) { + const classifyOid = item.attributes.classifyOid; + if (!this.isClassifyOidExists(classifyOid)) { + const record = { + oid: item.oid, + classifyId: item.attributes.classifyId, + classifyOid: classifyOid, + }; + this.ParentList.push(record); + } + }, + //褰撳墠鐖惰妭鐐圭Щ闄� + removeFromParentList(item) { + const classifyOid = item.attributes.classifyOid; + if (this.isClassifyOidExists(classifyOid)) { + const index = this.findIndexByClassifyOid(classifyOid); + if (index !== -1) { + this.ParentList.splice(index, 1); + } + } + }, + //鍒ら噸-ParentList + isClassifyOidExists(classifyOid) { + return this.ParentList.some(item => item.classifyOid === classifyOid); + }, + //鏌ユ壘index浣嶇疆 + findIndexByClassifyOid(classifyOid) { + return this.ParentList.findIndex(item => item.classifyOid === classifyOid); }, //鍒嗙被鎺堟潈 - classifyHandler(){ - this.dialogVisible=true; + classifyHandler(row) { + this.loading = true; + this.checkAll = row + sysInfoTree({systemOid: row.oid, systemId: row.id}).then(res => { + let List = []; + let value = 0; + let NumberList= []; + function traverse(obj, parent) { + //閲嶆柊鏋勫缓涓�娆¢�変腑褰撳墠row鐨勬暟鎹� + const record = { + label: obj.text, + oid: obj.oid, + attributes:{ + classifyId: obj.attributes.classifyId, + classifyOid: obj.attributes.classifyOid, + selected:obj.attributes.selected + }, + classParentOid: obj.parentId, + value: value, + children: [] + }; + //褰撳墠宸查�夋嫨鏁版嵁鍥炲~ + if (record.attributes.selected == 'true') { + NumberList.push(record.value); + } + if (parent) { + const stingChild = parent.children.find(child => child.label === record.label); + if (stingChild) { + record.value = stingChild.value; // 浣跨敤宸插瓨鍦ㄧ殑瀛愯妭鐐圭殑value鍊� + } else { + parent.children.push(record); + value++; + } + } else { + const stingRecord = List.find(item => item.label === record.label); + if (stingRecord) { + record.value = stingRecord.value; // 浣跨敤宸插瓨鍦ㄧ殑椤跺眰鑺傜偣鐨剉alue鍊� + } else { + List.push(record); + value++; + } + } + if (obj.children && obj.children.length > 0) { + for (let child of obj.children) { + traverse(child, record); + } + } + } + for (let item of res.data) { + traverse(item, null); + } + // console.log('list', List); + this.TreeData = List; + // this.ModifyProperties(this.TreeData, 'text', 'label'); + // 鏍规嵁this.TreeData鐨勯暱搴﹁绠楀欢杩熸椂闂� + const delayTime = this.TreeData.length * 1; + setTimeout(() => { + this.loading = false; + this.reload = Math.random(); + this.dialogVisible = true; + + this.$nextTick(() => { + if (this.$refs.tree) { + this.$refs.tree.setCheckedKeys(NumberList); + } + }); + }, delayTime); + }); + }, + //瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉� + ModifyProperties(obj, oldName, newName) { + for (let key in obj) { + if (key === oldName) { + obj[newName] = obj[key]; + delete obj[key]; + } + if (typeof obj[key] === 'object') { + this.ModifyProperties(obj[key], oldName, newName); + } + } }, async getDataList() { this.loading = true; - console.log(this.search); - const { pageSize, currentPage } = this.page; + const {pageSize, currentPage} = this.page; const conditions = {}; if (Object.keys(this.search).length > 0) { for (const key in this.search) { @@ -141,7 +312,7 @@ } const response = await getSysInfoList(pageSize, currentPage, conditions); if (response.status === 200) { - console.log(response); + // console.log(response); this.loading = false; const data = response.data.data; this.data = data.records; @@ -210,7 +381,7 @@ }).then(async () => { const response = await sysInfoDel(param) if (response.status === 200) { - console.log(response) + // console.log(response) this.$message({ type: 'success', message: '鍒犻櫎鎴愬姛!' @@ -232,9 +403,7 @@ }, // enter鎼滅储 handleEnter() { - if (this.search[this.selectValue] === '') return - else this.getDataList() - + this.getDataList() }, // 杈撳叆妗嗘竻绌� handleClear() { @@ -257,13 +426,12 @@ }, // 澶氶�� selectionChange(list) { - console.log(list) let newData = list.map(item => { const {oid} = item return oid }) this.delIds = {oids: newData.toString()} - console.log(this.delIds) + // console.log(this.delIds) }, } } -- Gitblit v1.9.3