From 4ec959d7c2ef1d8dd3af287814ca8a27650b99f7 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 一月 2023 15:33:42 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/baseSetting/user/components/header/index.vue | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index 48daecc..3626fd5 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -5,13 +5,13 @@
<span>绛涢�夋潯浠�:</span>
<el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="search"></el-input>
<div class="findBtn">
- <el-button type="primary" @click="setSearch">鏌ヨ</el-button>
+ <el-button class="find-Btn" type="primary" @click="setSearch">鏌ヨ</el-button>
</div>
</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>
@@ -54,8 +54,8 @@
</script>
<style lang="scss" scoped>
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ // background-color: #09152f;
+ border: 1px solid #fff;
.headerContent {
padding: 0 40px;
@@ -74,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;
}
}
@@ -93,18 +93,17 @@
.el-button {
padding: 12px 25px;
- border-radius: 20px;
+
}
}
.addBtn {
- background-color: #eb5d01;
+ background-color: #409EFF;
border: none;
- border-radius: 20px;
padding: 12px 30px;
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0