From 63f329c61e6fd67cae6c2899f72831c390fae4e0 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 14 六月 2024 14:50:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index eccab95..068a4da 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -3,8 +3,7 @@
import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
-import { WebSocketHost } from '@/utils/constants'
-
+import { WebSocketHost ,host} from '@/utils/constants'
import { ref, onMounted , onBeforeUnmount} from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
@@ -192,7 +191,7 @@
}
-const socketUrl = `ws://${WebSocketHost}:88/api/cacheVerticalGlass/api/talk/slicecage`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
@@ -530,7 +529,7 @@
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" label="澶х悊鐗囩琛↖D" min-width="80" />
- <el-table-column prop="deviceId" align="center" label="璁惧ID" min-width="120" />
+ <el-table-column prop="deviceId" align="center" label="鐞嗙墖绗煎彿" min-width="120" />
<el-table-column prop="slot" align="center" label="鏍呮牸鍙�" min-width="120" />
<el-table-column
align="center"
--
Gitblit v1.8.0