From 076a425a64e01b6e24ebde8fb1902fae17ee2797 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:25:56 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/baseSetting/role/index.vue | 96 +++++++++++++++++-------------------------------
1 files changed, 34 insertions(+), 62 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 0f25179..71503ec 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -22,7 +22,7 @@
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :header-cell-style="{'font-size':'14px','font-weight':'650','line-height':'45px'}"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
@@ -56,13 +56,13 @@
</el-table>
<!-- 淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
- v-if="dialogUpdate" :before-close="handleClose">
+ v-if="dialogUpdate" >
<updateUser :updateFlag="updateFlag" :userInfo=userInfo
:getRoleList=" context ? getRoleList : getRoleList" @changeDialog="changeDialog" />
</el-dialog>
<!-- 鏌ョ湅椤甸潰 -->
<el-dialog :visible.sync="dialogView" width="45%" title="鏌ョ湅瑙掕壊淇℃伅" v-if="dialogView"
- :before-close="handleClose">
+ >
<MyView :userInfo=userInfo @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
@@ -358,11 +358,11 @@
.userList {
text-align: left;
margin: 10px 20px;
- color: #4b9bb7;
+ // color: #4b9bb7;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ // background-color: #09152f;
+ // border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -381,11 +381,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;
}
}
@@ -414,10 +414,10 @@
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
+ // border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
@@ -429,7 +429,7 @@
align-items: center;
padding: 0 20px;
.funs-sp{
- border: 1px solid #17324c;
+ // border: 1px solid #17324c;
}
.funs {
display: flex;
@@ -451,18 +451,18 @@
width: 120px;
}
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
+ // &::v-deep .el-input__inner {
+ // border: none;
+ // background-color: #09152f;
+ // }
- &:hover {
- border: 1px solid #4b9bb7;
- }
+ // &:hover {
+ // border: 1px solid #4b9bb7;
+ // }
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
+ // &:hover .el-checkbox {
+ // color: #4b9bb7;
+ // }
}
}
@@ -475,24 +475,24 @@
.el-pagination {
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
+ // &::v-deep li,
+ // &::v-deep .btn-prev,
+ // &::v-deep .btn-next {
+ // background-color: #071f39;
+ // color: #4b9bb7;
+ // }
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
+ // &::v-deep .active {
+ // background-color: #409eff;
+ // color: #fff;
+ // }
}
}
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
.operation {
display: flex;
@@ -507,34 +507,6 @@
}
}
- // &::v-deep .switchStyle .el-switch__label {
- // position: absolute;
- // display: none;
- // color: #fff;
- // }
-
- // &::v-deep .el-switch__core {
- // background-color: rgba(166, 166, 166, 1);
- // }
-
- // &::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: 50px !important;
- // }
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0