From 74da138e28fcaaa3119d5c79500cc87b0d176a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 8 Sep 2023 15:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E3=80=91404=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=8F=8A404?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=EF=BC=8C=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/src/router/index.js         |  10 +-
 .../src/views/dashboard/index copy.vue        | 222 ------------------
 .../src/views/error-page/404.vue              |  23 +-
 PC/InterFace.Dash/src/views/menuAll/index.vue |  33 ++-
 4 files changed, 33 insertions(+), 255 deletions(-)
 delete mode 100644 PC/InterFace.Dash/src/views/dashboard/index copy.vue

diff --git a/PC/InterFace.Dash/src/router/index.js b/PC/InterFace.Dash/src/router/index.js
index f6b73a3..d566d78 100644
--- a/PC/InterFace.Dash/src/router/index.js
+++ b/PC/InterFace.Dash/src/router/index.js
@@ -145,11 +145,11 @@ export let constantRoutes = [
 export let asyncRoutes = [
   /** when your routing map is too long, you can split it into small modules **/
   // 404 page must be placed at the end !!!
-  // {
-  //   path: '*',
-  //   redirect: '/404',
-  //   hidden: true
-  // }
+  {
+    path: '*',
+    redirect: '/404',
+    hidden: true
+  }
 ]
 
 const createRouter = () => new Router({
diff --git a/PC/InterFace.Dash/src/views/dashboard/index copy.vue b/PC/InterFace.Dash/src/views/dashboard/index copy.vue
deleted file mode 100644
index cf7251a..0000000
--- a/PC/InterFace.Dash/src/views/dashboard/index copy.vue	
+++ /dev/null
@@ -1,222 +0,0 @@
-<template>
-    <!-- 瀑布流版本布局 + 高度随宽度调整变化 -->
-        <el-card class="homeMenuPage" v-resize="setMaxHeight" v-loading="loading">
-            <div class="firstMenuContain homeMenuPage-List">
-                <div 
-                    class="firstMenuItem menuItem" 
-                    v-for="(item,index) in navList"
-                    :key="index"
-                >   
-                    <div class="firstTitle" v-if="item.meta">
-                        <div class="icon"><svg-icon :icon-class="item.meta.icon" style="fill:currentColor; color:#fff;"/></div>
-                        <div>{{item.meta.title}}</div>
-                    </div>
-                    <ul class="menuInfo" v-if="item.children && item.children.length > 0">
-                        <li 
-                            v-for="(item2,index2) in item.children"
-                            :key="index2"
-                        >
-                            <div class="title">
-                                {{item2.meta.title}}
-                                <i class="el-icon-arrow-right"></i>
-                            </div>
-                            <!-- 有下级菜单 -->
-                            <div class="lastList" v-if="item2.children && item2.children.length > 0">
-                                <div 
-                                    v-for="(item3,index3) in item2.children" 
-                                    :key="index3"
-                                    class="item"
-                                >
-                                    <span @click="goPage(item3)">{{item3.meta.title}}</span>
-                                </div>
-                            </div>
-                            <!-- 如果二级为最后一级，统一格式，补充到children中 -->
-                            <div class="lastList" v-else>
-                                <div class="item">
-                                    <span @click="goPage(item2)">{{item2.meta.title}}</span>
-                                </div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-                <span class="firstMenuItem break"></span>
-                <span class="firstMenuItem break"></span>
-                <span class="firstMenuItem break"></span>
-            </div>
-        </el-card>
-    </template>
-    
-    <script>
-    import { mapGetters } from 'vuex'
-    export default {
-        directives: { 
-            // 页面宽度变化，重新计算总高度
-            resize: { // 指令的名称
-                bind(el, binding) { // el为绑定的元素，binding为绑定给指令的对象
-                    let width = '', height = '';
-                    function isReize() {
-                        const style = document.defaultView.getComputedStyle(el);
-                        if (width !== style.width || height !== style.height) {
-                            binding.value();  // 关键
-                        }
-                        width = style.width;
-                        height = style.height;
-                    }
-                    el.__vueSetInterval__ = setInterval(isReize, 300);
-                },
-                unbind(el) {
-                    clearInterval(el.__vueSetInterval__);
-                }
-            }
-         },
-        name: 'Dashboard',
-        data() {
-            return {
-                loading:true,
-                navList:[],
-            }
-        },
-        watch: {
-            permission_routes(val, oldVal) {
-                this.initData(val)
-            }
-        },
-        computed: {
-            ...mapGetters([
-                'permission_routes'
-            ])
-        },
-        mounted(){
-            console.log(90,this.permission_routes)
-            this.initData(this.permission_routes)
-        },
-        methods:{
-            initData(data){
-                data.forEach(item => {
-                    if(!item.hidden && item.path !== '/') {
-                        this.navList.push(item)
-                    }
-                })
-                this.$nextTick(()=>{
-                    this.setMaxHeight()
-                })
-            },
-            goPage(item){
-                this.$router.push({name: item.name}) 
-            },
-            setMaxHeight(){
-                // todo：用this.$route.path != /dashboard 判断
-                console.log("setMaxHeight",this.$route.path)
-                if(document.getElementsByClassName("homeMenuPage-List").length <= 0){
-                    return
-                }
-                let _items = document.getElementsByClassName("menuItem")
-                let _left = [];
-                let _right = [];
-                let _left_num = 0;
-                let _right_num = 0;
-                _items.forEach((item,key)=>{
-                    // 左侧
-                    if(key % 2 == 0){
-                        _left.push(item.offsetHeight)
-                        _left_num += Number(item.offsetHeight)
-                    }
-                    // 右侧
-                    else{
-                        _right.push(item.offsetHeight)
-                        _right_num += Number(item.offsetHeight)
-                    }
-                })
-                let _max =  _left_num > _right_num ? _left_num  : _right_num 
-                _max += 20 * _items.length
-                document.getElementsByClassName("homeMenuPage-List")[0].style.height = _max + 'px'
-                this.loading = false
-            }
-        }
-    }
-    </script>
-    <style lang="scss" scoped>
-    $iconSize:26px;
-    .homeMenuPage{
-        height: 100%;
-        overflow: auto;
-        // padding: 20px 0;
-    }
-    .firstMenuContain {
-        display: flex;
-        flex-flow: column wrap;
-        align-content: space-between;
-        /* 容器必须有固定高度
-        * 且高度大于最高的列高 */
-        // height: 2500px;
-        .firstMenuItem {
-            width: calc(50% - 20px);
-            margin-bottom: 20px;
-    
-            .firstTitle{
-                display: flex;
-                font-weight: bold;
-                font-size: 18px;
-                .icon{
-                    background: #409eff;
-                    color: #fff;
-                    border-radius: 4px;
-                    width: $iconSize;
-                    height: $iconSize;
-                    line-height: $iconSize;
-                    overflow: hidden;
-                    text-align: center;
-                    margin-right: 10px;
-                }
-            }
-    
-            .menuInfo{
-                background: #f9fafb;
-                margin: 20px 0;
-                padding: 5px 0;
-                li{
-                    list-style: none;
-                    display: flex;
-                    padding-top: 10px;
-                    .title{
-                        width: 240px;
-                        text-align: right;
-                        font-weight: bold;
-                        flex-shrink: 0;
-                        .el-icon-arrow-right{
-                            font-weight: bold;
-                            font-size: 14px;
-                        }
-                    }
-                    .lastList{
-                        display: flex;
-                        flex-wrap: wrap;
-                        margin-left: 15px;
-                        .item{
-                            margin-right: 25px;
-                            margin-bottom: 10px;
-                            cursor: pointer;
-    
-                            &:hover{
-                                color: #409eff;
-                            }
-                        }
-                    }
-                }
-            }
-    
-            /* 将内容块重排为4列 */
-            &:nth-of-type(2n+1) { order: 1; }
-            &:nth-of-type(2n)   { order: 2; }
-    
-            /* 强制换列 */
-            &.break {
-                flex-basis: 100%;
-                width: 0;
-                margin: 0;
-                content: "";
-                padding: 0;
-            }
-        }
-    }
-    </style>
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/error-page/404.vue b/PC/InterFace.Dash/src/views/error-page/404.vue
index 1791f55..87c6213 100644
--- a/PC/InterFace.Dash/src/views/error-page/404.vue
+++ b/PC/InterFace.Dash/src/views/error-page/404.vue
@@ -8,13 +8,10 @@
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
-        <a href="" class="bullshit__return-home">Back to home</a>
+        <div class="bullshit__oops">访问发生错误!</div>
+        <div class="bullshit__headline">暂无该页面，或者您没有访问权限</div>
+        <div class="bullshit__info">请检查您输入的地址是否正确，<br/>以及是否有该权限，<br/>或者单击下面的按钮返回主页。</div>
+        <a href="/home" class="bullshit__return-home">返回主页</a>
       </div>
     </div>
   </div>
@@ -24,11 +21,6 @@
 
 export default {
   name: 'Page404',
-  computed: {
-    message() {
-      return 'The webmaster said that you can not enter this page...'
-    }
-  }
 }
 </script>
 
@@ -167,10 +159,11 @@ export default {
       line-height: 40px;
       color: #1482f0;
       opacity: 0;
-      margin-bottom: 20px;
+      margin-bottom: 30px;
       animation-name: slideUp;
       animation-duration: 0.5s;
       animation-fill-mode: forwards;
+      padding-top: 20px;
     }
     &__headline {
       font-size: 20px;
@@ -185,11 +178,11 @@ export default {
       animation-fill-mode: forwards;
     }
     &__info {
-      font-size: 13px;
+      font-size: 16px;
       line-height: 21px;
       color: grey;
       opacity: 0;
-      margin-bottom: 30px;
+      margin-bottom: 40px;
       animation-name: slideUp;
       animation-duration: 0.5s;
       animation-delay: 0.2s;
diff --git a/PC/InterFace.Dash/src/views/menuAll/index.vue b/PC/InterFace.Dash/src/views/menuAll/index.vue
index 72f061e..e5615fc 100644
--- a/PC/InterFace.Dash/src/views/menuAll/index.vue
+++ b/PC/InterFace.Dash/src/views/menuAll/index.vue
@@ -27,24 +27,31 @@ export default {
         ])
     },
     mounted(){
-        this.initData(this.permission_routes)
+        let _menus = JSON.parse(JSON.stringify(this.permission_routes))
+        // let _showList = _menus.filter(item=>{
+        //     return !item.hidden
+        // })
+        this.navList = this.initData(_menus,true)
     },
     methods:{
-        initData(data){
+        initData(data,first){
+            let _list = []
             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.meta){
+                    item.title = item.meta.title
+                    _list.push(item)
                 }
-                if(item.children){
-                    this.initData(item.children)
+                // 默认为单层
+                else{
+                    if(item.children && item.children.length > 0)_list.push(item.children[0])
                 }
-            })
+                if(item.children && item.children.length > 0)item.children = this.initData(item.children)
+            });
+            // _list = _list.filter(item=>{
+            //     return !item.hidden
+            // })
+            return _list
         },
         goPage(item){
             this.$router.push({name: item.name})