From 3c2b5234b08f604bd9b466e40f8529779dcb3f36 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 09 十月 2023 15:12:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 245 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 217 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index 392d645..aea7794 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -19,16 +19,61 @@
:size="size" clearable style="width:300px;margin-left: 10px;"
@clear="handleClear" @keyup.enter.native="handleEnter"></el-input>
</template>
+ <template #menu="{row,index,size}">
+ <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 class="avue-dialog avue-dialog--top" title="鍒嗙被鎺堟潈"
+ top="-50px">
+
+ <el-row>
+ <el-col :span="10">
+ <avue-tree ref="tree"
+ 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">閲� 缃�</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 {
+ checkAll: {},
+ ParentList: [],
+ ParentRemoveList: [],
+ //閬垮厤缂撳瓨
+ reload: Math.random(),
+ TreeLoading: false,
+ TreeOption: {
+ defaultExpandAll: false,
+ multiple: true,
+ addBtn: false,
+ filter: false
+ },
+ TreeData: [],
+ TreeForm: {},
loading: false,
+ dialogVisible: false,
page: {
currentPage: 1,
pageSize: 10,
@@ -92,29 +137,176 @@
},
}
},
+ created() {
+ },
methods: {
- // 鑾峰彇鍒楄〃
- // async getDataList() {
- // this.loading = true
- // console.log(this.search)
- // const { pageSize, currentPage } = this.page
- // let param = { size: pageSize, current: currentPage }
- // this.search = Object.keys(this.search)
- // .filter((key) => this.search[key] !== null && this.search[key] !== undefined && this.search[key] !== "")
- // .reduce((acc, key) => ({ ...acc, [key]: this.search[key] }), {});
- // const response = await getSysInfoList(pageSize,currentPage,{...param})
- // if (response.status === 200) {
- // console.log(response)
- // this.loading = false
- // const data = response.data.data
- // this.data = data.records
- // this.page.total = data.total
- // } else this.loading = false
- // },
+ 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(row, checked) {
+ // this.ParentList=[]
+ // console.log('row',row)
+ if (checked) {
+ if (!row.parentId) {
+ const parentRecord = {
+ oid: row.oid,
+ classifyId: row.attributes.classifyId,
+ classifyOid: row.attributes.classifyOid,
+ classParentOid: row.parentId,
+ };
+ this.ParentList.push(parentRecord);
+ // 濡傛灉row鐨刢hildren涓嶄负绌� 缁х画寰幆children涓殑姣忎釜瀵硅薄
+ if (row.children && row.children.length > 0) {
+ for (let child of row.children) {
+ const childRecord = {
+ oid: child.oid,
+ classifyId: child.attributes.classifyId,
+ classifyOid: child.attributes.classifyOid,
+ classParentOid: child.parentId,
+ };
+ this.ParentList.push(childRecord);
+ // 濡傛灉瀛愬璞＄殑children涓嶄负绌� 缁х画寰幆鑾峰彇鏁版嵁
+ if (child.children && child.children.length > 0) {
+ for (let subChild of child.children) {
+ const subRecord = {
+ oid: subChild.oid,
+ classifyId: subChild.attributes.classifyId,
+ classifyOid: subChild.attributes.classifyOid,
+ classParentOid: subChild.parentId,
+ };
+ this.ParentList.push(subRecord);
+ }
+ }
+ }
+ }
+ }
+ } else {
+ // 鍙栨秷鍕鹃�夌殑鑺傜偣鏄埗鑺傜偣
+ if (!row.parentId) {
+ // 鎵惧埌鐖惰妭鐐瑰湪ParentList涓殑绱㈠紩
+ const parentIndex = this.ParentList.findIndex(item => item.oid === row.oid);
+ if (parentIndex !== -1) {
+ const parentOid = this.ParentList[parentIndex].classifyOid;
+
+ // 鏌ユ壘鎵�鏈夐渶瑕佸垹闄ょ殑瀛愯妭鐐圭殑绱㈠紩
+ const childIndexes = this.ParentList.reduce((indexes, item, index) => {
+ if (item.classParentOid === parentOid && item.classifyOid !== parentOid) {
+ indexes.push(index);
+ }
+ return indexes;
+ }, []);
+
+ // 浠庡悗寰�鍓嶅垹闄ゅ瓙鑺傜偣鐨勬暟鎹紝淇濊瘉绱㈠紩鐨勬纭��
+ for (let i = childIndexes.length - 1; i >= 0; i--) {
+ this.ParentList.splice(childIndexes[i], 1);
+ }
+
+ // 鍒犻櫎鐖惰妭鐐圭殑鏁版嵁
+ this.ParentList.splice(parentIndex, 1);
+ }
+ } else {
+ // 鍙栨秷鍕鹃�夌殑鑺傜偣鏄瓙鑺傜偣
+ const childIndex = this.ParentList.findIndex(item => item.oid === row.oid);
+ if (childIndex !== -1) {
+ // 鍒犻櫎瀛愯妭鐐圭殑鏁版嵁
+ this.ParentList.splice(childIndex, 1);
+ }
+ }
+ }
+ console.log('this.ParentList',this.ParentList);
+ },
+ //鍒嗙被鎺堟潈
+ 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) {
@@ -125,7 +317,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;
@@ -194,7 +386,7 @@
}).then(async () => {
const response = await sysInfoDel(param)
if (response.status === 200) {
- console.log(response)
+ // console.log(response)
this.$message({
type: 'success',
message: '鍒犻櫎鎴愬姛!'
@@ -216,9 +408,7 @@
},
// enter鎼滅储
handleEnter() {
- if (this.search[this.selectValue] === '') return
- else this.getDataList()
-
+ this.getDataList()
},
// 杈撳叆妗嗘竻绌�
handleClear() {
@@ -241,13 +431,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