update

Former-commit-id: 3887eef646b6eff9a07af76a833959adf8cb9b22
Former-commit-id: 7ec042810d77e2be9bf5316fe884c55817e13659

projects/WebMVC/wwwroot/js/route.js

@@ -30,6 +30,11 @@ router.beforeEach((to, from, next) => {
         });
     }
     else {
-        next();
+        if (to.path === from.path) {
+            router.push({ path: '/router/shared/redirect.html', query: { url: to.fullUrl } })
+        }
+        else {
+            next();
+        }
     }
 });

projects/WebMVC/wwwroot/router/shared/layout.html

@@ -35,7 +35,7 @@
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
                         <li class="nav-item">
-                            <router-link :to="{path:'/'}" :class="isPageActive('/','/router/product.html','/router/device.html')">
+                            <router-link to="/" :class="isPageActive('/','/router/product.html','/router/device.html')">
                                 <i class="fa fa-folder"></i>
                                 <p>
                                     产品
@@ -43,7 +43,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <router-link :to="{path:'/router/nodes.html'}" :class="isPageActive('/router/nodes.html','/router/node.html')">
+                            <router-link to="/router/nodes.html" :class="isPageActive('/router/nodes.html','/router/node.html')">
                                 <i class="fa fa-cube"></i>
                                 <p>
                                     节点
@@ -51,18 +51,26 @@
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-Setting')">
-                            <router-link :to="{path:'/router/admin/home.html'}" :class="isPageActive('/router/admin/home.html')">
+                            <router-link to="/router/admin/home.html" :class="isPageActive('/router/admin/home.html')">
                                 <i class="fa fa-folder"></i>
                                 <p>
                                     控制台
                                 </p>
                             </router-link>
                         </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Setting')">
+                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Setting" :class="isEntityActive('Setting')">
+                                <i class="fa fa-folder"></i>
+                                <p>
+                                    设置
+                                </p>
+                            </router-link>
+                        </li>
                         <li class="nav-item" v-if="hasPermission('Read-Node')">
-                            <router-link :to="{path:'/router/shared/list.html',query:{entity:'Node'}}" :class="isEntityActive('Node')">
+                            <router-link :key="$route.fullPath" to="/router/shared/list.html?entity=Node" :class="isEntityActive('Node')">
                                 <i class="fa fa-folder"></i>
                                 <p>
-                                    节点
+                                    节点管理
                                 </p>
                             </router-link>
                         </li>

projects/WebMVC/wwwroot/router/shared/redirect.html

@@ -0,0 +1,19 @@
+<template>
+    <layout><div>loading</div></layout>
+</template>
+<script>
+    export default {
+        mounted: function () {
+            console.log('redirect');
+            this.$router.push(this.$route.query.url);
+        },
+        methods: {
+            beforeRouteEnter(to, from, next) {
+                console.log(to);
+                console.log(from);
+                console.log(next);
+                router.push('/');
+            }
+        }
+    }
+</script>