From 3c1d55fe67cf436de36fd2e7ddc057e26b7a89c9 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 19 五月 2023 15:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/Home.vue |   56 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index aa58ab5..342d92e 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -21,20 +21,26 @@
                  :collapse-transition="false"
                  router
                  unique-opene>
-          <el-submenu index="/workbench">
+<!--          <el-submenu index="/workbench">-->
+<!--            <template slot="title">-->
+<!--              &lt;!&ndash; 鍥炬爣 &ndash;&gt;-->
+<!--              <i class="el-icon-s-platform"></i>-->
+<!--              &lt;!&ndash; 鏂囨湰 &ndash;&gt;-->
+<!--              <span>宸ヤ綔鍙�</span>-->
+<!--            </template>-->
+<!--            <el-menu-item index="/">-->
+<!--              <template slot="title">-->
+<!--                <i class="el-icon-menu"></i>-->
+<!--                <span>宸ヤ綔鍙�</span>-->
+<!--              </template>-->
+<!--            </el-menu-item>-->
+<!--          </el-submenu>-->
+          <el-menu-item index="/workbench">
             <template slot="title">
-              <!-- 鍥炬爣 -->
-              <i class="el-icon-s-platform"></i>
-              <!-- 鏂囨湰 -->
+              <i class="el-icon-menu"></i>
               <span>宸ヤ綔鍙�</span>
             </template>
-            <el-menu-item index="/">
-              <template slot="title">
-                <i class="el-icon-menu"></i>
-                <span>宸ヤ綔鍙�</span>
-              </template>
-            </el-menu-item>
-          </el-submenu>
+          </el-menu-item>
           <el-submenu index="/cause">
             <template slot="title">
               <i class="el-icon-notebook-1"></i>
@@ -76,18 +82,24 @@
                 <span>鍏叡瀹ｄ紶</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="/question">
+            <el-menu-item index="/announcement">
               <template slot="title">
                 <i class="el-icon-menu"></i>
-                <span>甯歌闂</span>
+                <span>璀︽柟鍏憡</span>
               </template>
             </el-menu-item>
-            <el-menu-item index="/sensitive">
-              <template slot="title">
-                <i class="el-icon-menu"></i>
-                <span>鏁忔劅璇�</span>
-              </template>
-            </el-menu-item>
+<!--            <el-menu-item index="/question">-->
+<!--              <template slot="title">-->
+<!--                <i class="el-icon-menu"></i>-->
+<!--                <span>甯歌闂</span>-->
+<!--              </template>-->
+<!--            </el-menu-item>-->
+<!--            <el-menu-item index="/sensitive">-->
+<!--              <template slot="title">-->
+<!--                <i class="el-icon-menu"></i>-->
+<!--                <span>鏁忔劅璇�</span>-->
+<!--              </template>-->
+<!--            </el-menu-item>-->
           </el-submenu>
           <el-submenu index="/manager">
             <template slot="title">
@@ -110,9 +122,11 @@
         </el-menu>
       </el-aside>
       <!-- 鍙充晶鍐呭涓婚 -->
-      <el-main>
+      <el-main style="background-color: #F5FAFF">
         <router-view></router-view>
+<!--        <div style="position: absolute;bottom: 0;right: 50%;color: #ccc">褰撳墠鐗堟湰 v2.1.3</div>-->
       </el-main>
+
     </el-container>
   </el-container>
 </template>
@@ -174,7 +188,7 @@
 }
 
 .el-main {
-  
+
 }
 
 .iconfont {

--
Gitblit v1.8.0