From 77ec4c2a6f2a39968ad947cb731a99afe2bac611 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 10 四月 2025 14:52:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/layout/MainErpView.vue | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index f4d3163..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')
@@ -31,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 = {
@@ -129,6 +127,13 @@
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)
let indexKey = ref(null)
function handleOpen(key) {
@@ -159,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">
--
Gitblit v1.8.0