From 7fdb8c4db95ffee41211671a9315993e94e2b573 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 17:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Identify/identify.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 461d622..969553b 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -161,8 +161,10 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
+ 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 ,
@@ -184,8 +186,8 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
+ 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 ,
@@ -196,18 +198,24 @@
};
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 = [
--
Gitblit v1.8.0