From 43d86830f4696c3ba2250a961d26377e1ff6cc32 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 10:39:43 +0800
Subject: [PATCH] 1、 查询是否除膜优化
---
UI-Project/src/views/hollow/hollowequipment.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 6f71f4b..7f4dd08 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -992,9 +992,8 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
-import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance ,toRaw } 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()
@@ -1084,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);
@@ -1469,6 +1468,9 @@
function nestedTableRowClassName(parentRow, row) {
if (parentRow.isThroughSlot == true) {
return 'row-red-background';
+ }
+ if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+ return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
}
return '';
}
@@ -1885,7 +1887,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] = {
@@ -1898,6 +1902,7 @@
return map;
}, {});
listFlow.value = Object.values(summary);
+ console.log(listFlow.value)
blinde.value = true;
getTags();
hiprint.init();
@@ -1949,6 +1954,7 @@
value: null,
size: null
})
+
</script>
<style scoped>
#dt {
@@ -2011,4 +2017,9 @@
.el-loading-mask {
z-index: 2000 !important;
}
+/* 鏍稿績3锛氭坊鍔犺鍙樿壊鏍峰紡锛岄�氳繃:deep绌块�弒coped */
+:deep(.sum-equal-pair-row) {
+ background-color: #fdf2e8 !important; /* 娴呮搴曡壊锛屽彲鑷淇敼 */
+ color: #e64340 !important; /* 鏂囧瓧鑹诧紝鍙�� */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0