From da01bc263dc79e1726adaa1748708cc9555c97db Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 12 一月 2023 16:23:09 +0800
Subject: [PATCH] 2023/1/12 肖辉 修改userList高度
---
src/views/systemSetting/baseSetting/user/components/header/index.vue | 12 ----
src/views/systemSetting/baseSetting/user/components/main/index.vue | 89 +++++++++++++----------------
src/views/layout/components/Main/index.vue | 5 -
src/App.vue | 17 +----
4 files changed, 44 insertions(+), 79 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 42c056c..bfbe1c3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -49,9 +49,6 @@
};
</script>
<style lang="scss">
-.userList{
- //height: 100%;
-}
.el-select-dropdown__item {
height: 100% !important;
}
@@ -116,7 +113,6 @@
.el-dialog__body {
// background-color: #06122c;
}
-
.el-dialog__header {
display: flex;
align-items: center;
@@ -124,7 +120,6 @@
padding: 20px;
line-height: 60px;
}
-
.el-dialog__close {
width: 20px;
height: 20px;
@@ -137,10 +132,12 @@
#app {
.userList{
-
+ height: 100%;
+ overflow: auto;
}
.list{
-
+ height: 100%;
+ overflow: auto;
}
// 璁剧疆寮瑰嚭妗嗘牱寮�
.el-dialog__title {
@@ -151,28 +148,22 @@
background-color: #DCDFE6;
//border: 1px solid #DCDFE6;
}
-
// 璁剧疆table鏍峰紡
.el-table__empty-block {
// background-color: #09152f;
}
-
.el-table__empty-block {
color: #4b9bb7;
}
-
.el-table__empty-text {
color: #4b9bb7;
}
-
.el-table .warning-row {
// background: #06122c;
}
-
.el-table .success-row {
// background: #071f39;
}
-
.el-input__inner {
// background-color: #09152f;
// border: 1px solid #17324c;
diff --git a/src/views/layout/components/Main/index.vue b/src/views/layout/components/Main/index.vue
index 11c45ae..fbb21be 100644
--- a/src/views/layout/components/Main/index.vue
+++ b/src/views/layout/components/Main/index.vue
@@ -348,7 +348,6 @@
.el-main {
min-width: 1024px;
padding: 0;
-
.content {
padding: 11px;
height: 100%;
@@ -356,11 +355,8 @@
.page-nav {
padding: 40px 100px;
text-align: left;
-
.nav-item {
line-height: 60px;
-
-
.nav-title {
color: #4178FE;
display: flex;
@@ -416,7 +412,6 @@
transform: none;
}
}
-
}
}
}
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index f4608d8..74e0514 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -56,54 +56,42 @@
header {
// background-color: #09152f;
//border: 1px solid #fff;
-
.headerContent {
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: #409EFF;
border: none;
padding: 12px 30px;
}
-
-
}
}
</style>
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index 6774927..e94c147 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -118,46 +118,46 @@
</el-dialog>
<!-- tools -->
<div class="tools">
- <div class="funs">
- <div class="funsItem funs-sp">
- <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
- </div>
- <div class="funsItem funs-sp">
- <el-checkbox v-model="unsame" @change="disSame(tableData)"
- >鍙嶉��</el-checkbox
- >
- </div>
- <div class="funsItem">
- <el-select
- v-model="myIdx"
- placeholder="鎵归噺鎿嶄綔"
- @change="selectChange"
- >
- <el-option
- popper-class="funs-select"
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- :disabled="item.disabled"
- >
- </el-option>
- </el-select>
- </div>
- </div>
- <div class="pagination">
- <el-pagination
- background
- :current-page="currentPage"
- layout="prev, pager, next"
- :total="totalNum"
- :page-size="pageSize"
- @current-change="changeCurrentPage"
- @prev-click="handlePrev"
- @next-click="handleNext"
- >
- </el-pagination>
- </div>
+ <div class="funs">
+ <div class="funsItem funs-sp">
+ <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ </div>
+ <div class="funsItem funs-sp">
+ <el-checkbox v-model="unsame" @change="disSame(tableData)"
+ >鍙嶉��</el-checkbox
+ >
+ </div>
+ <div class="funsItem">
+ <el-select
+ v-model="myIdx"
+ placeholder="鎵归噺鎿嶄綔"
+ @change="selectChange"
+ >
+ <el-option
+ popper-class="funs-select"
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ :disabled="item.disabled"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="pagination">
+ <el-pagination
+ background
+ :current-page="currentPage"
+ layout="prev, pager, next"
+ :total="totalNum"
+ :page-size="pageSize"
+ @current-change="changeCurrentPage"
+ @prev-click="handlePrev"
+ @next-click="handleNext"
+ >
+ </el-pagination>
+ </div>
</div>
</div>
</main>
@@ -487,19 +487,15 @@
margin-top: 20px;
padding-bottom: 50px;
//border: 1px solid #fff;
-
.mainTitle {
line-height: 60px;
}
-
.tools {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0;
-
.funs {
-
display: flex;
.funs-sp {
border: 1px solid #DCDFE6;
@@ -529,13 +525,11 @@
}
}
}
-
.pagination {
margin-top: 50px;
display: flex;
line-height: 50px;
justify-content: center;
-
.el-pagination {
&::v-deep li,
&::v-deep .btn-prev,
@@ -543,7 +537,6 @@
// background-color: #071f39;
// color: #4b9bb7;
}
-
&::v-deep .active {
background-color: #409eff;
color: #fff;
@@ -551,7 +544,6 @@
}
}
}
-
.el-table {
// color: #4b9bb7;
// font-size: 10px;
@@ -561,7 +553,6 @@
.line {
padding: 0 1px;
}
-
span:hover {
cursor: pointer;
}
--
Gitblit v1.8.0