Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-01-09 076a425a64e01b6e24ebde8fb1902fae17ee2797

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

@@ -10,8 +10,9 @@
            </div>
            <div class="addUser">
                <!-- :before-close="handleClose" -->
                <el-button class="addBtn" type="primary" @click="dialogCreate = true">添加用户</el-button>
                <el-dialog :visible.sync="dialogCreate" title="新增账户" width="45%" v-if="dialogCreate">
                <el-button class="addBtn button-addition" type="primary" @click="dialogCreate = true">添加用户</el-button>
                <el-dialog :visible.sync="dialogCreate" title="新增账户" width="60%" v-if="dialogCreate"
                    :before-close="handleClose">
                    <createUser @sendDialog="sendDialog" />
                </el-dialog>
            </div>
@@ -37,7 +38,15 @@
        sendDialog(flag) {
            console.log(flag);
            this.dialogCreate = flag.flag;
            this.$emit('setDialog', { flag:true })
            this.$emit('setDialog', { flag: true })
        },
        handleClose(done) {
            this.$confirm('确认关闭？')
                .then(_ => {
                    this.dialogCreate = false;
                    done();
                })
                .catch(_ => { });
        }
    },
    props: ['setDialog', 'getSearch', 'flag'],
@@ -45,7 +54,7 @@
</script>
<style lang="scss" scoped>
header {
    background-color: #09152f;
    // background-color: #09152f;
    border: 1pox solid #fff;

    .headerContent {
@@ -65,11 +74,11 @@

            .el-input {
                flex: 2;
                color: #1d3f57;
                // color: #1d3f57;

                &::v-deep .el-input__inner {
                    background-color: #09152f;
                    border: 1px solid #17324c;
                    // background-color: #09152f;
                    // border: 1px solid #17324c;
                }
            }

@@ -95,7 +104,7 @@
            padding: 12px 30px;
        }

            

    }
}
</style>