Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/assets/scss/main-shuju.scss

@@ -352,8 +352,12 @@ body {
           border-top: 1px dashed rgba(#fff, 0.4);
           color: rgba(#fff, 0.7);
           transition: all ease 0.5s;
+          &.z-on {
+            font-weight: bold;
+          }
+          &.z-on,
           &:hover {
-            color: #fff;
+            color: #ffd;
           }
         }
       }

src/views/main-shuju/main-navbar.vue

@@ -46,7 +46,9 @@
           <template v-for="(menu, idx) in $store.state.mainShuju.menuList">
             <li
               class="sub-menu"
-              :class="$store.state.mainShuju.activeName==menu.name ? 'z-on':''"
+              :class="
+                $store.state.mainShuju.activeName == menu.id ? 'z-on' : ''
+              "
               v-if="menu.children"
               :key="menu.id"
               @click="gotoRouteHandle(menu.id, idx)"
@@ -54,6 +56,11 @@
               <span>{{ menu.name }}</span>
               <div class="sub-menu-list">
                 <div
+                  :class="
+                    $store.state.mainShuju.activeName == subMenu.id
+                      ? 'z-on'
+                      : ''
+                  "
                   :key="subMenu.id"
                   @click="gotoRouteHandle(subMenu.id, subIndex)"
                   v-for="(subMenu, subIndex) in menu.children"
@@ -177,8 +184,8 @@ export default {
       )[0];
       if (route) {
         this.$router.push({ name: route.name });
-      }
         this.$store.state.mainShuju.activeName = menuId;
+      }
     },
     changeCustomerName(customerName) {
       this.customerName = localStorage.getItem("customerName");