From c889c9e4792506e0a7f457560c0d4110645fae93 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 26 十月 2022 09:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/layout/components/Menu/index.vue |   66 ++++++++++++++-------------------
 1 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index 9dc05a4..7a0c60f 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -5,7 +5,7 @@
       <h2 class="siderbar-title">閬傛槍鎵ф硶骞冲彴</h2>
       <el-scrollbar>
         <!-- 璺敱 -->
-        <el-menu router class="el-menu-vertical" :default-active="$route.path">
+        <el-menu router class="el-menu-vertical" :default-active="$route.path" >
           <!-- 绯荤粺璁剧疆妯″潡 -->
           <el-submenu index="/home/system" class="firstMenu">
             <template slot="title">
@@ -16,51 +16,34 @@
               <span class="fisrtSpan">绯荤粺璁剧疆</span>
             </template>
             <!-- 鍩烘湰璁剧疆 -->
-            <el-submenu index="/home/system/base" class="secondMenu">
+            <el-submenu index="/home/system/userSetting" class="secondMenu">
               <template slot="title">
                 <span class="secondSpan">鍩烘湰璁剧疆</span>
               </template>
               <!-- 鐢ㄦ埛绠$悊 -->
-              <el-menu-item index="/home/system/user">鐢ㄦ埛绠$悊</el-menu-item>
-              <!-- <el-submenu index="/home/system/base/user" class="thirdMenu">
-                <template slot="title">
-                  <span class="thirdSpan">鐢ㄦ埛绠$悊</span>
-                </template>
-                <el-menu-item index="/home/system/user">鐢ㄦ埛鍒楄〃</el-menu-item>
-              </el-submenu> -->
+              <el-menu-item index="/home/system/userSetting/user">鐢ㄦ埛绠$悊</el-menu-item>
               <!-- 瑙掕壊绠$悊 -->
-              <el-menu-item index="/home/system/role">瑙掕壊绠$悊</el-menu-item>
-              <!-- <el-submenu index="/home/system/base/role" class="thirdMenu">
-                <template slot="title">
-                  <span class="thirdSpan">瑙掕壊绠$悊</span>
-                </template>
-                <el-menu-item index="/home/system/role">瑙掕壊绠$悊鍒楄〃</el-menu-item>
-              </el-submenu> -->
-              <!-- 鏉冮檺绠$悊 -->
-              <!-- <el-menu-item index="/home/system/authority">鏉冮檺绠$悊</el-menu-item> -->
-              <!-- <el-submenu index="/home/system/base/authority" class="thirdMenu">
-                <template slot="title">
-                  <span class="thirdSpan">鏉冮檺绠$悊</span>
-                </template>
-                <el-menu-item index="/home/system/authority">璁剧疆鏉冮檺</el-menu-item>
-              </el-submenu> -->
+              <el-menu-item index="/home/system/userSetting/role">瑙掕壊绠$悊</el-menu-item>
               <!-- 閮ㄩ棬绠$悊 -->
-              <el-menu-item index="/home/system/department">閮ㄩ棬绠$悊</el-menu-item>
-              <!-- <el-submenu index="/home/system/base/department" class="thirdMenu">
-                <template slot="title">
-                  <span class="thirdSpan">閮ㄩ棬绠$悊</span>
-                </template>
-                <el-menu-item index="/home/system/department">閮ㄩ棬绠$悊</el-menu-item>
-              </el-submenu> -->
+              <el-menu-item index="/home/system/userSetting/department">閮ㄩ棬绠$悊</el-menu-item>
             </el-submenu>
             <!-- 骞冲彴璁剧疆 -->
-            <el-submenu index="/home/operate/add" class="secondMenu">
+            <el-submenu index="/home/system/platform" class="secondMenu">
               <template slot="title">
                 <span class="secondSpan">闂ㄦ埛绠$悊</span>
               </template>
