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

mg

2022-10-27 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c

 src/views/systemSetting/baseSetting/user/components/main/index.vue

@@ -8,7 +8,7 @@
                @selection-change="tableChange">
                <el-table-column type="selection" min-width="5">
                </el-table-column>
                <el-table-column label="用户ID" min-width="4">
                <el-table-column label="用户ID" min-width="6">
                    <template slot-scope="scope">{{ scope.row.id }}</template>
                </el-table-column>
                <el-table-column prop="nickName" label="用户名称" min-width="10">
@@ -33,12 +33,13 @@
                </el-table-column>
                <el-table-column prop="status" label="启用" min-width="5">
                    <template slot-scope="scope">
                        <el-switch class="switchStyle" v-model="scope.row.status" active-text="开" inactive-text="关"
                            active-color="#3fef9a" inactive-color="#000212" @change="handleChangeStatus(scope.row)">
                        <!-- @change="handleChangeStatus(scope.row)" -->
                        <el-switch class="switchStyle" v-model="scope.row.status"
                            active-color="#3fef9a" inactive-color="#000212" disabled>
                        </el-switch>
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="操作" min-width="22">
                <el-table-column prop="operation" label="操作" min-width="20">
                    <template slot-scope="scope">
                        <div class="operation">
                            <span @click="handleChangeRole(scope.row,'role')">修改角色</span>
@@ -54,9 +55,14 @@
                    </template>
                </el-table-column>
            </el-table>
            <!-- 查看修改页面 -->
            <!-- 查看页面 -->
            <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
                title="查看用户信息">
                <MyView :userInfo=userInfo></MyView>
            </el-dialog>
            <!-- 修改页面 -->
            <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
                :title="updateFlag ? flag.role ? '修改用户角色信息' : flag.depart ? '修改用户部门信息': '修改用户密码' :'查看用户信息'"
                :title="updateFlag ? flag.role ? '修改用户角色信息' : flag.depart ? '修改用户部门信息': '修改用户密码' :''"
                :before-close="handleClose">
                <updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
                    :getUserList="getUserList" v-if="!flag.password" />
@@ -65,10 +71,10 @@
            <!-- tools -->
            <div class="tools">
                <div class="funs">
                    <div class="funsItem">
                    <div class="funsItem funs-sp">
                        <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
                    </div>
                    <div class="funsItem">
                    <div class="funsItem funs-sp">
                        <el-checkbox v-model="unsame" @change="disSame(tableData)">反选</el-checkbox>
                    </div>
                    <div class="funsItem">
@@ -93,15 +99,17 @@
import helper from '@/utils/mydate'
import updateUser from '../updateUser';
import MyPwd from '../password'
import MyView from '../myView'
export default {
    components: {
        updateUser, MyPwd
        updateUser, MyPwd,MyView
    },
    data() {
        return {
            tableData: [],
            search: "",
            dialogUpdate: false,
            dialogView:false,
            updateFlag: false,
            userInfo: '',
            totalNum: 200,
@@ -326,13 +334,8 @@
        },
        // 查看用户信息(不可修改)
        handleFind(rowData) {
            this.dialogUpdate = true;
            this.updateFlag = false;
            this.dialogView = true;
            this.userInfo = rowData;
            const { flag } = this;
            for (let key in flag) {
                flag[key] = false;
            }
        },
        // 设置表格斑马纹
        tableRowClassName({ row, rowIndex }) {
@@ -388,23 +391,24 @@
    border: 1pox solid #fff;

    .mainTitle {
        line-height: 60px;
        line-height:60px;
    }

    .tools {
        display: flex;
        display : flex;
        justify-content: space-between;
        align-items: center;
        padding: 0 20px;

        .funs {
            display: flex;

            .funs-sp{
                border: 1px solid #17324c;
            }
            .funsItem {
                line-height: 28px;
                display: flex;
                align-items: center;
                border: 1px solid #17324c;
                border-radius: 4px;
                font-size: 12px;
                margin-left: 10px;
@@ -460,17 +464,11 @@
    .el-table {
        color: #4b9bb7;
        font-size: 10px;

        &::v-deep .el-table__empty-block {
            background-color: #09152f;
            color: #4b9bb7;
        }

        .operation {
            display: flex;

            font-size: 10px;
            .line {
                padding: 0 5px;
                padding: 0 1px;
            }

            span:hover {
@@ -478,42 +476,33 @@
            }
        }
    }
    // &::v-deep .switchStyle .el-switch__label {
    //     position: absolute;
    //     display: none;
    //     color: #fff;
    // }

    .el-table::v-deep .warning-row {
        background: #06122c;
    }
    // &::v-deep .el-switch__core {
    //     background-color: rgba(166, 166, 166, 1);
    // }

    .el-table::v-deep .success-row {
        background: #071f39;
    }
    // &::v-deep .switchStyle .el-switch__label--left {
    //     z-index: 9;
    //     left: 20px;
    // }

    &::v-deep .switchStyle .el-switch__label {
        position: absolute;
        display: none;
        color: #fff;
    }
    // &::v-deep .switchStyle .el-switch__label--right {
    //     z-index: 9;
    //     left: 4px;
    // }

    &::v-deep .el-switch__core {
        background-color: rgba(166, 166, 166, 1);
    }
    // &::v-deep .switchStyle .el-switch__label.is-active {
    //     display: block;
    // }

    &::v-deep .switchStyle .el-switch__label--left {
        z-index: 9;
        left: 20px;
    }

    &::v-deep .switchStyle .el-switch__label--right {
        z-index: 9;
        left: 4px;
    }

    &::v-deep .switchStyle .el-switch__label.is-active {
        display: block;
    }

    &::v-deep .switchStyle.el-switch .el-switch__core,
    &::v-deep .el-switch .el-switch__label {
        width: 56px !important;
    }
    // &::v-deep .switchStyle.el-switch .el-switch__core,
    // &::v-deep .el-switch .el-switch__label {
    //     width: 56px !important;
    // }
}
</style>