From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/router/index.js | 270 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 194 insertions(+), 76 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 2ecd57e..fdf4514 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -1,8 +1,10 @@
-import { createRouter, createWebHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
-
+import {createRouter, createWebHashHistory} from 'vue-router'
+// import i18n from '@/utils/lang'
+// import User from '../views/sys/User.vue'
+// import Role from '../views/sys/Role.vue'
+// import Menu from '../views/sys/Menu.vue'
const router = createRouter({
- history: createWebHistory(import.meta.env.BASE_URL),
+ history: createWebHashHistory(),
routes: [
{
path: '/',
@@ -16,12 +18,15 @@
component: () => import('../views/LoginView.vue')
},
{
+ path: '/new-page', // 鏂板鐨勬棤闇�鐧诲綍鐨勯〉闈�
+ name: 'newPage',
+ component: () => import('../views/NewPage.vue')
+ },
+ {
path: '/main',
name: 'main',
component: () => import('../layout/MainErpView.vue'),
children:[
-
-
{
path: 'Temperedlayout',
name: 'Temperedlayout',
@@ -34,57 +39,44 @@
}
]
},
-
-/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-// {
-// path: 'User',
-// name: 'User',
-// component: () => import('../views/User/userlist.vue'),
-// children:[
-// {
-// path: '/User/userlist',
-// name: 'userlist',
-// component: () => import('../views/User/userlist.vue')
-// },
-// ]
-// },
-
-/*----------- 鏉冮檺鍒楄〃 ----------------*/
-// {
-// path: 'Permissions',
-// name: 'Permissions',
-// component: () => import('../views/Permissions/permissionslist.vue'),
-// children:[
-// {
-// path: '/Permissions/permissionslist',
-// name: 'permissionslist',
-// component: () => import('../views/Permissions/permissionslist.vue')
-// },
-// ]
-// },
/*----------- 涓婄墖鏈� ----------------*/
{
path: 'Returns',
- name: 'Returns',
- component: () => import('../views/Returns/returns.vue'),
+ name: 'return',
+ component: () => import('../views/Returns/return.vue'),
children:[
{
- path: '/Returns/returns',
- name: 'returns',
- component: () => import('../views/Returns/returns.vue')
+ path: '/Returns/upreturns',
+ name: 'upreturns',
+ component: () => import('../views/Returns/upreturns.vue')
+ },
+ {
+ path: '/Returns/upreturns2',
+ name: 'upreturns2',
+ component: () => import('../views/Returns/upreturns2.vue')
},
]
},
/*----------- 鎺扮墖/璇嗗埆 ----------------*/
{
path: 'Identify',
- name: 'Identify',
- component: () => import('../views/Identify/identify.vue'),
- children:[
+ name: 'ident',
+ component: () => import('../views/Identify/ident.vue'),
+ children: [
{
path: '/Identify/identify',
name: 'identify',
component: () => import('../views/Identify/identify.vue')
+ },
+ {
+ path: '/Identify/identifwu',
+ name: 'identifwu',
+ component: () => import('../views/Identify/identifwu.vue')
+ },
+ {
+ path: '/Identify/identifwutwo',
+ name: 'identifwutwo',
+ component: () => import('../views/Identify/identifwutwo.vue')
},
]
},
@@ -95,22 +87,37 @@
component: () => import('../views/Caching/caching.vue'),
children:[
{
- path: '/Caching/caching',
- name: 'caching',
- component: () => import('../views/Caching/caching.vue')
+ path: '/Caching/cachingbefore',
+ name: 'cachingbefore',
+ component: () => import('../views/Caching/cachingbefore.vue')
+ },
+ {
+ path: '/Caching/cachingun',
+ name: 'cachingun',
+ component: () => import('../views/Caching/cachingun.vue')
},
]
},
/*----------- 纾ㄨ竟锛堝喎鍔犲伐锛� ----------------*/
{
path: 'StockBasicData',
- name: 'StockBasicData',
- component: () => import('../views/StockBasicData/stockBasicData.vue'),
+ name: 'Select',
+ component: () => import('../views/StockBasicData/Select.vue'),
children:[
{
path: '/StockBasicData/stockBasicData',
name: 'stockBasicData',
component: () => import('../views/StockBasicData/stockBasicData.vue')
+ },
+ {
+ path: '/StockBasicData/stockBasicDatatwo',
+ name: 'stockBasicDatatwo',
+ component: () => import('../views/StockBasicData/stockBasicDatatwo.vue')
+ },
+ {
+ path: '/StockBasicData/stockBasicyiwu',
+ name: 'stockBasicyiwu',
+ component: () => import('../views/StockBasicData/stockBasicyiwu.vue')
},
]
},
@@ -145,35 +152,25 @@
},
]
},
- /*----------- 涓嬬墖鍙� ----------------*/
- {
- path: 'UnLoadGlass',
- name: 'UnLoadGlass',
- component: () => import('../views/UnLoadGlass/UnLoadGlass.vue'),
+ /*----------- 浠撳偍涓績 ----------------*/
+ {
+ path: 'GlassStorage',
+ name: 'GlassStorage',
+ component: () => import('../views/GlassStorage/GlassStorage.vue'),
children:[
{
- path: '/UnLoadGlass/loadmachinerack',
- name: 'loadmachinerack',
- component: () => import('../views/UnLoadGlass/loadmachinerack.vue')
+ path: '/GlassStorage/MaterialRackManagement',
+ name: 'MaterialRackManagement',
+ component: () => import('../views/GlassStorage/MaterialRackManagement.vue')
},
{
- path: '/UnLoadGlass/loadmachineracktwo',
- name: 'loadmachineracktwo',
- component: () => import('../views/UnLoadGlass/loadmachineracktwo.vue')
- },
- {
- path: '/UnLoadGlass/Landingindication',
- name: 'Landingindication',
- component: () => import('../views/UnLoadGlass/Landingindication.vue')
- },
- {
- path: '/UnLoadGlass/Landingindicationtwo',
- name: 'Landingindicationtwo',
- component: () => import('../views/UnLoadGlass/Landingindicationtwo.vue')
+ path: '/GlassStorage/rawfilmstorage',
+ name: 'rawfilmstorage',
+ component: () => import('../views/GlassStorage/rawfilmstorage.vue')
}
]
},
-
+
/*----------- 鍙鍖栫郴缁� ----------------*/
{
path: 'Visualization',
@@ -196,11 +193,125 @@
component: () => import('../views/Visualization/screenthree.vue')
}
]
- },
+ },
+/*----------- 绯荤粺绠＄悊 ----------------*/
+{
+ path: 'User',
+ name: 'user',
+ component: () => import('../views/User/user.vue'),
+ children:[
+ {
+ path: '/User/userlist',
+ name: 'userlist',
+ component: () => import('../views/User/userlist.vue')
+ },
+ {
+ path: '/User/rolelist',
+ name: 'rolelist',
+ component: () => import('../views/User/rolelist.vue')
+ },
+ {
+ path: '/User/permissions',
+ name: 'permissions',
+ component: () => import('../views/User/permissions.vue')
+ }
+ ]
+ },
+ /*----------- 鏄剧ず ----------------*/
+ {
+ path: 'largescreen',
+ name: 'largescreen',
+ component: () => import('../views/largescreen/largescreen.vue'),
+ children:[
+ {
+ path: '/largescreen/largescreen',
+ name: 'largescreen',
+ component: () => import('../views/largescreen/largescreen.vue')
+ },
+ ]
+ },
+ /*----------- 鎶ュ伐绠＄悊 ----------------*/
+ {
+ path: 'reportWork',
+ name: 'reportWork',
+ component: () => import('../views/ReportWork/reportWork.vue'),
+ children: [
+ {
+ path: '/ReportWork/reportWork',
+ name: 'reportWork',
+ component: () => import('../views/ReportWork/reportWork.vue')
+ },
+ ]
+ },
+
+ /*----------- 澶у睆鏄剧ず ----------------*/
+ {
+ path: 'largescreendisplay',
+ name: 'screendisplay',
+ component: () => import('../views/largescreendisplay/screendisplay.vue'),
+ children: [
+ {
+ path: '/largescreendisplay/screendisplay',
+ name: 'screendisplay',
+ component: () => import('../views/largescreendisplay/screendisplay.vue')
+ },
+ ]
+ },
+ /*----------- 涓┖ ----------------*/
{
- path: '',
- redirect:'/Slicecage/slicecage'
- }
+ path: 'hollow',
+ name: 'hol',
+ component: () => import('../views/hollow/hol.vue'),
+ children: [
+ {
+ path: '/hollow/hollowequipment',
+ name: 'hollowequipment',
+ component: () => import('../views/hollow/hollowequipment.vue')
+ },
+ {
+ path: '/hollow/hollowequipmenttwo',
+ name: 'hollowequipmenttwo',
+ component: () => import('../views/hollow/hollowequipmenttwo.vue')
+ },
+ {
+ path: '/hollow/hollowslicecage',
+ name: 'hollowslicecage',
+ component: () => import('../views/hollow/hollowslicecage.vue')
+ },
+ {
+ path: '/hollow/hollowaluminum',
+ name: 'hollowaluminum',
+ component: () => import('../views/hollow/hollowaluminum.vue')
+ },
+ ]
+ },
+ /*----------- 绠＄悊绯荤粺 ----------------*/
+ {
+ path: 'sys',
+ name: 'screen',
+ component: () => import('../views/Visualization/screen.vue'),
+ children: [
+ // {
+ // path: '/sys/users',
+ // name: 'SysUser',
+ // component: User
+ // },
+ // {
+ // path: '/sys/roles',
+ // name: 'SysRole',
+ // component: Role
+ // },
+ // {
+ // path: '/sys/menus',
+ // name: 'SysMenu',
+ // component: Menu
+ // },
+ ]
+ },
+ // {
+ // path: '',
+ // redirect: '/hollow/hollowslicecage'
+ // }
]
},
{
@@ -208,8 +319,15 @@
name: 'register',
component: () => import('../views/RegisterView.vue')
}
-
]
})
-
-export default router
+// 瀵艰埅瀹堝崼
+router.beforeEach((to, from, next) => {
+ const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫
+ if (to.matched.some(record => record.meta.requiresAuth) && !isAuthenticated) {
+ next({ name: 'login' }); // 濡傛灉闇�瑕佺櫥褰曚絾鏈櫥褰曪紝鍒欓噸瀹氬悜鍒扮櫥褰曢〉闈�
+ } else {
+ next(); // 鍚﹀垯缁х画瀵艰埅
+ }
+});
+export default router
\ No newline at end of file
--
Gitblit v1.8.0