-              <el-menu-item index="/home/system/mySetting">鑷畾涔夎彍鍗�</el-menu-item>
-              <el-menu-item index="/home/system/portalSetting">logo绠$悊</el-menu-item>
-              <el-menu-item index="/home/system/otherInterface">绗笁鏂规帴鍙g鐞�</el-menu-item>
+              <el-menu-item index="/home/system/platform/mySetting">鑷畾涔夎彍鍗�</el-menu-item>
+              <el-menu-item index="/home/system/platform/portalSetting">logo绠$悊</el-menu-item>
+              <el-menu-item index="/home/system/platform/otherInterface">绗笁鏂规帴鍙g鐞�</el-menu-item>
+            </el-submenu>
+            <!-- 璁惧绠$悊 -->
+            <el-submenu index="/home/system/device" class="secondMenu">
+              <template slot="title">
+                <span class="secondSpan">璁惧绠$悊</span>
+              </template>
+              <el-menu-item index="/home/system/device/bayonet">鍗″彛璁惧绠$悊</el-menu-item>
+              <el-menu-item index="/home/system/device/point">鐐逛綅绠$悊</el-menu-item>
+              <el-menu-item index="/home/system/device/grid">缃戞牸绠$悊</el-menu-item>
             </el-submenu>
           </el-submenu>
           <!-- 杩愯惀绠$悊妯″潡 -->
@@ -77,7 +60,7 @@
               </template>
               <el-menu-item index="/home/operate/baseSetting/violation">杩濊浜嬮」璁剧疆</el-menu-item>
               <el-menu-item index="/home/operate/baseSetting/illegalBuild">杩濆缓浜嬮」璁剧疆</el-menu-item>
-              <el-menu-item index="/home/operate/baseSetting/threepack">闂ㄥ墠涓夊寘璁剧疆</el-menu-item>
+              <!-- <el-menu-item index="/home/operate/baseSetting/threepack">闂ㄥ墠涓夊寘璁剧疆</el-menu-item> -->
             </el-submenu>
             <el-submenu index="/home/operate/disposal" class="secondMenu">
               <template slot="title">
@@ -89,7 +72,14 @@
               <el-menu-item index="/home/operate/casepool/learn">鍐嶅涔犵鐞�</el-menu-item>
               <el-menu-item index="/home/operate/casepool/notDeal">鏆備笉澶勭悊</el-menu-item>
             </el-submenu>
-            <el-menu-item index="/home/operate/management">瀹℃牳绠$悊</el-menu-item>
+            <el-submenu index="/home/operate/management" class="secondMenu">
+              <template slot="title">
+                <span class="secondSpan">瀹℃牳绠$悊</span>
+              </template>
+              <el-menu-item index="/home/operate/management">瀹℃牳绠$悊</el-menu-item>
+              <el-menu-item index="/home/operate/management/managementMessage">鐭俊瀹℃牳绠$悊</el-menu-item>
+              <!-- <el-menu-item index="/home/operate/baseSetting/threepack">闂ㄥ墠涓夊寘璁剧疆</el-menu-item> -->
+            </el-submenu>
             <el-menu-item index="/home/operate/myWait">鎴戠殑寰呭姙</el-menu-item>
             <el-submenu index="/home/operate/rectification" class="secondMenu">
               <template slot="title">
@@ -127,7 +117,7 @@
               <el-menu-item index="/home/operate/message/mycontrol">鏍忕洰绠$悊</el-menu-item>
             </el-submenu>
             <el-menu-item index="/home/operate">鐭俊绠$悊</el-menu-item>
-            <el-menu-item index="/home/operate">鏃ュ織绠$悊</el-menu-item>
+            <el-menu-item index="/home/operate/log">鏃ュ織绠$悊</el-menu-item>
           </el-submenu>
           <!-- 瑙嗛宸℃煡妯″潡 -->
           <el-submenu index="/home/video" class="firstMenu">

--
Gitblit v1.8.0