From 48f9dcd9056c558c638ab10836df7d41dae1e3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 9 Aug 2023 09:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=8F=9C=E5=8D=95+=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=8F=9C=E5=8D=95+api=E6=96=B0=E5=A2=9E=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86+logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addEditFromApiPop/index.vue    |  6 +-
 .../Fe/src/layout/components/Sidebar/Logo.vue |  5 +-
 Code/Fe/src/router/index.js                   | 20 ++++++-
 Code/Fe/src/store/modules/permission.js       | 17 +++---
 Code/Fe/src/views/demo/demo_api_handle.vue    |  1 +
 Code/Fe/src/views/menuAll/index.vue           | 60 +++++++++++++++++++
 6 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 Code/Fe/src/views/menuAll/index.vue

diff --git a/Code/Fe/src/components/addEditFromApiPop/index.vue b/Code/Fe/src/components/addEditFromApiPop/index.vue
index 566b887..bac7a2f 100644
--- a/Code/Fe/src/components/addEditFromApiPop/index.vue
+++ b/Code/Fe/src/components/addEditFromApiPop/index.vue
@@ -145,13 +145,11 @@
 <script>
 import { ApiTypePost, ApiTypePut } from "@/api/wms-api"
 import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { tableMixins } from "@/mixins/TableMixins"
 import currenTableFlex from "@/components/currenTableFlex"
 import * as allUrlOption from '@/utils/baseData/urlOption'
-import { timeAgo } from "@/filters";
 export default {
   name:"addEditFromApiPop",
-  mixins:[ LoadingMixins,tableMixins ],
+  mixins:[ LoadingMixins ],
   components: { currenTableFlex },
   props: {
     // 编辑行数据
@@ -315,7 +313,7 @@ export default {
       this.close()
       if(this.active == '1')this.oldSkipCount = 1;
       this.show = false
-      this.paging()
+      this.$emit("exitAfterHandle")
       this.$nextTick(()=>{
         this.active = 0
       })
diff --git a/Code/Fe/src/layout/components/Sidebar/Logo.vue b/Code/Fe/src/layout/components/Sidebar/Logo.vue
index d8034af..b79cbbf 100644
--- a/Code/Fe/src/layout/components/Sidebar/Logo.vue
+++ b/Code/Fe/src/layout/components/Sidebar/Logo.vue
@@ -25,8 +25,9 @@ export default {
   },
   data() {
     return {
-      title: '一汽富维东阳',
-      logo: logo
+      title: 'QAD&WMS',
+      // logo: logo
+      logo: null
     }
   }
 }
diff --git a/Code/Fe/src/router/index.js b/Code/Fe/src/router/index.js
index c1b33ea..eb7bdc3 100644
--- a/Code/Fe/src/router/index.js
+++ b/Code/Fe/src/router/index.js
@@ -78,7 +78,25 @@ export let constantRoutes = [
         // affix: true
       }
     }]
