From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'
---
UI-Project/src/layout/MainErpView.vue | 139 +++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 75 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index e2f4b57..5528ee9 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -29,60 +29,66 @@
})
router.push('/login')
}
-// const quit = async () => {
-// try {
-// store.$patch({user: null})
-// const response = await request.post('/loadGlass/sys/user/logout')
-// if (response.code === 200) {
-// console.log('鐧诲嚭鎴愬姛');
-// } else {
-// // 澶勭悊閿欒鎯呭喌
-// console.error('鐧诲嚭澶辫触', response);
-// }
-// }
-// catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// }
-// store.createWebSocket();
-// function quit() {
-// userStore.$patch({
-// user: null,
-// })
-// // router.push('/login')
-// request.get("/loadGlass/sys/user/login").then((res) => {
-// if (res.code === 200) {
-// ElMessage.success(res.msg);
-// console.log(res.data);
-// } else {
-// ElMessage.warning(res.msg);
-// // router.push("/login");
-// }
-// });
-// }
-
-
function replaceChineseWithEnglish(menuData) {
+ // 瀹氫箟涓縿鏂囧鐓у叧绯诲璞�
+ const translation = {
+ '涓婄墖鏈�': '小褌芯谢 蟹邪谐褉褍蟹泻懈',
+ '涓婄墖': '袙械褉褏薪褟褟 褔邪褋褌褜',
+ '鎺扮墖/璇嗗埆': '袪邪蟹谢芯屑/懈写械薪褌懈褎懈泻邪褑懈褟',
+ '鍗у紡缂撳瓨': ' 袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉',
+ '纾ㄨ竟鍓嶅崸寮忕紦瀛�': '袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉 锌械褉械写 褕谢懈褎芯胁泻芯泄',
+ '涓嬬墖鍗у紡缂撳瓨': '袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉 褋褌械泻谢邪 褉邪蟹谐褉褍蟹泻懈',
+ '纾ㄨ竟锛堝喎鍔犲伐锛�': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
+ '1绾跨（杈�(鍐峰姞宸�)': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 1 谢懈薪懈懈 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
+ '2绾跨（杈�(鍐峰姞宸�)': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 2 谢懈薪懈懈 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
+ '澶х悊鐗囩': '袘褍褎械褉薪邪褟 褋懈褋褌械屑邪',
+ '閽㈠寲': '袟邪泻邪谢泻邪',
+ '閽㈠寲鍓�': '袩械褉械写 蟹邪泻邪谢泻懈',
+ '閽㈠寲鍚�': '袩芯褋谢械 蟹邪泻邪谢泻懈',
+ '涓嬬墖鍙�': '小褌芯谢 褉邪蟹谐褉褍蟹泻懈',
+ '绯荤粺绠＄悊': '校锌褉邪胁谢械薪懈械 褋懈褋褌械屑芯泄',
+ '鐢ㄦ埛绠＄悊': '校锌褉邪胁谢械薪懈械 锌芯谢褜蟹芯胁邪褌械谢械屑',
+ '鏉冮檺绠＄悊': '校锌褉邪胁谢械薪懈械 锌芯谢薪芯屑芯褔懈褟屑懈',
+ '瑙掕壊绠＄悊': '校锌褉邪胁谢械薪懈械 褉芯谢褜褞',
+ '鍙鍖栫郴缁�': '袙懈蟹褍邪谢褜薪邪褟 褋懈褋褌械屑邪',
+ '鎶ュ伐绠＄悊': '校锌褉邪胁谢械薪懈械 芯褌褔械褌薪芯褋褌褜褞',
+ '浠撳偍涓績': '小泻谢邪写褋泻芯泄 褑械薪褌褉',
+ '鍘熺墖浠撳偍': '小泻谢邪写 褋褘褉褜褟',
+ };
+ menuData.forEach(menu => {
+ menu.menuName = translation[menu.menuName] || menu.menuName;
+ // if (menu.children) {
+ menu.children && menu.children.forEach(submenu => {
+ submenu.menuName = translation[submenu.menuName] || submenu.menuName;
+ });
+ // }
+ });
+}
+function replaceChineseWithRussian(menuData) {
// 瀹氫箟涓嫳鏂囧鐓у叧绯诲璞�
const translation = {
- '涓婄墖鏈�': '小褌芯谢 蟹邪谐褉褍蟹泻懈',
- '鎺扮墖/璇嗗埆': '袪邪蟹谢芯屑/懈写械薪褌懈褎懈泻邪褑懈褟',
- '鍗у紡缂撳瓨': ' 袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉',
- '纾ㄨ竟鍓嶅崸寮忕紦瀛�': '袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉 锌械褉械写 褕谢懈褎芯胁泻芯泄',
- '涓嬬墖鍗у紡缂撳瓨': '袚芯褉懈蟹芯薪褌邪谢褜薪褘泄 斜褍褎械褉 褋褌械泻谢邪 褉邪蟹谐褉褍蟹泻懈',
- '纾ㄨ竟锛堝喎鍔犲伐锛�': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
- '1绾跨（杈�(鍐峰姞宸�)': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 1 谢懈薪懈懈 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
- '2绾跨（杈�(鍐峰姞宸�)': '楔谢懈褎芯胁邪褌褜 泻褉邪褟 2 谢懈薪懈懈 (褏芯谢芯写薪邪褟 芯斜褉邪斜芯褌泻邪)',
- '澶х悊鐗囩': '袘褍褎械褉薪邪褟 褋懈褋褌械屑邪',
- '閽㈠寲': '袟邪泻邪谢泻邪',
- '閽㈠寲鍓�': '袩械褉械写 蟹邪泻邪谢泻懈',
- '閽㈠寲鍚�': '袩芯褋谢械 蟹邪泻邪谢泻懈',
- '涓嬬墖鍙�': '小褌芯谢 褉邪蟹谐褉褍蟹泻懈',
- '绯荤粺绠＄悊': '校锌褉邪胁谢械薪懈械 褋懈褋褌械屑芯泄',
- '鐢ㄦ埛绠＄悊': '校锌褉邪胁谢械薪懈械 锌芯谢褜蟹芯胁邪褌械谢械屑',
- '鏉冮檺绠＄悊': '校锌褉邪胁谢械薪懈械 锌芯谢薪芯屑芯褔懈褟屑懈',
- '瑙掕壊绠＄悊': '校锌褉邪胁谢械薪懈械 褉芯谢褜褞',
+ '涓婄墖鏈�': 'Loading Machine',
+ '涓婄墖': 'Start showing a movie',
+ '鎺扮墖/璇嗗埆': 'Breaking /Identification',
+ '鍗у紡缂撳瓨': 'Horizontal cache',
+ '纾ㄨ竟鍓嶅崸寮忕紦瀛�': 'Horizontal buffer before edge grinding',
+ '涓嬬墖鍗у紡缂撳瓨': 'Offline horizontal cache',
+ '纾ㄨ竟锛堝喎鍔犲伐锛�': 'Grinding edge (cold processing)',
+ '1绾跨（杈�(鍐峰姞宸�)': '1-line edge grinding (cold processing)',
+ '2绾跨（杈�(鍐峰姞宸�)': '2-line edge grinding (cold processing)',
+ '澶х悊鐗囩': 'Dali slice cage',
+ '閽㈠寲': 'Toughened',
+ '閽㈠寲鍓�': 'Before Tempering',
+ '閽㈠寲鍚�': 'After Tempering',
+ '涓嬬墖鍙�': 'Next Stage',
+ '绯荤粺绠＄悊': 'System Management',
+ '鐢ㄦ埛绠＄悊': 'User Management',
+ '鏉冮檺绠＄悊': 'Rights Management',
+ '瑙掕壊绠＄悊': 'Roles',
+ '鍙鍖栫郴缁�': 'visualization system',
+ '鎶ュ伐绠＄悊': 'Job reporting management',
+ '浠撳偍涓績': 'Storage Center',
+ '鍘熺墖浠撳偍': 'Original film storage',
};
menuData.forEach(menu => {
menu.menuName = translation[menu.menuName] || menu.menuName;
@@ -96,32 +102,15 @@
//鎻愬彇鑿滃崟妯″潡鍒楄〃
let menuList = $ref([])
-// onMounted(async () => {
-// try {
-// const res = await request.get('/loadGlass/sys/menu/getMenuTree'); // 鍋囪 request.get 杩斿洖 Promise
-// if (res.code == 200) {
-// // 浣跨敤 value 灞炴�ф潵淇敼 ref 寮曠敤鐨勫��
-// menuList.value = deepClone(res.data);
-// const language = $i18n.locale;
-// if (language === 'en') {
-// replaceChineseWithEnglish(menuList.value); // 浼犲叆 ref 鐨� value
-// }
-// console.log(res.data.token); // 濡傛灉 res.data 涓湁 token 鐨勮瘽
-// } else {
-// ElMessage.warning(res.msg);
-// router.push('/login');
-// }
-// } catch (error) {
-// // 澶勭悊璇锋眰閿欒
-// console.error('鑾峰彇鑿滃崟鍒楄〃鏃跺嚭閿�:', error);
-// }
-// });
request.get('/loadGlass/sys/menu/getMenuTree').then((res) => {
if (res.code == 200) {
menuList = res.data
console.log(language.value)
+ // translateMenu(menuList.value, language.value);
if (language.value === 'en') {
-
+ replaceChineseWithRussian(menuList);
+ }
+ if (language.value === 'py') {
replaceChineseWithEnglish(menuList);
}
} else {
@@ -169,7 +158,7 @@
<el-header>
<div style="height: 100%;width: 100%;display: flex;background-color: #fff;">
<img src="../assets/northGlass.ico"
- alt=""
+ alt="" @click="toggleCollapse"
style="max-width: 100%;max-height: 100%">
<h3 style="margin: 1rem ;font-weight: bold;width: 33vw;"> {{ $t('main.titleFirst') }}{{ userName }}{{ $t('main.titleLast') }}</h3>
<span style="height: 70%;width: 78vw;margin-top: 1rem;">
@@ -187,11 +176,11 @@
<SwitchButton size=""/>{{ $t('main.quit') }}
</el-icon>
</el-button>
- <div class="header-left">
+ <!-- <div class="header-left">
<el-button @click="toggleCollapse" style="height: 30px;">
<el-icon><Expand /></el-icon>
</el-button>
- </div>
+ </div> -->
</span>
</div>
</el-header>
--
Gitblit v1.8.0