Merge branch 'dev-新版ui' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-新版ui

src/router/index.js

@@ -169,6 +169,22 @@ function cookApiDataItem2(item) {
   }
   return item;
 }
+// 把父级拼到子集
+function cookApiDataItem3(item, parent = []) {
+  item.parent = parent;
+  let { children } = item;
+  if (children && Array.isArray(children) && children.length > 0) {
+    item.children = children.map((val) =>
+      cookApiDataItem3(val, [
+        ...parent,
+        {
+          title: item.name || "",
+        },
+      ])
+    );
+  }
+  return item;
+}
 
 // 模块路由(基于主入口布局页面) 可视化数据
 export const moduleShujuRoutes = {
@@ -176,7 +192,7 @@ export const moduleShujuRoutes = {
   component: () => import("@/views/main-shuju/main"),
   name: "main-shuju",
   redirect: {
-    path:"/main-shuju/visual-basicinfo-basicInfoMain",
+    path: "/main-shuju/visual-basicinfo-basicInfoMain",
   },
   meta: {
     title: "主入口布局",
@@ -314,6 +330,7 @@ router.beforeEach((to, from, next) => {
         });
       }
       window.SITE_CONFIG["menuList"] = res.data
+        .map((item) => cookApiDataItem3(item))
         .map((item) => cookApiDataItem2(item))
         .map((item) => cookApiDataItem(item));
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);
@@ -370,6 +387,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
         menuId: menuList[i].id,
         title: menuList[i].name,
         btns: menuList[i].btns || [],
+        parent: menuList[i].parent || [],
       },
     };
     // eslint-disable-next-line

src/views/main-content.vue

@@ -58,15 +58,21 @@
     <template v-else>
       <div class="g-cnt">
         <div class="m-crumb">
-          <div class="item">
+          <div
-            杀杀杀
+            class="item"
+            :key="'crumb' + item.title"
+            v-for="item in $route.meta.parent || []"
+          >
+            {{ item.title }}
             <i class="el-icon-arrow-right"></i>
           </div>
-          <div class="item">嘻嘻嘻</div>
+          <div class="item z-on">{{ $route.meta.title }}</div>
+        </div>
+        <div class="g-cnt-wrap">
+          <keep-alive>
+            <router-view />
+          </keep-alive>
         </div>
-        <keep-alive>
-          <router-view />
-        </keep-alive>
       </div>
     </template>
 
@@ -312,6 +318,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "~@/assets/scss/c/function.scss";
+
 .aui-content {
   position: relative;
   // height: calc(100vh -50px) !important;
@@ -353,5 +361,13 @@ export default {
       }
     }
   }
+
+  .g-cnt-wrap {
+    position: relative;
+    padding: 8px;
+    min-height: calc(100vh - 121px);
+    // overflow-y: auto;
+    // @include scrollBar;
+  }
 }
 </style>

src/views/main-navbar.vue

@@ -162,6 +162,8 @@ export default {
       this.$store.state.LevelOneMenuActiveName = menuId;
       this.$store.state.sidebarActiveSubMenuList =
         this.$store.state.sidebarMenuList[idx].children || [];
+      console.log("this.$store.state", this.$store.state);
+      console.log("this.$route", this.$route);
     },
     changeCustomerName(customerName) {
       this.customerName =