From 32a212b99dfd1591cc0ace0f53e6cb0be81cea85 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 12 一月 2023 15:33:41 +0800
Subject: [PATCH] 2023/1/12 肖辉 userlist样式调整
---
src/views/systemSetting/baseSetting/user/components/header/index.vue | 4 +-
src/views/systemSetting/baseSetting/department/index.vue | 7 ++-
src/views/systemSetting/baseSetting/user/components/main/index.vue | 19 ++++++---
src/views/layout/components/Main/index.vue | 2
src/views/systemSetting/baseSetting/user/index.vue | 5 +-
src/App.vue | 3 +
src/views/systemSetting/baseSetting/role/index.vue | 35 ++---------------
7 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 1dee9fa..42c056c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -49,6 +49,9 @@
};
</script>
<style lang="scss">
+.userList{
+ //height: 100%;
+}
.el-select-dropdown__item {
height: 100% !important;
}
diff --git a/src/views/layout/components/Main/index.vue b/src/views/layout/components/Main/index.vue
index 2818d88..11c45ae 100644
--- a/src/views/layout/components/Main/index.vue
+++ b/src/views/layout/components/Main/index.vue
@@ -351,7 +351,7 @@
.content {
padding: 11px;
- //height: 100%;
+ height: 100%;
background-color: #F5F9FA;
.page-nav {
padding: 40px 100px;
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index 54691db..dbb01bb 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -448,15 +448,16 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
// color: #4b9bb7;
+ //height: 100%;
border: 1px solid #ccc;
header {
// background-color: white;
// border: 1 pox solid #fff;
.headerContent {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -517,7 +518,7 @@
display: flex;
justify-content: space-between;
align-items: center;
- padding: 0 20px;
+ padding: 0;
.funs-sp {
// border: 1px solid #17324c;
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index dd2da9b..9d40ce8 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -360,53 +360,44 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
// color: #4b9bb7;
+ //height: 100%;
border: 1px solid #ccc;
header {
// background-color: #09152f;
// border: 1pox solid #fff;
-
.headerContent {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
align-items: center;
-
.search {
display: flex;
justify-content: flex-start;
-
span {
flex: 1;
}
-
.el-input {
flex: 2;
// color: #1d3f57;
-
&::v-deep .el-input__inner {
// background-color: #09152f;
// border: 1px solid #17324c;
}
}
-
}
-
.findBtn {
line-height: 100px;
margin-left: 15px;
display: flex;
align-items: center;
margin-top: -2px;
-
.el-button {
padding: 12px 25px;
-
}
}
-
.addBtn {
//background-color: #eb5d01;
border: none;
@@ -415,29 +406,25 @@
}
}
}
-
main {
// background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
// border: 1pox solid #fff;
-
.mainTitle {
line-height: 60px;
}
-
.tools {
display: flex;
justify-content: space-between;
align-items: center;
- padding: 0 20px;
+ padding: 0;
.funs-sp{
// border: 1px solid #17324c;
border: 1px solid #DCDFE6;
}
.funs {
display: flex;
-
.funsItem {
line-height: 28px;
display: flex;
@@ -450,42 +437,33 @@
width: 80px;
padding: 0 10px;
}
-
.el-select {
width: 120px;
}
-
// &::v-deep .el-input__inner {
// border: none;
// background-color: #09152f;
// }
-
// &:hover {
// border: 1px solid #4b9bb7;
// }
-
// &:hover .el-checkbox {
// color: #4b9bb7;
// }
}
-
}
-
.pagination {
margin-top: 50px;
display: flex;
line-height: 50px;
justify-content: center;
-
.el-pagination {
-
// &::v-deep li,
// &::v-deep .btn-prev,
// &::v-deep .btn-next {
// background-color: #071f39;
// color: #4b9bb7;
// }
-
// &::v-deep .active {
// background-color: #409eff;
// color: #fff;
@@ -493,24 +471,19 @@
}
}
}
-
.el-table {
// color: #4b9bb7;
// font-size: 10px;
-
.operation {
display: flex;
-
.line {
padding: 0 5px;
}
-
span:hover {
cursor: pointer;
}
}
}
-
}
}
</style>
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index 3626fd5..f4608d8 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -55,10 +55,10 @@
<style lang="scss" scoped>
header {
// background-color: #09152f;
- border: 1px solid #fff;
+ //border: 1px solid #fff;
.headerContent {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index d14fc65..6774927 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -134,6 +134,7 @@
@change="selectChange"
>
<el-option
+ popper-class="funs-select"
v-for="item in options"
:key="item.value"
:label="item.label"
@@ -485,7 +486,7 @@
// background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
+ //border: 1px solid #fff;
.mainTitle {
line-height: 60px;
@@ -495,31 +496,37 @@
display: flex;
justify-content: space-between;
align-items: center;
- padding: 0 20px;
+ padding: 0;
.funs {
+
display: flex;
.funs-sp {
border: 1px solid #DCDFE6;
}
.funsItem {
+ background-color: transparent;
line-height: 28px;
display: flex;
align-items: center;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
-
.el-checkbox {
width: 80px;
padding: 0 10px;
}
-
.el-select {
width: 120px;
+ &::v-deep.el-input{
+ .el-input__inner{
+ background-color: transparent!important;
+ }
+ }
+ .funs-select{
+ background-color: transparent;
+ }
}
-
-
}
}
diff --git a/src/views/systemSetting/baseSetting/user/index.vue b/src/views/systemSetting/baseSetting/user/index.vue
index 67016b2..30cc3df 100644
--- a/src/views/systemSetting/baseSetting/user/index.vue
+++ b/src/views/systemSetting/baseSetting/user/index.vue
@@ -42,9 +42,10 @@
</script>
<style lang="scss" scoped>
.userList {
+ //height: 100%;
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
color: #4b9bb7;
- border: 1px solid #ccc;
+ border: 1px solid #ccc;
}
</style>
--
Gitblit v1.8.0