Merge branch 'code_recover'

src/config/setting.js

@@ -5,7 +5,7 @@ export default {
   g_logo: require('@/assets/img/home/logo.png'), //主页菜单栏logo
   g_mini_logo: require('@/assets/img/home/eta_mini.png'), //主页菜单栏mini-logo
   theme_color: '',
-  menu_bg:'#000',//菜单栏背景色
+  menu_bg:'#FFFFFF',//菜单栏背景色
   login_title: '',//登录页标题
   login_logo: require('@/assets/img/home/login_logo.png'),//登录页logo
   login_bg: require('@/assets/img/login_bg.png')

src/views/Home.vue

@@ -7,13 +7,13 @@
           <img
             class="logo"
             v-if="!isCollapse"
-            :src="!isTrail?global.g_logo:$setting.g_logo"
+            :src="isTrail?global.g_logo:$setting.g_logo"
           />
           <!-- 折叠侧边栏logo尺寸 -->
           <img
             class="logo_coll"
             v-else
-            :src="!isTrail?global.g_mini_logo:$setting.g_mini_logo"
+            :src="isTrail?global.g_mini_logo:$setting.g_mini_logo"
           />
         </div>
         <div
@@ -22,9 +22,8 @@
         >
           <aside class="menu-expanded">
             <!--导航菜单-->
-            <!-- :background-color="isTrail?global.menu_bg:$setting.menu_bg" -->
             <el-menu
-              :background-color="$setting.menu_bg"
+              :background-color="isTrail?global.menu_bg:$setting.menu_bg"
               text-color="#333"
               :collapse-transition="false"
               :active-text-color="$setting.theme_color"
@@ -702,7 +701,7 @@ export default {
       // });
       // window.open(href, "_blank");
       //打开帮助文档
-      const href = `${process.env.VUE_APP_ETA_HELP_DOCS}?bus_code=${this.bus_code}`
+      const href = `${process.env.VUE_APP_ETA_HELP_DOCS}?bus_code=${this.$store.state.businessCode}`
       // console.log(href);
       // const href = `http://192.168.77.13:3033/help/index?bus_code=${this.bus_code}`
       window.open(href, "_blank");
@@ -800,7 +799,7 @@ export default {
     },
     toDoc(){
       //打开更新日志项目
-      const href = `${process.env.VUE_APP_ETA_DOCS}?bus_code=${this.bus_code}`
+      const href = `${process.env.VUE_APP_ETA_DOCS}?bus_code=${this.$store.state.businessCode}`
       window.open(href, "_blank");
     },
     collapseHandle () {