From a8532e35b1a39de9bbcc5f2a648fe02c72d9c2b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 二月 2023 14:09:53 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/baseSetting/department/updateUser/index.vue | 15 +++++--
src/views/layout/components/Menu/index.vue | 70 ++++++++++++++++++++++++-----------
2 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index f7208f3..3e009d6 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -28,6 +28,7 @@
v-if="secondMenu.menuVoArrayList.length > 0"
:index="secondMenu.url ? secondMenu.url : secondMenu.id.toString()"
class="secondMenu"
+ :class="secondMenu.menuVoArrayList.length > 0?'is-Active':'none-Active'"
>
<template slot="title">
<span class="secondSpan">{{ secondMenu.title }}</span>
@@ -111,14 +112,12 @@
height: 36px;
}
}
-
.el-aside {
background: #313350;
color: #e9eef3;
text-align: center;
box-sizing: border-box;
position: relative;
-
// 鍥哄畾鏍囬
.siderbar-title {
position: fixed;
@@ -132,59 +131,87 @@
z-index: 999;
cursor: pointer;
}
-
.el-scrollbar {
height: calc(100vh - 66px);
margin-top: 66px;
box-sizing: border-box;
-
.el-menu {
background: linear-gradient(#313350, #0f2b56);
border: 0;
-
+ font-size: 16px;
+ .is-opened{
+ .fisrtSpan{
+ color: #22d3eb;
+ }
+ }
.firstMenu {
background: #313350;
text-align: left;
-
+ //border-bottom:1px solid #ccc ;
&:hover > .el-submenu__title {
background-color: #092c4a;
}
-
&:hover .fisrtSpan {
color: #22d3eb;
}
-
span,
span {
color: #e9eef3;
+ font-size: 16px;
}
-
+ .el-menu{
+ .is-active {
+ background-color: #409EFF;
+ color: #fff;
+ }
+ .is-Active{
+ background-color: #092c4a;
+ color: #fff;
+ }
+ }
.el-menu-item {
color: #e9eef3;
background-color: #313350;
+ font-size: 16px;
+ border-bottom: 1px solid #ccc;
}
-
.el-menu-item:hover {
background-color: #409EFF;
color: #22d3eb;
}
+ .is-opened{
+ .secondSpan{
+ color: #22d3eb;
+ }
+ }
+ .secondMenu{
+ //border-bottom:1px solid #ccc ;
+ .is-active {
+ background-color: #409EFF;
+ color: #22d3eb;
+ }
+ }
+ }
+ .secondMenu {
+ &:hover > .el-submenu__title {
+ background-color: #092c4a;
+ }
+ .secondSpan{
+ }
+ &:hover .secondSpan {
+ color: #22d3eb;
+ }
+ .is-opened{
+ .el-submenu__title{
+ background-color: #fff;
+ }
+ }
.is-active {
background-color: #409EFF;
color: #fff;
}
}
-
- .secondMenu {
- &:hover > .el-submenu__title {
- background-color: #092c4a;
- }
-
- &:hover .secondSpan {
- color: #22d3eb;
- }
- }
-
.thirdMenu {
&:hover > .el-submenu__title {
background-color: #092c4a;
@@ -199,7 +226,6 @@
background-color: #092c4a;
}
}
-
.el-scrollbar__wrap {
overflow-x: hidden;
}
diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 82bd250..17e8f24 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -33,7 +33,7 @@
item.leader ? 'leader' : '',
]"></i>
</div>
- <label style="font-size: 12px" :class="[item.leader ? 'leader' : '']">{{ item.username }}</label>
+ <label style="font-size: 12px" :class="[item.leader ? 'leader' : 'theMasses']">{{ item.username }}</label>
</div>
</li>
<li class="li-btn" v-if="updateFlag">
@@ -50,7 +50,7 @@
<el-card class="box-card">
<div slot="header" class="myclear">
<span>宸ヤ綔浜哄憳</span>
- <div @click="addUser">纭</div>
+ <div class="department-sub" @click="addUser">纭</div>
</div>
<div class="scrollWrap">
<el-checkbox-group v-model="checkedUser">
@@ -225,7 +225,7 @@
}
});
});
- this.checkedList[0].leader = true;
+ // this.checkedList[0].leader = true;
console.log(this.checkedList);
this.openUser = false;
},
@@ -370,6 +370,11 @@
color: #4b9bb7;
display: flex;
justify-content: space-between;
+ .department-sub{
+ cursor: pointer;
+ margin-left: 5px;
+ color: #2f54eb;
+ }
}
.hidebar {
@@ -390,7 +395,9 @@
.leader {
color: red;
}
-
+.theMasses{
+ color: #2f54eb;
+}
.el-input {
width: 280px !important;
}
--
Gitblit v1.8.0