From 6c0eaf8a5698e8fc9ea2f0dbccda7d48838c8c1a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 18:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
index e40f4c2..d4cc8c7 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetails.vue
@@ -1,4 +1,4 @@
-<!-- 任务详情 -->
+<!-- 历史任务详情 -->
<template>
<el-dialog
class="ztzf-dialog"
@@ -24,7 +24,7 @@
</div>
<div class="itemBoxRight">
<div class="itemTitle">关联算法：</div>
- <div class="itemValue">{{ flystatus }}</div>
+ <div class="itemValue">{{ flystatus ? flystatus :'' }}</div>
</div>
</div>
<JobRelatedEvents v-if="isShow" />
@@ -123,7 +123,7 @@
if (item.name === '任务时间') {
item.value = detailsData.value.begin_time.slice(0, 10) + '-' + detailsData.value.end_time.slice(0, 10)
} else if (item.name === '任务频次') {
- item.value = detailsData.value.rep_rule_type + ' -- ' + detailsData.value.rep_rule_val
+ item.value ===undefined ? '' : detailsData.value.rep_rule_type + ' -- ' + detailsData.value.rep_rule_val
} else {
item.value = detailsData.value?.[item.field] || ''
}
@@ -240,14 +240,16 @@
}
.imgListBox {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
+ display: grid;
+ grid-template-columns: repeat(5, 1fr);
gap: 10px;
-
- .imgItem {
- width: 200px;
- height: 200px;
- }
+ margin-bottom: 49px;
+ // .imgItem {
+ // width: 200px;
+ // height: 200px;
+ // }
}
}
--
Gitblit v1.9.3