From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/router/index.js | 217 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 172 insertions(+), 45 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index bc72f00..f492054 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 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: '/',
@@ -22,46 +25,46 @@
children:[
- // {
- // path: 'Temperedlayout',
- // name: 'Temperedlayout',
- // component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
- // children:[
- // {
- // path: 'selectLayout',
- // name: 'selectLayout',
- // component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
- // }
- // ]
- // },
+ {
+ path: 'Temperedlayout',
+ name: 'Temperedlayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ children:[
+ {
+ path: 'selectLayout',
+ name: 'selectLayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ }
+ ]
+ },
/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-{
- 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,123 @@
}
]
},
+ /*----------- 浠撳偍涓績 ----------------*/
+ {
+ path: 'GlassStorage',
+ name: 'GlassStorage',
+ component: () => import('../views/GlassStorage/GlassStorage.vue'),
+ children:[
+ {
+ path: '/GlassStorage/MaterialRackManagement',
+ name: 'MaterialRackManagement',
+ component: () => import('../views/GlassStorage/MaterialRackManagement.vue')
+ },
+ {
+ path: '/GlassStorage/rawfilmstorage',
+ name: 'rawfilmstorage',
+ component: () => import('../views/GlassStorage/rawfilmstorage.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: '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: '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