From 5ed955abeec76c4b12f1d0a066780f2039c24c9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 十二月 2025 14:47:19 +0800
Subject: [PATCH] 1、英文补充
---
UI-Project/src/views/hollow/hollowequipment.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 3465d69..bbf418b 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.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">
@@ -719,7 +719,7 @@
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="finisha">
+ <el-button type="primary" @click="finisha" :disabled="isSubmitting">
{{ $t('reportWork.sure') }}
</el-button>
<el-button @click="dialogFormVisiblec = false">{{ $t('reportWork.cancel') }}</el-button>
@@ -780,7 +780,7 @@
<el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="80" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
- <el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain :disabled="scope.row.glassId==null" @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}{{ }}</el-button>
</template>
</el-table-column>
<div style="float: right;margin-bottom: 5px;">
@@ -994,7 +994,6 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance } from "vue";
import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
@@ -1047,18 +1046,17 @@
const intervalFrameWidthFour = ref('')
const sealInsert = ref('')
const totalPages = ref(0)
-
const pageList = ref([]);
const allData = ref({});
const currentData = ref([]);
const flowCardId = ref('')
-
const freeone = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
const dialogFormVisiblee = ref(false)
+const isSubmitting = ref(false)
const add = ref(false)
const adda = ref(false)
const currentRow = reactive({});
@@ -1085,7 +1083,7 @@
}
]
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassOne`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassOne`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
window.localStorage.setItem('currentPage', newVal);
@@ -1095,14 +1093,20 @@
currentPage.value = newPage;
};
const handleMessage = (data) => {
+ 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();
@@ -1394,6 +1398,7 @@
const handletake = (row) => {
window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
+ isSubmitting.value = false
fetchmulan()
};
// 寮哄埗鍑虹墖
@@ -1823,9 +1828,13 @@
cell.value = '';
formulaName.value = '';
totalPairQuantity.value = '';
+ isSubmitting.value = true
} else {
+ ElMessage.error(response.message);
+ isSubmitting.value = true
}
} catch (error) {
+ ElMessage.error(response.message);
}
}
// 寮哄埗鍑虹墖
@@ -1875,7 +1884,9 @@
const blinde = ref(false)
const labelPrint = ref(false);
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] = {
@@ -1888,6 +1899,7 @@
return map;
}, {});
listFlow.value = Object.values(summary);
+ console.log(listFlow.value)
blinde.value = true;
getTags();
hiprint.init();
@@ -1967,23 +1979,15 @@
margin-top: 20px;
margin-bottom: 10px;
}
-
::v-deep(.row-red-background) {
background-color: rgb(224.6, 242.8, 215.6) !important;
}
.custom-page-buttons {
display: flex;
gap: 10px;
- margin-top: 20px;
-}
-
-.custom-page-buttons {
- display: flex;
- gap: 10px;
margin: 20px 0;
flex-wrap: wrap;
}
-
.page-btn {
padding: 8px 16px;
min-width: 40px;
@@ -1993,11 +1997,9 @@
cursor: pointer;
transition: all 0.3s;
}
-
.page-btn:hover {
background: #e6f1ff;
}
-
.page-btn.active-page {
background: #409eff;
color: white;
--
Gitblit v1.8.0