Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

wl

2022-09-20 ecc1b232f0a3c753db5b121e9a6ecb181c4bc277

 src/views/systemSetting/baseSetting/role/index.vue

@@ -10,8 +10,8 @@
                    </div>
                </div>
                <div class="addUser">
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">添加用户</el-button>
                    <el-dialog :visible.sync="dialogCreate" width="45%">
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">新建角色</el-button>
                    <el-dialog :visible.sync="dialogCreate" width="45%" v-if="dialogCreate">
                        <createUser :refresh="getUserList" />
                    </el-dialog>
                </div>
@@ -51,13 +51,13 @@
                                <span class="line">|</span>
                                <!-- <span>修改密码</span> -->
                                <!-- <span>删除</span> -->
                                <span @click="handleUpdate(scope.row)">修改部门</span>
                                <span @click="handleUpdate(scope.row)">修改角色</span>
                            </div>
                        </template>
                    </el-table-column>
                </el-table>
                <!-- 查看修改页面 -->
                <el-dialog :visible.sync="dialogUpdate" width="45%">
                <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate">
                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo />
                </el-dialog>
                <!-- 分页 -->
@@ -87,7 +87,7 @@
            dialogUpdate: false,
            updateFlag: false,
            userInfo: '',
            totalNum: 200,
            totalNum: '',
            pageSize: 10,
            currentPage: 1,
        }
@@ -124,6 +124,7 @@
                        item.status == 1 ? item.status = true : item.status = false;
                    })
                    that.tableData = res.data
                    this.totalNum=res.data.length
                }
            })
        },
@@ -137,8 +138,8 @@
                        item.createTime = helper(item.createTime);
                        item.status == 1 ? item.status = true : item.status = false;
                    })
        
                    that.tableData = res.data.list
                     this.totalNum=this.
                     this.totalNum=res.data.list.length
                }
            })
        },
@@ -352,5 +353,8 @@
    &::v-deep .el-dialog__body {
        background-color: #06122c;
    }
    // &::v-deep .el-dialog__title{
    //     color: #4b9bb7;
    // }
}
</style>