1

lzhe

2024-10-24 029f7ebb362634df7d2a00aa1dc7d37b40309a19

1

 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和this.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
                        //获取已选数据  (树的数据，角色id)
                        this.getSelectTree(res,row.id,index);
                    }

 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;