-  }, 
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/menuAll',
+    hidden: true,
+    children: [{
+      path: 'menuAll',
+      component: () => import('@/views/menuAll/index'),
+      name: 'menuAll',
+      meta: {
+        keepAlive : true, 
+        title: 'menuAll',
+        icon: 'svg_dashboard',
+        outerFirst:true
+        // affix: true
+      }
+    }]
+  },  
 ]
 
 /**
diff --git a/Code/Fe/src/store/modules/permission.js b/Code/Fe/src/store/modules/permission.js
index d550b8a..1cbd7af 100644
--- a/Code/Fe/src/store/modules/permission.js
+++ b/Code/Fe/src/store/modules/permission.js
@@ -88,11 +88,13 @@ const mutations = {
  * @param data 后端返回的菜单数据
  */
 export function generaMenu(routes, data, first) {
+  // 不显示的菜单配置隐藏
+  let _noShowMenus = localStorage.getItem('menuHiddenConfig').split(',')
   data.forEach(item => {
     let _item = {
       path: '/'+item.name,
       component: loadView(item.name),
-      // hidden: item.status === 0, // 状态为0的隐藏
+      hidden: _noShowMenus.indexOf(item.name) >= 0, // 状态为0的隐藏
       name: item.name,
       // meta: item.meta
       meta: {
@@ -180,11 +182,6 @@ const actions = {
         }
         // 存储所有的表名
         commit('SET_TABLESNAME', _menuList)
-        // todo-new:接口获取 接口没有走配置文件
-        let _noShowMenus = null//不显示的菜单
-        _noShowMenus = localStorage.getItem('menuHiddenConfig').split(',')
-        // 去掉不显示的菜单后全部显示的菜单
-        let _showMenus = _noShowMenus && _noShowMenus.length > 0 ? _menuList.filter(item1 => !_noShowMenus.some(item2 => item2 === item1)) : _menuList
         // 数据模拟，todo-new:接口获取
         let _treeMenusAll = null//树形菜单
         // _treeMenusAll = [
@@ -237,13 +234,13 @@ const actions = {
         
         let _initTreeMenus = []
         if(_treeMenusAll && _treeMenusAll.length > 0){
-          _initTreeMenus = initTreeMenusHandle(_treeMenusAll,_showMenus,true)
+          _initTreeMenus = initTreeMenusHandle(_treeMenusAll,_menuList,true)
         }else{
           let _data = []
-          for(let i in _showMenus){
-            _data.push({name:_showMenus[i]})
+          for(let i in _menuList){
+            _data.push({name:_menuList[i]})
           }
-          _initTreeMenus = initTreeMenusHandle(_data,_showMenus,true)
+          _initTreeMenus = initTreeMenusHandle(_data,_menuList,true)
         }
         // 最后查重+层级查重后的菜单
         let _initEndMenus = generaMenu(asyncRoutes, _initTreeMenus,true)
diff --git a/Code/Fe/src/views/demo/demo_api_handle.vue b/Code/Fe/src/views/demo/demo_api_handle.vue
index 3cc2e1b..0f0cd00 100644
--- a/Code/Fe/src/views/demo/demo_api_handle.vue
+++ b/Code/Fe/src/views/demo/demo_api_handle.vue
@@ -62,6 +62,7 @@
       :handleType="addEditApiType"
       :editRowData="editFromApiRowData"
       @closePop="closeAddEditApiPop"
+      @exitAfterHandle="paging"
     ></addEditFromApiPop>
   </div>
 </template>
diff --git a/Code/Fe/src/views/menuAll/index.vue b/Code/Fe/src/views/menuAll/index.vue
new file mode 100644
index 0000000..72f061e
--- /dev/null
+++ b/Code/Fe/src/views/menuAll/index.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="dashboardPage">
+        <el-tree 
+            :data="navList" 
+            :props="defaultProps" 
+            @node-click="goPage"
+        ></el-tree>
+    </div>
+</template>
+    
+<script>
+import { mapGetters } from 'vuex'
+export default {
+    name: 'Dashboard',
+    data() {
+        return {
+            navList:[],
+            defaultProps: {
+                children: 'children',
+                label: 'title'
+            }
+        }
+    },
+    computed: {
+        ...mapGetters([
+            'permission_routes'
+        ])
+    },
+    mounted(){
+        this.initData(this.permission_routes)
+    },
+    methods:{
+        initData(data){
+            data.forEach(item => {
+                if(item.path !== '/' && item.meta) {
+                    let _item = {
+                        title:item.meta.title,
+                        name:item.name,
+                        path:item.path,
+                        children:item.children
+                    }
+                    this.navList.push(_item)
+                }
+                if(item.children){
+                    this.initData(item.children)
+                }
+            })
+        },
+        goPage(item){
+            this.$router.push({name: item.name}) 
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.dashboardPage{
+    padding:30px 10px;
+    background: #fff;
+}
+</style>
\ No newline at end of file