From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 98578a7..5d4d162 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -94,6 +94,14 @@
printLayer.value = row.layer
printGlassId.value = row.glassId
}
+const selectGong = async () => {
+ try {
+ const response = await request.get('/cacheVerticalGlass/bigStorageCageHistoryTask/queryAllMessage');
+ if (response.code == 200) {
+ }
+ } catch (error) {
+ }
+};
// setInterval(() => {
// localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
// }, 60000);
@@ -710,28 +718,28 @@
}
}
// 浠诲姟閲嶇疆
-const handleptask = async() => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.partasks'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
- cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post('/cacheVerticalGlass/bigStorageCage/resetCage')
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- }
-};
+// const handleptask = async() => {
+// try {
+// const confirmResult = await ElMessageBox.confirm(
+// t('searchOrder.partasks'),
+// t('workOrder.prompt'),
+// {
+// confirmButtonText: t('workOrder.yes'),
+// cancelButtonText: t('workOrder.cancel'),
+// type: 'warning',
+// }
+// );
+// if (confirmResult === 'confirm') {
+// const response = await request.post('/cacheVerticalGlass/bigStorageCage/resetCage')
+// if (response.code === 200) {
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
+// } catch (error) {
+// }
+// };
// 璀︽姤纭
const handleSure = async (row) => {
try {
@@ -1040,6 +1048,7 @@
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
parseAndSetTime();
+ selectGong()
});
onUnmounted(() => {
if (socket) {
@@ -1191,7 +1200,7 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="warning" @click="handleganghua">{{ $t('searchOrder.temperingqueries') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisibles=true;fetchFlows()">{{ $t('searchOrder.searchlayout') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
+ <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
<div id="dotClass">
--
Gitblit v1.8.0