From e48e130516dea7aaf8c5967f81cc8bb5bf863667 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 15 一月 2025 10:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 344292b..bc22be8 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -896,8 +896,8 @@
:style="{ position: 'absolute',
top: `${rect.y}px`,
left: `${rect.x}px`,
- width: `${rect.width}px`,
- height: `${rect.height}px`,
+ width: `${rect.widtha}px`,
+ height: `${rect.heighta}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -924,8 +924,8 @@
:style="{ position: 'absolute',
top: `${rect.y}px`,
left: `${rect.x}px`,
- width: `${rect.width}px`,
- height: `${rect.height}px`,
+ width: `${rect.widtha}px`,
+ height: `${rect.heighta}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -962,7 +962,7 @@
@click="showDialoga(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
- width: `${rect.width}px`, height: `${rect.height}px`,
+ width: `${rect.widtha}px`, height: `${rect.heighta}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -989,7 +989,7 @@
@click="showDialogb(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
- width: `${rect.width}px`, height: `${rect.height}px`,
+ width: `${rect.widtha}px`, height: `${rect.heighta}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }">
<!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
<div class="centered-text">
--
Gitblit v1.8.0