From 1328040419e281c2d3418f27758c26adc14dab87 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 20 八月 2024 16:04:30 +0800
Subject: [PATCH] 恢复代码
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 290 ++++++++++++++++++---------------------------------------
1 files changed, 94 insertions(+), 196 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 53f6d84..3d790cf 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -13,10 +13,7 @@
const dialogFormVisible = ref(false)
const dialogFormVisiblea = ref(true)
const dialogFormVisibleb = ref(false)
-const blind1 = ref(false)
-const blind2 = ref(false)
-const blinda = ref(false)
-const blindb = ref(false)
+const blind = ref(false)
const width = ref();
const height = ref();
const adjustedRects1 = ref([]);
@@ -26,10 +23,12 @@
const currentGlassId = ref(null);
const currenttemperingFeedSequence = ref(null);
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
-const handleMessage = (data) => {
- if (data.intoGlass2 && data.intoGlass2.length > 0) {
- const newRects = data.intoGlass2[0].map(rect => {
- const scaleFactor = 794.67/5087;
+const handleMessage = (data) => {
+// 杩涚倝涓�
+ if(data.intoGlass2!=null){
+ adjustedRects2.value = data.intoGlass2[0].map(rect => {
+ isActive: false
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -60,20 +59,15 @@
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
+ };
+ });
+ }else{
+ adjustedRects1.value = ''
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects2.value = adjustedRects2.value.map(oldRect => {
- const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- if (newRect) {
- return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- }
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRects2.value.some(o => o.glassId === r.glassId)));
- }
- if (data.intoGlass && data.intoGlass.length > 0) {
- const newRects = data.intoGlass[0].map(rect => {
- const scaleFactor = 794.67/5087;
+ if(data.intoGlass!=null){
+ adjustedRects1.value = data.intoGlass[0].map(rect => {
+ isActive: false
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -104,20 +98,16 @@
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
+ };
+ });
+ }else{
+ adjustedRects2.value = ''
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects1.value = adjustedRects1.value.map(oldRect => {
- const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- if (newRect) {
- return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- }
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRects1.value.some(o => o.glassId === r.glassId)));
- }
- if (data.waitingGlass && data.waitingGlass.length > 0) {
- const newRects = data.waitingGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+ // 杩涚倝鍓�
+ if(data.waitingGlass!=null){
+ adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ isActive: false
+ const scaleFactor = 1621.78/5190;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -148,20 +138,16 @@
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
- }
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRectsa.value = adjustedRectsa.value.map(oldRect => {
- const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- if (newRect) {
- return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- }
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRectsa.value.some(o => o.glassId === r.glassId)));
- }
- if (data.outGlass && data.outGlass.length > 0) {
- const newRects = data.outGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+ };
+});
+ }else{
+ adjustedRectsa.value = ''
+ }
+ // 宸插嚭鐐�
+ if(data.outGlass!=null){
+ adjustedRectsb.value = data.outGlass[0].map(rect => {
+ isActive: false
+ const scaleFactor = 1621.78/5190;
const scaleFactory = 550/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
let newX = rect.yCoordinate;
@@ -195,18 +181,12 @@
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
- }
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRectsb.value = adjustedRectsb.value.map(oldRect => {
- const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- if (newRect) {
- return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- }
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRectsb.value.some(o => o.glassId === r.glassId)));
- }
-};
+ };
+});
+ }else{
+ adjustedRectsb.value = ''
+ }
+};
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
});
@@ -239,68 +219,70 @@
return '#911005';
}
}
-function showDialog1(rect) {
- const index = adjustedRects1.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRects1.value[index].isActive = true;
- }
+// if (adjustedRectsb[0].engineerId != null) {
+// engineerIdDisplayb = adjustedRectsb[0].engineerId
+// }
+// if (adjustedRectsa[0].engineerId != null) {
+// engineerIdDisplaya = adjustedRectsa[0].engineerId
+// }
+// if (adjustedRects2[0].engineerId != null) {
+// engineerIdDisplay2 = adjustedRects2[0].engineerId
+// }
+// if (adjustedRects[0].engineerId != null) {
+// engineerIdDisplay = adjustedRects[0].engineerId
+// }
+function showDialog1(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blind1.value = true;
+ blind.value = true;
+ adjustedRects1.value = adjustedRects1.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
}
-function showDialog2(rect) {
- const index = adjustedRects2.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRects2.value[index].isActive = true;
- }
+function showDialog2(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blind2.value = true;
+ blind.value = true;
+ adjustedRects2.value = adjustedRects2.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
}
-function showDialoga(rect) {
- const index = adjustedRectsa.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRectsa.value[index].isActive = true;
- }
+function showDialoga(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blinda.value = true;
+ blind.value = true;
+ adjustedRectsa.value = adjustedRectsa.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
}
-function showDialogb(rect) {
- const index = adjustedRectsb.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRectsb.value[index].isActive = true;
- }
+function showDialogb(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blindb.value = true;
+ blind.value = true;
+ adjustedRectsb.value = adjustedRectsb.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
}
- const handleDialogClose1 = () => {
- adjustedRects1.value.forEach(rect => {
- rect.isActive = false;
- });
- blind1.value = false;
-};
- const handleDialogClose2 = () => {
- adjustedRects2.value.forEach(rect => {
- rect.isActive = false;
- });
- blind2.value = false;
-};
- const handleDialogClosea = () => {
- adjustedRectsa.value.forEach(rect => {
- rect.isActive = false;
- });
- blinda.value = false;
-};
- const handleDialogCloseb = () => {
- adjustedRectsb.value.forEach(rect => {
- rect.isActive = false;
- });
- blindb.value = false;
-};
+const handleDialogClose = () => {
+ adjustedRects1.value = adjustedRects1.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+ // adjustedRects2.value = adjustedRects2.value.map(rect => ({
+ // ...rect,
+ // isActive: false
+ // }));
+ // adjustedRectsa.value = adjustedRectsa.value.map(rect => ({
+ // ...rect,
+ // isActive: false
+ // }));
+ adjustedRectsb.value = adjustedRectsb.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+}
// 鐮存崯
-const handleDamage1 = async () => {
+const handleDamage = async () => {
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
@@ -311,76 +293,7 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- blind1.value = false;
- updateRectColors();
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-const handleDamage2 = async () => {
- try {
- const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
- glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
- line: 4001,
- status: 2,
- workingProcedure: '閽㈠寲',
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blind2.value = false;
- updateRectColors();
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-const handleDamagea = async () => {
- try {
- const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
- glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
- line: 4001,
- status: 2,
- workingProcedure: '閽㈠寲',
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blinda.value = false;
- updateRectColors();
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-}
-const handleDamageb = async () => {
- try {
- const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
- glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
- line: 4001,
- status: 2,
- workingProcedure: '閽㈠寲',
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- blindb.value = false;
+ blind.value = false;
updateRectColors();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -518,23 +431,8 @@
</el-card>
</div>
-<el-dialog v-model="blind1" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose1">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage1" style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- </el-dialog>
-<el-dialog v-model="blind2" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose2">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage2" style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- </el-dialog>
-<el-dialog v-model="blinda" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClosea">
- <el-button type="warning" plain :icon="Delete" @click="handleDamagea" style="width: 140px;margin-left: 10px;">
- {{ $t('order.dilapidation') }}
- </el-button>
- </el-dialog>
-<el-dialog v-model="blindb" top="30vh" width="15%" style="text-align: center;" @close="handleDialogCloseb">
- <el-button type="warning" plain :icon="Delete" @click="handleDamageb" style="width: 140px;margin-left: 10px;">
+<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
+ <el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
</el-dialog>
--
Gitblit v1.8.0