From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/router.js | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/web/src/router.js b/web/src/router.js
index b01adae..f2d2e63 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -2,6 +2,8 @@
import Router from 'vue-router'
import {beforeEach, pageRoutes, setConfig} from './router/router'
import store from '../packages/store'
+import nProgress from 'nprogress'
+import 'nprogress/nprogress.css'
Vue.use(Router)
@@ -55,7 +57,13 @@
component: () => import('./views/modules/sys/task/taskCenter'),
name: 'home',
meta: {title: '棣栭〉', isTab: true}
- }
+ },
+ {
+ path: '/home',
+ component: () => import('./views/modules/home2'),
+ name: 'home',
+ meta: {title: '棣栭〉',isRefresh: 1, isTab: true}
+ },
]
}
@@ -69,6 +77,7 @@
setConfig(router, moduleRoutes, (url) => import(`./views/modules/${url}`))
router.beforeEach((to, from, next) => {
+ nProgress.start()
if(to.name == 'sys-sysPage-digitalData-home'
|| to.name == 'sys-sysPage-replace-home'
|| to.name == 'sys-sysPage-equipment-home'
@@ -87,6 +96,10 @@
}
beforeEach(to, from, next)
})
+ //鍏ㄥ眬鍚庣疆瀹堝崼
+router.afterEach((to, from)=>{
+ nProgress.done() //杩涘害鏉＄粨鏉�
+})
// router.beforeEach((to, from, next) => {
// store.state.showHeader = to.name !== 'sys-sysPage-digitalData-home'
// beforeEach(to, from, next)
--
Gitblit v1.9.1