From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
UI-Project/src/router/index.js | 154 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 145 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 527c0df..030de26 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: '/',
@@ -35,6 +38,33 @@
]
},
+/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
+// {
+// 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',
@@ -68,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')
},
]
},
@@ -146,9 +186,105 @@
}
]
},
+
+ {
+ 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: 'largescreen',
+ name: 'largescreen',
+ component: () => import('../views/largescreen/largescreen.vue'),
+ children:[
+ {
+ path: '/largescreen/largescreen',
+ name: 'largescreen',
+ component: () => import('../views/largescreen/largescreen.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