合并trunk

layouts/default.vue

@@ -13,7 +13,7 @@
       <div class="y_default_start">
       <div class="y_default_start">
         <keep-alive>
         <keep-alive>
         <div class="main_left" :style="{height: clientHeight + 'px'}">
         <div class="main_left" :style="{height: clientHeight + 'px'}">
-          <el-menu
+          <el-menu router
       :default-active="item.name"
       :default-active="item.name"
       class="el-menu-vertical-demo"
       class="el-menu-vertical-demo"
       @open="handleOpen"
       @open="handleOpen"
@@ -23,7 +23,7 @@
                 <i class="el-icon-location"></i>
                 <i class="el-icon-location"></i>
                 <span>{{item.name}}</span>
                 <span>{{item.name}}</span>
               </template>
               </template>
-              <el-menu-item :index="sub.name" v-for="(sub, subIndex) in item.pageList">{{sub.name}}</el-menu-item>
+              <el-menu-item :class="$route.path===sub.path?'orderCtg_list_now':''" :index="sub.path" v-for="(sub, subIndex) in item.pageList">{{sub.name}}</el-menu-item>
             </el-submenu>
             </el-submenu>
           </el-menu>
           </el-menu>
         </div>
         </div>
@@ -270,12 +270,6 @@ export default {
       })
       })
 //    console.log(this.visitedViews)
 //    console.log(this.visitedViews)
     },
     },
-    entriesClick(item) {
-      this.$router.push({
-        path: item.pagePath
-      })
-      console.log(this.visitedViews)
-    },
     // 获取窗口可视范围的高度
     // 获取窗口可视范围的高度
     getClientHeight() {
     getClientHeight() {
 //    let clientHeight = 0
 //    let clientHeight = 0
@@ -389,9 +383,10 @@ export default {
   background: #E8E9EE;
   background: #E8E9EE;
   width: 100%;
   width: 100%;
   z-index: 1;
   z-index: 1;
-  height: 21px;
+  height: 31px;
   position: relative;
   position: relative;
   padding: 5px 23px;
   padding: 5px 23px;
+  box-sizing: border-box;
 }
 }
 .crumbs_list{
 .crumbs_list{
   background: #FFFFFF;
   background: #FFFFFF;
@@ -427,10 +422,12 @@ export default {
   margin-bottom: 4px;
   margin-bottom: 4px;
   cursor: pointer;  
   cursor: pointer;  
 }
 }
-.orderCtg_txt .orderCtg_list_now{
-  color: #C01E00;
+.el-menu-item.is-active {
+  color: #303133;
+}
+.orderCtg_list_now{
+  color: #C01E00!important;
   position: relative;
   position: relative;
-  min-height: ;
 }
 }
 .contextmenu {
 .contextmenu {
   margin: 0;
   margin: 0;
@@ -464,4 +461,7 @@ export default {
   bottom: 0px;
   bottom: 0px;
   right: 0px;
   right: 0px;
 }
 }
+.el-menu{
+  transition: all 0s!important;
+}
 </style>
 </style>