From aebc5d85da25b3b352dba1ceb76bacf3f464382b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 四月 2025 17:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingun.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index d32fb1b..5cfea5c 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -33,7 +33,12 @@
}
tableDataa.value = data.EdgStorageCageinfos[0]
tableDatab.value = data.taskMessage
-};
+ 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() {
@@ -351,9 +356,9 @@
<el-table-column prop="thickness" align="center" min-width="80" />
<el-table-column fixed="right" align="center" width="150">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
- <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
- <el-button size="mini" type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
+ <el-button type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
+ <el-button type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
+ <el-button type="text" plain @click="handledelete(scope.row)">{{ $t('searchOrder.delete')}} </el-button>
</template>
</el-table-column>
</el-table>
@@ -401,12 +406,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 style="position: relative; width: 500px;height: 95px;margin-top: -222px;margin-left: 600px;">
<div
v-for="(rect, index) in adjustedRects"
+ 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'
}"
>
@@ -415,7 +421,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="71%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0