From 6acde3b011f5f1b843c6f097baf64fbd9b574b23 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 24 六月 2024 21:38:00 +0800
Subject: [PATCH] 下片任务进片逻辑已完成，待测试优化
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index d53fe3c..e1ea82d 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -11,9 +11,7 @@
import Landingindicationtwo from "./Landingindicationtwo.vue";
import request from "@/utils/request";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
- import { WebSocketHost } from '@/utils/constants';
-
-
+import { WebSocketHost ,host} from '@/utils/constants'
const dialogFormVisiblea = ref(false)
const dialogFormVisiblea2 = ref(false)
@@ -26,7 +24,7 @@
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
const flowCardId = ref('');
-const flowCardOptions = ref([]);
+const flowCardOptions = ref('[]');
const tableData = reactive([]);
// 鏂规硶
const handleSelectionChange = () => {
@@ -46,9 +44,9 @@
const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data
- .filter(item => item !== null)
- .map(item => ({ flowcard_id: item.flow_card_Id }));
+
+ flowCardOptions.value = response.data.filter(item => item !== null)
+.map(item => ({ flowcard_id: item.flow_card_id }));
console.log(flowCardOptions.value);
}
else {
@@ -148,14 +146,14 @@
};
-const socketUrl = `ws://${WebSocketHost}:8085/api/talk/unloadglass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
tableData.splice(0, tableData.length, ...data.params[0]);
- // console.log("鏇存柊鍚庢暟鎹�", tableData);
+// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
@@ -227,7 +225,7 @@
<el-form-item label="鏋跺彿锛�" :required="true" style="width: 18vw">
<el-input v-model="workstationId" autocomplete="off"/>
</el-form-item>
- <el-form-item label="娴佺▼鍗″彿锛�" :required="true" style="width: 18vw;">
+ <el-form-item label="娴佺▼鍗″彿锛�" :required="false" style="width: 18vw;">
<el-select v-model="flowCardId" placeholder="璇烽�夋嫨娴佺▼鍗″彿">
<el-option v-for="item in flowCardOptions" :key="item.flowcard_id" :label="item.flowcard_id" :value="item.flowcard_id" />
</el-select>
--
Gitblit v1.8.0