From 1449f79f342919f5b65003312b113a8dad229692 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 4ecdb3e..283009d 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -8,9 +8,9 @@
<el-button id="searchButton" type="primary" @click="handlezhiban">
{{ $t('hellow.createtask') }}
</el-button>
- <el-button type="primary" @click="selectproject">
+ <!-- <el-button type="primary" @click="selectproject">
{{ $t('hellow.reviewproject') }}
- </el-button>
+ </el-button> -->
<el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{
$t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
@@ -607,7 +607,7 @@
// })
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassTwo`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassTwo`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
@@ -617,16 +617,20 @@
currentPage.value = newPage;
};
const handleMessage = (data) => {
- if (data.queueInfo != null) {
+ if (data.queueInfo[0] != null) {
const rawData = data.queueInfo[0]
const formattedData = Object.entries(rawData).map(([key, data]) => ({
title: key,
tableDataa: Array.isArray(data) ? data : [data]
}));
tabList.value = formattedData;
-}
+}else{
+ tabList.value = [];
+ }
if (tabList.value.length > 0) {
activeTab.value = tabList.value[0].title;
+ }else {
+ activeTab.value = '';
}
internalInstance.ctx.$forceUpdate();
try {
@@ -677,7 +681,9 @@
blindc.value = true;
};
const handleBinde = (flowCard) => {
- const summary = flowCard.reduce((map, item) => {
+ const summary = flowCard
+ .filter(item => item.isPair !== 0)
+ .reduce((map, item) => {
const key = `${item.hollowSequence}`;
if (!map[key]) {
map[key] = {
@@ -743,6 +749,7 @@
const handletake = (row) => {
window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
+ isSubmitting.value = false
fetchmulan()
};
// 寮哄埗鍑虹墖
@@ -1099,9 +1106,7 @@
}
} catch (error) {
ElMessage.error(response.message);
- } finally {
- isSubmitting.value = false
- }
+ }
}
// 缂虹墖璇︽儏-鐮存崯
--
Gitblit v1.8.0