From 029f7ebb362634df7d2a00aa1dc7d37b40309a19 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 24 十月 2024 17:45:45 +0800
Subject: [PATCH] 1
---
src/views/console/authority/role/index.vue | 14 +++++++++++++-
src/views/home/widgets/index.vue | 13 +++++++++----
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/console/authority/role/index.vue b/src/views/console/authority/role/index.vue
index 9cb57d4..4392751 100644
--- a/src/views/console/authority/role/index.vue
+++ b/src/views/console/authority/role/index.vue
@@ -78,6 +78,7 @@
},
data() {
return {
+ templateGrantTreeCard: [], //涓存椂瀛樺偍/menu/grant-tree涓殑card
menuHandleText: "",
showtree: true,
treeCheck: [],
@@ -132,10 +133,20 @@
},
methods: {
roleSubmit() { //淇濆瓨
+ var cardIdArrId = []; //榛樿澧炲姞鍏ㄥ眬鍗＄墖
+ this.templateGrantTreeCard.forEach(item=> {
+ if(item.code == "desk") {
+ cardIdArrId.push(item.id);
+ item.children.forEach(item1=> {
+ cardIdArrId.push(item1.id);
+ })
+ }
+ })
+ var list = [...new Set([...cardIdArrId, ...this.treeCheck])];; //鏂版暟缁勶紝cardIdArr鍜宼his.treeCheck鍚堝苟
var obj = {
apiScopeIds: [],
dataScopeIds: [],
- menuIds: this.treeCheck,
+ menuIds: list,
roleIds: [this.tableLiId]
}
this.isSaveing = true;
@@ -290,6 +301,7 @@
getMenuGrant(row,index) {
this.$HTTP.get(`/api/blade-system/menu/grant-tree`).then(res=> {
if(res.code == 200) {
+ this.templateGrantTreeCard = res.data.card; //涓存椂瀛樺偍/menu/grant-tree涓殑card
//鑾峰彇宸查�夋暟鎹� (鏍戠殑鏁版嵁锛岃鑹瞚d)
this.getSelectTree(res,row.id,index);
}
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index c25ad0e..837a33b 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -143,7 +143,6 @@
})
var myGrid = copmsList;
this.$TOOL.data.set("DASHBOARDGRID", copmsList);
-
return this.allCompsList;
},
nowCompsList(){
@@ -157,7 +156,7 @@
},
methods: {
endDraggable(e) {
-
+ //console.log(this.grid,e,111)
},
getWorkbenchCarList() {
var data = this.$TOOL.data.get("MENU");
@@ -227,9 +226,15 @@
// this.$CONFIG.DEFAULT_GRID.data = cards;
//this.$CONFIG.DEFAULT_GRID.copmsList = [["mdcDeviceStatus"],["mdcRunning","mdcEquipmentRun"],[],[]]
if(res.data.length == 0) {
- this.$CONFIG.DEFAULT_GRID.copmsList = [];
+ this.$CONFIG.DEFAULT_GRID.copmsList = [[],[],[],[]];
}else {
- this.$CONFIG.DEFAULT_GRID.copmsList = res.data[0].layoutConfig == null?[]:JSON.parse(res.data[0].layoutConfig);
+ var layoutConfig = JSON.parse(res.data[0].layoutConfig);
+ //涓嶆弧瓒�4锛岃ˉ瓒�
+ var newArr = [...layoutConfig];
+ for (let i = 0; i < (4-newArr.length); i++) {
+ layoutConfig.push([]);
+ }
+ this.$CONFIG.DEFAULT_GRID.copmsList = res.data[0].layoutConfig == null?[]:layoutConfig;
}
this.$CONFIG.DEFAULT_GRID.layout = [24,12,6,6];
this.$CONFIG.DEFAULT_GRID.data = res.data;
--
Gitblit v1.9.3