From 9ea7e2fb231db817d16c1c5158ba9adb6dba73c7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 13 五月 2025 14:26:31 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowaluminumthree.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowaluminumthree.vue b/UI-Project/src/views/hollow/hollowaluminumthree.vue
index ca38b90..c0614f2 100644
--- a/UI-Project/src/views/hollow/hollowaluminumthree.vue
+++ b/UI-Project/src/views/hollow/hollowaluminumthree.vue
@@ -119,8 +119,8 @@
const getColorByState = (state) => {
switch (state) {
case -2: return "gray";
- case -1: return "#99BBFF";
- case 0: return "#7AC5CD";
+ case -1: return "gray";
+ case 0: return "gray";
case 1: return "#95d475";
case 8: return "#911005";
default: return "#CDAF95";
@@ -136,12 +136,13 @@
<el-carousel ref="carouselRef" :active-index="activeIndex" @change="handleCarouselChange" height="750px"
:autoplay="false">
<el-carousel-item v-for="(item, index) in carouselData" :key="index">
+ <div style="display: flex; justify-content: center; align-items: flex-end; height: 100%; padding-bottom: 50px;">
<div class="carousel-item-content" :style="{
width: `${item.width*0.5}px`,
height: `${item.height*0.3}px`,
backgroundColor: getColorByState(item.state),
}">
- <div style="color: #090909;">
+ <div style="color: #FAFCFF;font-size:18px; text-align: center; display: flex; flex-direction: column; justify-content: center; height: 87%;">
<p>{{ item.flowCardId }}</p>
<p>{{ $t('basicData.widtha') }}{{ item.width }}</p>
<p>{{ $t('basicData.heighta') }}{{ item.height }}</p>
@@ -149,10 +150,13 @@
<p>{{ $t('hellow.logarithm') }}{{ item.hollowSequence }}</p>
</div>
<div>
- <el-button type="text" @click="handleDilapidationClick(item)">{{ $t('order.dilapidation') }}</el-button>
- <el-button type="text" :disabled="item.state === 1" @click="handleButtonClick(item)">{{ $t('basicData.yes') }}</el-button>
+ <div style="position: absolute; bottom: 20px; right: 20px;">
+ <el-button size="large" @click="handleDilapidationClick(item)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button size="large" :disabled="item.state === 1" @click="handleButtonClick(item)">{{ $t('basicData.yes') }}</el-button>
</div>
</div>
+ </div>
+ </div>
</el-carousel-item>
</el-carousel>
</div>
@@ -183,6 +187,8 @@
color: white;
/* 纭繚鏂囧瓧棰滆壊鍙 */
text-align: center;
+ padding-bottom: 0px;
+ box-sizing: border-box;
}
.demonstration {
color: var(--el-text-color-secondary);
--
Gitblit v1.8.0