From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 84 +++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index f411b80..f87eb50 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -4,7 +4,6 @@
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
-
const adjustedRects = ref([]);
const currentGlassId = ref(null);
const currenttemperingFeedSequence = ref(null);
@@ -13,16 +12,13 @@
const dialogFormVisible = ref(true)
const dialogFormVisiblea = ref(false)
const blind = ref(false)
-
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
break
}
case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
}
@@ -33,10 +29,8 @@
if (data.overGlass && data.overGlass.length > 0) {
// 鎻愬彇鏂扮殑鐭╁舰ID
const newGlassIds = new Set(data.overGlass[0].map(rect => rect.glassId));
-
// 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
const existingRects = adjustedRects.value.filter(rect => newGlassIds.has(rect.glassId));
-
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.overGlass[0].map(rect => {
const scaleFactor = 1390/5190;
@@ -67,8 +61,7 @@
widtha: rect.width,
heighta: rect.height,
}
- });
-
+ });
// 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
adjustedRects.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
@@ -113,8 +106,7 @@
} else if (currentRect.value.state !== 8) {
canSelectProject.value = true;
}
-}
-
+}
const handleDialogClose = () => {
adjustedRects.value.forEach(rect => {
rect.isActive = false;
@@ -126,7 +118,6 @@
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
status: 8,
workingProcedure: '閽㈠寲',
@@ -136,12 +127,10 @@
blind.value = false;
updateRectColors();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -158,30 +147,28 @@
closeWebSocket();
});
</script>
-
<template>
<div style="height: 500px;">
<div style="margin-top: 10px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;"
- v-loading="loading">
- <!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
- <div v-if="adjustedRects.length > 0">
- <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{
- adjustedRects[0].temperingLayoutId
- }}
- </div>
- <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
- <div style="position: relative;">
- <div
- v-for="(rect, index) in adjustedRects"
- :key="index"
- @click="showDialog(rect)"
- class="rect"
- :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`,
- width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
- }">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;"
+ v-loading="loading">
+ <div v-if="adjustedRects.length > 0">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{
+ adjustedRects[0].temperingLayoutId
+ }}
+ </div>
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
+ <div style="position: relative;">
+ <div
+ v-for="(rect, index) in adjustedRects"
+ :key="index"
+ @click="showDialog(rect)"
+ class="rect"
+ :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`,
+ width: `${rect.width}px`, height: `${rect.height}px`,
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
+ }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
<div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
@@ -189,20 +176,18 @@
</div>
</div>
</div>
- </el-scrollbar>
- </div>
- </el-card>
- </div>
- <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage"
- style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- </el-dialog>
- </div>
+ </el-scrollbar>
</div>
+ </el-card>
+ </div>
+ <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
+ <el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
+ {{ $t('order.dilapidation') }}
+ </el-button>
+ </el-dialog>
+</div>
+</div>
</template>
-
<style scoped>
#boxa{
border: 1px solid rgb(119, 116, 116);
@@ -215,14 +200,13 @@
}
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+ background-color: lightblue;
}
.centered-text {
- /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
/* display: flex; */
- justify-content: center;
- align-items: center;
- height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
+ justify-content: center;
+ align-items: center;
+ height: 100%;
font-size: small;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0