diff --git a/src/assets/img/DataCenter/circle.png b/src/assets/img/DataCenter/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..d08a2069a15d015d9f59533e8a4a5b640149f1ef Binary files /dev/null and b/src/assets/img/DataCenter/circle.png differ diff --git a/src/assets/img/DataCenter/message.png b/src/assets/img/DataCenter/message.png new file mode 100644 index 0000000000000000000000000000000000000000..d60e43b5d445f10ce0cf00ef99394de3d57c974c Binary files /dev/null and b/src/assets/img/DataCenter/message.png differ diff --git a/src/assets/img/DataCenter/selected.png b/src/assets/img/DataCenter/selected.png new file mode 100644 index 0000000000000000000000000000000000000000..5138a01ce74da27020be20559268350b2171022d Binary files /dev/null and b/src/assets/img/DataCenter/selected.png differ diff --git a/src/assets/img/DataCenter/shequ.png b/src/assets/img/DataCenter/shequ.png new file mode 100644 index 0000000000000000000000000000000000000000..b49fa213ba19a24d4ffdae62b350709f25af8e43 Binary files /dev/null and b/src/assets/img/DataCenter/shequ.png differ diff --git a/src/assets/img/DataCenter/shift.png b/src/assets/img/DataCenter/shift.png new file mode 100644 index 0000000000000000000000000000000000000000..1120b5e707f583c36e49e1eade1494e64e0a6c84 Binary files /dev/null and b/src/assets/img/DataCenter/shift.png differ diff --git a/src/assets/img/DataCenter/tijian.png b/src/assets/img/DataCenter/tijian.png new file mode 100644 index 0000000000000000000000000000000000000000..16ad15b914e41c95013cf3c076b477a41ad8c9fa Binary files /dev/null and b/src/assets/img/DataCenter/tijian.png differ diff --git a/src/assets/img/DataCenter/user.png b/src/assets/img/DataCenter/user.png new file mode 100644 index 0000000000000000000000000000000000000000..254089c22ee36192e01ee50b9df947eec8a0ae08 Binary files /dev/null and b/src/assets/img/DataCenter/user.png differ diff --git a/src/assets/img/DataCenter/yiyuan.png b/src/assets/img/DataCenter/yiyuan.png new file mode 100644 index 0000000000000000000000000000000000000000..7542b7ba7d58eced70b0eabc8bfe0f3c395b53b1 Binary files /dev/null and b/src/assets/img/DataCenter/yiyuan.png differ diff --git a/src/components/CustomTable/index.vue b/src/components/CustomTable/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..1d614dbe3f8965c1eca4c5c407cde80e0fe7ad88 --- /dev/null +++ b/src/components/CustomTable/index.vue @@ -0,0 +1,124 @@ + + + diff --git a/src/config/permission.js b/src/config/permission.js index 51d654fe8006a43398646f9c56975893a008374f..cd2579ba3f1920e7689c5b395a21f5de9a4f29ab 100644 --- a/src/config/permission.js +++ b/src/config/permission.js @@ -28,9 +28,8 @@ router.beforeResolve(async (to, from, next) => { if (!loginInterception) hasToken = true if (hasToken) { if (to.path === "/home") { - next({ - path: "/", - }) + next() + // { path: "/" } if (progressBar) VabProgress.done() } else if (routesWhiteList.indexOf(to.path) !== -1) { next() @@ -49,6 +48,7 @@ router.beforeResolve(async (to, from, next) => { accessRoutes = await store.dispatch("routes/setAllRoutes", menulist) } router.addRoutes(accessRoutes) + console.log(router) if (accessRoutes.length === 1) { Message({ message: "暂无菜单权限,请联系管理员", diff --git a/src/layouts/components/Avatar/index.vue b/src/layouts/components/Avatar/index.vue index fd349d3a26f451b0f131fdf46f2b7aa5057a575d..e7ec045f93e5421b944fab09b1ad1061a3ae1059 100644 --- a/src/layouts/components/Avatar/index.vue +++ b/src/layouts/components/Avatar/index.vue @@ -53,7 +53,7 @@ export default { async () => { const fullPath = this.$route.fullPath await this.$store.dispatch("user/logout") - this.$router.push(`/login?redirect=${fullPath}`) + this.$router.push(`/home?redirect=${fullPath}`) } ) }, diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue index 36b07fab5fbed4d897f4f2eca1d0e8847b27d2ab..e4e3d671ec94a9e7be639d3716900a9dfe9d9c49 100644 --- a/src/layouts/components/NavBar/index.vue +++ b/src/layouts/components/NavBar/index.vue @@ -4,9 +4,40 @@