From c24a5a2a99515b365ebc343b04538bb862790de1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十二月 2023 11:44:22 +0800
Subject: [PATCH] Merge branch 'feature-code-refactoring' and 'feature-002'
---
src/components/layout/AppAside.vue | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/components/layout/AppAside.vue b/src/components/layout/AppAside.vue
index af923ae..60e0343 100644
--- a/src/components/layout/AppAside.vue
+++ b/src/components/layout/AppAside.vue
@@ -55,7 +55,6 @@
</el-link>
</el-row>
- <!-- <hr/> -->
<div class="horizontal-line"></div>
<el-scrollbar :height="menuHeight">
@@ -65,36 +64,33 @@
<span class="parent-title">椋庨櫓璇勪及</span>
</template>
<!-- 鏈�変腑 -->
- <el-menu-item index="avgDay" v-show="menu[0].avalue" @click="changeIcon(0)" >
+ <el-menu-item index="/avgDay" v-show="menu[0].avalue" @click="changeIcon(0)" >
<img src="@/assets/generalModel.png" height="23">
鏁版嵁椋庨櫓妯″瀷
</el-menu-item>
<!-- 鐏扮殑 -->
- <el-menu-item index="avgDay" v-show="!menu[0].avalue" @click="changeIcon(0)">
+ <el-menu-item index="/avgDay" v-show="!menu[0].avalue" @click="changeIcon(0)">
<img src="@/assets/generalModel2.png" height="23">
鏁版嵁椋庨櫓妯″瀷
</el-menu-item>
-
- <el-menu-item index="analysis" v-show="menu[1].avalue" @click="changeIcon(1)">
+ <el-menu-item index="/riskrank" v-show="menu[2].avalue" @click="changeIcon(2)">
<img src="@/assets/generalModel.png" height="23">
- 鏁版嵁鎺掑悕娓呭崟
+ 鏁版嵁椋庨櫓鎺掑悕
</el-menu-item>
- <el-menu-item index="analysis" v-show="!menu[1].avalue" @click="changeIcon(1)">
- <!-- <el-icon><i-ep-Stopwatch /></el-icon> -->
+ <el-menu-item index="/riskrank" v-show="!menu[2].avalue" @click="changeIcon(2)">
<img src="@/assets/generalModel2.png" height="23">
- 鏁版嵁鎺掑悕娓呭崟
- </el-menu-item>
-
- <el-menu-item index="riskrank" v-show="menu[2].avalue" @click="changeIcon(2)">
- <img src="@/assets/generalModel.png" height="23">
- 缁煎悎椋庨櫓鎺掑悕
- </el-menu-item>
- <el-menu-item index="riskrank" v-show="!menu[2].avalue" @click="changeIcon(2)">
- <img src="@/assets/generalModel2.png" height="23">
- 缁煎悎椋庨櫓鎺掑悕
+ 鏁版嵁椋庨櫓鎺掑悕
</el-menu-item>
+ <el-menu-item index="/analysis" v-show="menu[1].avalue" @click="changeIcon(1)">
+ <img src="@/assets/generalModel.png" height="23">
+ 鏁版嵁鎸囨爣鎺掑悕
+ </el-menu-item>
+ <el-menu-item index="/analysis" v-show="!menu[1].avalue" @click="changeIcon(1)">
+ <img src="@/assets/generalModel2.png" height="23">
+ 鏁版嵁鎸囨爣鎺掑悕
+ </el-menu-item>
</el-sub-menu>
@@ -103,21 +99,21 @@
<img src="@/assets/onlineInspection.png" height="23">
<span class="parent-title">绾夸笂宸℃</span>
</template>
- <el-menu-item index="edata" v-show="menu[3].avalue" @click="changeIcon(3)">
+ <el-menu-item index="/edata" v-show="menu[3].avalue" @click="changeIcon(3)">
<img src="@/assets/generalModel.png" height="23">
椋炶宸℃
</el-menu-item>
- <el-menu-item index="edata" v-show="!menu[3].avalue" @click="changeIcon(32)">
+ <el-menu-item index="/edata" v-show="!menu[3].avalue" @click="changeIcon(32)">
<img src="@/assets/generalModel2.png" height="23">
椋炶宸℃
</el-menu-item>
- <el-menu-item index="testData" v-show="menu[4].avalue" @click="changeIcon(4)">
+ <el-menu-item index="/testData" v-show="menu[4].avalue" @click="changeIcon(4)">
<img src="@/assets/generalModel.png" height="23">
绔欑偣瀹℃牳杈呭姪
</el-menu-item>
- <el-menu-item index="testData" v-show="!menu[4].avalue" @click="changeIcon(4)">
+ <el-menu-item index="/testData" v-show="!menu[4].avalue" @click="changeIcon(4)">
<img src="@/assets/generalModel2.png" height="23">
绔欑偣瀹℃牳杈呭姪
</el-menu-item>
@@ -131,19 +127,24 @@
</template>
- <el-menu-item index="hdata" v-show="menu[5].avalue" @click="changeIcon(5)">
+ <el-menu-item index="/hdata" v-show="menu[5].avalue" @click="changeIcon(5)">
<img src="@/assets/generalModel.png" height="23">
鍘嗗彶鏁版嵁绠＄悊
</el-menu-item>
- <el-menu-item index="hdata" v-show="!menu[5].avalue" @click="changeIcon(5)" >
+ <el-menu-item index="/hdata" v-show="!menu[5].avalue" @click="changeIcon(5)" >
<img src="@/assets/generalModel2.png" height="23">
鍘嗗彶鏁版嵁绠＄悊
</el-menu-item>
- <!-- <el-menu-item index="management" >
- <el-icon><i-ep-Histogram /></el-icon>
- 鏁版嵁鎺ュ叆绠＄悊
- </el-menu-item> -->
+ <el-menu-item index="/config" v-show="menu[6].avalue" @click="changeIcon(6)">
+ <img src="@/assets/generalModel.png" height="23">
+ 鍙傛暟閰嶇疆
+ </el-menu-item>
+
+ <el-menu-item index="/config" v-show="!menu[6].avalue" @click="changeIcon(6)">
+ <img src="@/assets/generalModel2.png" height="23">
+ 鍙傛暟閰嶇疆
+ </el-menu-item>
<!-- <el-menu-item index="report" >
@@ -171,7 +172,6 @@
</el-sub-menu> -->
</el-scrollbar>
-
</el-menu>
</el-aside>
</template>
@@ -189,10 +189,10 @@
width: 220px;
border-right: none;
&.el-menu--collapse {
- //渚ц竟鏍忔姌鍙犳椂鐨勬牱寮�
+ /* //渚ц竟鏍忔姌鍙犳椂鐨勬牱寮� */
width: 65px;
& .title-text {
- //鎶樺彔鏃堕殣钘廻1鏂囧瓧
+ /* //鎶樺彔鏃堕殣钘廻1鏂囧瓧 */
display: none;
}
& span {
@@ -255,6 +255,6 @@
right: 0;
height: 1px;
background-color: rgb(221, 217, 217,0.2);
- // width: 180px;
+ /* // width: 180px; */
}
</style>
--
Gitblit v1.9.3