1
lzhe
2024-09-23 8b1ae870b7d87fc5b7ec48ea2718990a93d2f1c3
1
已修改2个文件
82 ■■■■ 文件已修改
src/views/console/system/addUser.vue 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/widgets/index.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/addUser.vue
@@ -107,11 +107,23 @@
        mounted() {
            this.getRole();
            this.getDeptIdList();
            this.getEmployee();
        },
        methods: {
            employeeIdChange(val) {  //关联员工
                val = val[val.length - 1];
                var that = this;
                this.form.employeeId = val[val.length - 1];
                function forEmp(arr) {
                    arr.forEach(item=> {
                        if(item.id == that.form.employeeId) {
                            that.form.employeeName = item.name;
                        }else {
                            if(item.children) {
                                forEmp(item.children);
                            }
                        }
                    })
                }
                forEmp(this.employeeIdOptions);
            },
            roleIdChange(val) {  //数据权限
                this.form.roleIdStr = val.join(",");
@@ -123,6 +135,9 @@
            open(mode='add'){
                this.mode = mode;
                this.visible = true;
                if(mode=='add') {
                    this.getEmployee("");
                }
                return this
            },
            //加载树数据
@@ -137,10 +152,8 @@
            //表单提交方法
            submit(){
                var obj = Object.assign({},this.form);
                obj.employeeId = obj.employeeIdStr;
                obj.deptId = obj.deptIdStr;
                obj.roleId = obj.roleIdStr;
                delete obj.employeeIdStr;
                delete obj.deptIdStr;
                delete obj.roleIdStr;
                this.$refs.dialogForm.validate(async (valid) => {
@@ -175,9 +188,23 @@
                    }
                })
            },
            getEmployee() {
                this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=").then(res=> {
            getEmployee(employeeId) {
                this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=" + employeeId).then(res=> {
                    if(res.code == 200) {
                        function changeArr(arr) {
                            arr.forEach(item=> {
                                if(!item.children) {
                                    if(item.isGroup) {
                                        item.disabled = true;
                                    }else {
                                        item.disabled = false;
                                    }
                                }else {
                                    changeArr(item.children)
                                }
                            })
                        }
                        changeArr(res.data[0].children);
                        this.employeeIdOptions = res.data;
                    }
                })
@@ -185,13 +212,12 @@
            showDetail(data) {
                this.$HTTP.get("/api/blade-user/detail?id="+data.id).then(res=> {
                    if(res.code == 200) {
                        res.data.employeeIdStr = res.data.employeeId;
                        res.data.deptIdStr = res.data.deptId;
                        res.data.roleIdStr = res.data.roleId;
                        res.data.roleId = res.data.roleId.split(",");
                        res.data.deptId = [res.data.deptId];
                        Object.assign(this.form, res.data);
                        console.log(this.form);
                        this.form = res.data;
                        this.getEmployee(res.data.employeeId);
                    }
                })
            },
src/views/home/widgets/index.vue
@@ -120,7 +120,7 @@
            this.getWorkbenchCarList();
        },
        mounted() {
            this.$emit('on-mounted')
            this.$emit('on-mounted');
        },
        computed: {
            allCompsList(){
@@ -191,16 +191,38 @@
                            }  
                            // 如果 xcoordinate 也相同,则不交换位置  
                            return 0;
                        });
                        //console.log(cards)
                        cards.forEach((item,index)=> {
                            this.$CONFIG.DEFAULT_GRID.copmsList[index] = [item.cardKey];
                            this.$CONFIG.DEFAULT_GRID.layout[index] = item.cardWide * 2;
                        });
                        var layout = [...new Set(cards.map(v => v.cardWide *2))];  //布局
                        var result = {}
                        //排序
                        cards.forEach(v=> {
                            if(!result[`${v.cardWide}-${v.xcoordinate}`]) {
                                result[`${v.cardWide}-${v.xcoordinate}`] = []
                            }
                            result[`${v.cardWide}-${v.xcoordinate}`].push(v)
                        })
                        //console.log(this.$CONFIG.DEFAULT_GRID.copmsList,this.$CONFIG.DEFAULT_GRID.layout,234)
                        let resdata = []
                        Object.values(result).forEach(v => {
                            let min = v.sort((a,b) => a.ycoordinate - b.ycoordinate)[0];
                            let minYX = Number(min.ycoordinate)*10 + Number(min.xcoordinate);
                            let obj = {};
                            obj[minYX] = v;
                            resdata.push(obj);
                        })
                        var lastData = resdata.map(v => Object.values(v));
                        //转化
                        var copmsList = lastData.map(function(outerArray) {
                            // 访问最内层的对象数组
                            var innerArray = outerArray[0];
                            return innerArray.map(function(obj) {
                                return obj.cardKey;
                            });
                        });
                        this.$CONFIG.DEFAULT_GRID.copmsList = copmsList;
                        this.$CONFIG.DEFAULT_GRID.layout = layout;
                        this.$CONFIG.DEFAULT_GRID.data = cards;
                        this.defaultGrid = this.$CONFIG.DEFAULT_GRID;
                        this.grid = this.$TOOL.data.get("grid") || JSON.parse(JSON.stringify(this.defaultGrid))
                        this.grid = this.$TOOL.data.get("grid") || JSON.parse(JSON.stringify(this.defaultGrid));
                    }
                })
            },