From 5c7a1ad82238516e5b65189309af88dcbd7db78a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 19 九月 2024 08:50:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
UI-Project/src/lang/zh.js | 4
UI-Project/src/router/index.js | 336 ++++++++++++++++++++++++++++----------------------------
2 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8065aaa..736278d 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -148,8 +148,8 @@
upperSlice:'鑷姩涓婄墖鏈�',
scanQrCodesIdentify:'鎵爜璇嗗埆',
edging:'纾ㄨ竟鏈�',
- edging:'娓呮礂鏈�',
- edging:'缈荤墖鍙�',
+ cleaning:'娓呮礂鏈�',
+ flipSlice:'缈荤墖鍙�',
scanQrCodesVerify:'鎵爜纭',
marking: '鑷姩鎵撴爣鏈�',
silkScreen:'鑷姩涓濆嵃鏈�',
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 6bc2135..78351ef 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -25,186 +25,186 @@
children: [
{
/*----------- 鑷姩涓婄墖 ----------------*/
- path: 'MechanicalArm',
- name: 'mechanicalArm',
- component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
+ path: 'UpperSlice',
+ name: 'upperSlice',
+ component: () => import('../views/UpperSlice/upperSlice.vue'),
children: [
{
- path: '/MechanicalArm/mechanicalArm',
- name: 'mechanicalArm',
- component: () => import('../views/MechanicalArm/mechanicalArm.vue'),
+ path: '/UpperSlice/upperSlice',
+ name: 'upperSlice',
+ component: () => import('../views/UpperSlice/upperSlice.vue'),
}
]
},
{
/*----------- 鑷姩鎵爜 ----------------*/
- path: 'ScanQR',
- name: 'scanQR',
- component: () => import('../views/ScanQR/scanQR.vue'),
+ path: 'ScanQrCodesIdentify',
+ name: 'scanQrCodesIdentify',
+ component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
children: [
{
- path: '/ScanQR/scanQR',
- name: 'scanQR',
- component: () => import('../views/ScanQR/scanQR.vue'),
+ path: '/ScanQrCodesIdentify/scanQrCodesIdentify',
+ name: 'scanQrCodesIdentify',
+ component: () => import('../views/ScanQrCodesIdentify/scanQrCodesIdentify.vue'),
}
]
},
- // {
- // /*----------- 纾ㄨ竟鏈� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 娓呮礂鏈� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 缈荤墖鍙� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鎵爜2 ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鑷姩鎵撴爣鏈� ----------------*/
- // path: 'Marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鑷姩涓濆嵃鏈� ----------------*/
- // path: 'SilkScreen',
- // name: 'silkScreen',
- // component: () => import('../views/SilkScreen/silkScreen.vue'),
- // children: [
- // {
- // path: '/SilkScreen/silkScreen',
- // name: 'silkScreen',
- // component: () => import('../views/SilkScreen/silkScreen.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鑷姩鐐硅兌鏈� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鐑樺共绾� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鏃嬭浆鍙� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鑷姩璐磋啘鏈� ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鎶ュ伐绠＄悊 ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
- // {
- // /*----------- 鎶ヨ〃绠＄悊 ----------------*/
- // path: 'ZiDongShangpian',
- // name: 'zidongshangpian',
- // component: () => import('../views/Marking/marking.vue'),
- // children: [
- // {
- // path: '/Marking/marking',
- // name: 'marking',
- // component: () => import('../views/Marking/marking.vue'),
- // }
- // ]
- // },
+ {
+ /*----------- 纾ㄨ竟鏈� ----------------*/
+ path: 'Edging',
+ name: 'edging',
+ component: () => import('../views/Edging/edging.vue'),
+ children: [
+ {
+ path: '/Edging/edging',
+ name: 'edging',
+ component: () => import('../views/Edging/edging.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 娓呮礂鏈� ----------------*/
+ path: 'Cleaning',
+ name: 'cleaning',
+ component: () => import('../views/Cleaning/cleaning.vue'),
+ children: [
+ {
+ path: '/Cleaning/cleaning',
+ name: 'cleaning',
+ component: () => import('../views/Cleaning/cleaning.vue'),
+ }
+ ]
+ },flipSlice
+ {
+ /*----------- 缈荤墖鍙� ----------------*/
+ path: 'FlipSlice',
+ name: 'flipSlice',
+ component: () => import('../views/FlipSlice/flipSlice.vue'),
+ children: [
+ {
+ path: '/FlipSlice/flipSlice',
+ name: 'flipSlice',
+ component: () => import('../views/FlipSlice/flipSlice.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鎵爜2 ----------------*/
+ path: 'ScanQrCodesVerify',
+ name: 'scanQrCodesVerify',
+ component: () => import('../views/ScanQrCodesVerify/scanQrCodesVerify.vue'),
+ children: [
+ {
+ path: '/ScanQrCodesVerify/scanQrCodesVerify',
+ name: 'scanQrCodesVerify',
+ component: () => import('../views/ScanQrCodesVerify/scanQrCodesVerify.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鑷姩鎵撴爣鏈� ----------------*/
+ path: 'Marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ children: [
+ {
+ path: '/Marking/marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鑷姩涓濆嵃鏈� ----------------*/
+ path: 'SilkScreen',
+ name: 'silkScreen',
+ component: () => import('../views/SilkScreen/silkScreen.vue'),
+ children: [
+ {
+ path: '/SilkScreen/silkScreen',
+ name: 'silkScreen',
+ component: () => import('../views/SilkScreen/silkScreen.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鑷姩鐐硅兌鏈� ----------------*/
+ path: 'GlueDispenser',
+ name: 'glueDispenser',
+ component: () => import('../views/GlueDispenser/glueDispenser.vue'),
+ children: [
+ {
+ path: '/GlueDispenser/glueDispenser',
+ name: 'glueDispenser',
+ component: () => import('../views/GlueDispenser/glueDispenser.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鐑樺共绾� ----------------*/
+ path: 'Drying',
+ name: 'drying',
+ component: () => import('../views/Drying/drying.vue'),
+ children: [
+ {
+ path: '/Drying/drying',
+ name: 'drying',
+ component: () => import('../views/Drying/drying.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鏃嬭浆鍙� ----------------*/
+ path: 'Rotate',
+ name: 'rotate',
+ component: () => import('../views/Rotate/rotate.vue'),
+ children: [
+ {
+ path: '/Rotate/rotate',
+ name: 'rotate',
+ component: () => import('../views/Rotate/rotate.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鑷姩璐磋啘鏈� ----------------*/
+ path: 'Lamination',
+ name: 'lamination',
+ component: () => import('../views/Lamination/lamination.vue'),
+ children: [
+ {
+ path: '/Lamination/lamination',
+ name: 'lamination',
+ component: () => import('../views/Lamination/lamination.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鎶ュ伐绠＄悊 ----------------*/
+ path: 'ZiDongShangpian',
+ name: 'zidongshangpian',
+ component: () => import('../views/Marking/marking.vue'),
+ children: [
+ {
+ path: '/Marking/marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鎶ヨ〃绠＄悊 ----------------*/
+ path: 'ZiDongShangpian',
+ name: 'zidongshangpian',
+ component: () => import('../views/Marking/marking.vue'),
+ children: [
+ {
+ path: '/Marking/marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ }
+ ]
+ },
/*----------- 绯荤粺绠＄悊 ----------------*/
{
path: 'User',
--
Gitblit v1.8.0