From aebc5d85da25b3b352dba1ceb76bacf3f464382b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 四月 2025 17:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/layout/MainErpView.vue | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index ce2f952..f41d08b 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -8,8 +8,8 @@
import { useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n'
import { provide } from 'vue';
-import {host, WebSocketHost} from '@/utils/constants'
-import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+// import {host, WebSocketHost} from '@/utils/constants'
+// import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
const globalDate = ref('');
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
@@ -20,7 +20,6 @@
const userStore = useUserInfoStore()
// const user = userStore.user.userName
let userInfoStr = window.localStorage.getItem('userInfo')
-console.log(userInfoStr);
// const userInfoStr = localStorage.getItem('userInfo');
// let userInfo = userInfoStr.user.token;
let token = userInfo; // 鎻愬彇 token
@@ -32,17 +31,15 @@
})
router.push('/login')
}
-let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/mainMes`;
-const handleMessage = (data) => {
- if(data.globalDate!=null){
- window.localStorage.setItem('getglobalDate', data.globalDate[0])
- }else{
- globalDate.value = ''
- }
- }
- let getglobalDate = window.localStorage.getItem('getglobalDate')
- provide('globalDate', getglobalDate);
+// let socket = null;
+// const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/mainMes`;
+// const handleMessage = (data) => {
+// if(data.globalDate!=null){
+// window.localStorage.setItem('getglobalDate', data.globalDate[0])
+// }else{
+// globalDate.value = ''
+// }
+// }
function replaceChineseWithEnglish(menuData) {
// 瀹氫箟涓縿鏂囧鐓у叧绯诲璞�
const translation = {
@@ -118,7 +115,6 @@
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);
@@ -129,6 +125,13 @@
} else {
ElMessage.warning(res.msg)
router.push('/login')
+ }
+})
+request.post('/loadGlass/sys/menu/getNowDate').then((res) => {
+ if (res.code == 200) {
+ window.localStorage.setItem('getglobalDate', res.data)
+ } else {
+ ElMessage.warning(res.msg)
}
})
const menu = ref(null)
@@ -161,13 +164,34 @@
isCollapse.value = !isCollapse.value;
}
onMounted(() => {
- socket = initializeWebSocket(socketUrl, handleMessage);
+ // fetchlack()
+ // socket = initializeWebSocket(socketUrl, handleMessage);
});
- onUnmounted(() => {
- if (socket) {
- closeWebSocket(socket);
- }
- });
+// const fetchlack = async () => {
+// try {
+// console.log(33333);
+// const response = await request.post('/loadGlass/sys/menu/getNowDate')
+// console.log(response.code);
+// if (response.code == 200) {
+// console.log(11111);
+// console.log(response.data);
+// console.log(2222);
+// // window.localStorage.setItem('getglobalDate', response.data)
+// } else {
+// ElMessage.error(response.message);
+// }
+// }
+// catch (error) {
+// // 澶勭悊閿欒
+// }
+// }
+ let getglobalDate = window.localStorage.getItem('getglobalDate')
+ provide('globalDate', getglobalDate);
+ // onUnmounted(() => {
+ // if (socket) {
+ // closeWebSocket(socket);
+ // }
+ // });
</script>
<template>
<div id="all">
@@ -177,7 +201,7 @@
<img src="../assets/northGlass.ico"
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>
+ <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;">
<!-- <el-button class="sys-quit"
@click="quit"
--
Gitblit v1.8.0