From 4e69efb1643aa02dfab3f0a3ebf2f7236bdb747a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 25 十二月 2024 09:59:30 +0800
Subject: [PATCH] 钢化版图更改顺序
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 54 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index d4664dc..41e5537 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -1278,60 +1278,7 @@
<div v-if="dialogFormVisible">
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 1000px;"
v-loading="loading">
- <div style="width: 845px;float: right;background-color: #f4f4f5;height: 430px;">
- <div v-if="adjustedRects1.length > 0">
- <!-- <div style="text-align: center;">鐐夊彿1锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
- <el-scrollbar height="430px" style="background-color: #e9e9eb;">
- <div style="position: relative;">
- <div
- v-for="(rect, index) in adjustedRects1"
- :key="index"
- @click="showDialog1(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' : getRectColor1(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>
- <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
- </div>
- </div>
- </div>
- </el-scrollbar>
- </div>
- </div>
- <div style="width: 845px;float: left;background-color: #f4f4f5;height: 430px;">
- <div v-if="adjustedRects2.length > 0">
- <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
- <!-- <div style="text-align: center;">鐐夊彿2锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="430px" style="background-color: #e9e9eb;">
- <div style="position: relative;max-width: 1400px;">
- <div
- v-for="(rect, index) in adjustedRects2"
- :key="index"
- @click="showDialog2(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' : getRectColor2(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>
- <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
- </div>
- </div>
- </div>
- </el-scrollbar>
- </div>
- </div>
+
<div style="width: 845px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">
<div v-if="adjustedRects3.length > 0">
<!-- <div style="text-align: center;">鐐夊彿3锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
@@ -1386,6 +1333,60 @@
</el-scrollbar>
</div>
</div>
+ <div style="width: 845px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">
+ <div v-if="adjustedRects1.length > 0">
+ <!-- <div style="text-align: center;">鐐夊彿1锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
+ <div style="position: relative;">
+ <div
+ v-for="(rect, index) in adjustedRects1"
+ :key="index"
+ @click="showDialog1(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' : getRectColor1(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>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+ </div>
+ <div style="width: 845px;float: left;background-color: #f4f4f5;height: 430px;margin-top: 20px;">
+ <div v-if="adjustedRects2.length > 0">
+ <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿2锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
+ <div style="position: relative;max-width: 1400px;">
+ <div
+ v-for="(rect, index) in adjustedRects2"
+ :key="index"
+ @click="showDialog2(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' : getRectColor2(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>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ </div>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+ </div>
</el-card>
</div>
<div v-if="dialogFormVisiblea">
--
Gitblit v1.8.0