From 77ec4c2a6f2a39968ad947cb731a99afe2bac611 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 10 四月 2025 14:52:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Caching/cachingbefore.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 3ec1940..ddc46f0 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -34,12 +34,12 @@
}
tableDataa.value = data.EdgStorageCageinfos[0]
tableDatab.value = data.taskMessage
- // adjustedRects.value = data.EdgStorageCageinfos[0].map(rect => ({
- // ...rect,
- // width: rect.width * 0.5 ,
- // id: rect.id * 10,
- // }));
-};
+ adjustedRects.value = data.EdgStorageCageinfos[0].map((rect, index) => ({
+ ...rect,
+ id: rect.id * 9,
+ showRect: !!data.EdgStorageCageinfos[0][index]?.details[0]
+ }));
+ };
// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
@@ -424,12 +424,13 @@
</el-card>
<div class="awatch">
<img src="../../assets/woshihuancun.png" alt="" style="width: 50%;height: 70%;margin-left: 30%;margin-top: 20px;position: relative;">
- <div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
- <div
+ <div style="position: relative; width: 500px;height: 95px;margin-top: -142px;margin-left: 600px;">
+ <div
v-for="(rect, index) in adjustedRects"
- :key="rect"
+ v-show="rect.showRect"
+ :key="rect"
:style="{ position: 'absolute',
- top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
+ top: `${rect.id}px`, left: `10px`, width: `422px`, height: `3px`,
backgroundColor: '#409EFF'
}"
>
--
Gitblit v1.8.0