From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/router/index.js | 162 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 129 insertions(+), 33 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 6ff9458..764db3a 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -1,8 +1,11 @@
-import { createRouter, createWebHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
+import {createRouter, createWebHashHistory} from 'vue-router'
+
+// 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: '/',
@@ -36,32 +39,32 @@
},
/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-{
- path: 'User',
- name: 'User',
- component: () => import('../views/User/userlist.vue'),
- children:[
- {
- path: '/User/userlist',
- name: 'userlist',
- component: () => import('../views/User/userlist.vue')
- },
- ]
- },
+// {
+// 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: 'Permissions',
+// name: 'Permissions',
+// component: () => import('../views/Permissions/permissionslist.vue'),
+// children:[
+// {
+// path: '/Permissions/permissionslist',
+// name: 'permissionslist',
+// component: () => import('../views/Permissions/permissionslist.vue')
+// },
+// ]
+// },
/*----------- 涓婄墖鏈� ----------------*/
{
path: 'Returns',
@@ -95,22 +98,32 @@
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')
},
]
},
@@ -173,9 +186,92 @@
}
]
},
+
+ {
+ path: 'GlassStorage',
+ name: 'GlassStorage',
+ component: () => import('../views/GlassStorage/MaterialRackManagement.vue'),
+ children:[
+ {
+ path: '/GlassStorage/MaterialRackManagement',
+ name: 'MaterialRackManagement',
+ component: () => import('../views/GlassStorage/MaterialRackManagement.vue')
+ }
+ ]
+ },
+
+ /*----------- 鍙鍖栫郴缁� ----------------*/
+ {
+ path: 'Visualization',
+ name: 'screen',
+ component: () => import('../views/Visualization/screen.vue'),
+ children:[
+ {
+ path: '/Visualization/screenone',
+ name: 'screenone',
+ component: () => import('../views/Visualization/screenone.vue')
+ },
+ {
+ path: '/Visualization/screentwo',
+ name: 'screentwo',
+ component: () => import('../views/Visualization/screentwo.vue')
+ },
+ {
+ path: '/Visualization/screenthree',
+ name: 'screenthree',
+ 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: '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:'/Slicecage/slicecage'
+ redirect: '/returns/returns'
}
]
},
--
Gitblit v1.8.0