From 963dc5dd7b480376e1da6893ee30183dbd5bef50 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 三月 2025 14:43:06 +0800
Subject: [PATCH] 大屏更改按钮样式
---
UI-Project/src/views/Identify/identify.vue | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 7a82929..969553b 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -23,13 +23,14 @@
class="rect"
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.yaxis}px`, left: `${rect.xaxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
+ top: `${rect.yaxisa}px`, left: `${rect.xaxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}"
>
<div class="centered-text">
- <div>{{ rect.glassId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -152,19 +153,22 @@
var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + 1;
const response = await request.post(url)
if (response.code === 200) {
+
const rawRects = response.data.currentCutDrawing;
rawData.value = response.data;
totalPages.value = response.data.totalPatternSequence;
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
- adjustedRects.value = rawRects.map(rect => ({
+ adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxis: rect.yaxis * scaleFactory,
- width: rect.edgWidth * scaleFactor ,
+ xaxisa: rect.xaxis * scaleFactor * 1.1,
+ yaxisa: (3300 - (rect.yaxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
+ // xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ // yaxisa: rect.yaxis * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory,
+ height: rect.edgHeight * scaleFactory * 1.1,
state: rect.state
}));
currentPage.value = 1;
@@ -182,30 +186,36 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxis: rect.yaxis * scaleFactory,
- width: rect.edgWidth * scaleFactor ,
+ xaxisa: rect.xaxis * scaleFactor * 1.1,
+ yaxisa: (3300 - (rect.yaxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory,
+ height: rect.edgHeight * scaleFactory * 1.1,
state: rect.state
}));
}
};
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
const optionsb = [
@@ -235,7 +245,7 @@
justify-content: center;
align-items: center;
height: 100%;
- font-size: small;
+ /* font-size: large; */
}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
--
Gitblit v1.8.0