From 2800fa4f32f3900509cb4d6eefaf2bfaf54efdd7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:29:09 +0800
Subject: [PATCH] fix: 天气显示
---
src/components/DeviceJobDetails/DeviceJobDetails.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/components/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
index 007edb7..3accea9 100644
--- a/src/components/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -18,13 +18,13 @@
<div v-for="(item, index) in infoList" :key="index">
<div class="itemBox">
<div class="itemTitle">{{ item.name }}：</div>
- <div class="itemValue">{{ item.value ? item.value : '' }}</div>
+ <div class="itemValue">{{ item.value ? item.value : '--' }}</div>
</div>
</div>
</div>
<div class="itemBoxRight">
<div class="itemTitle">关联算法：</div>
- <div class="itemValue">{{ flystatus ? flystatus :'' }}</div>
+ <div class="itemValue">{{ flystatus ? flystatus : '' }}</div>
</div>
</div>
<JobRelatedEvents v-if="props.wayLineJodInfoId" />
@@ -69,14 +69,14 @@
import DeviceJobDetailsMap from './DeviceJobDetailsMap.vue'
const isShow = defineModel('show')
const infoList = ref([
- { name: '任务编号', value: '', field: 'job info num' },
+ { name: '任务编号', value: '', field: 'job_info_num' },
{ name: '任务所属机巢', value: '', field: 'device_names' },
{ name: '任务名称', value: '', field: 'name' },
{ name: '所属单位', value: '', field: 'dept_name' },
{ name: '任务类型', value: '', field: 'industry_type_str' },
- { name: '任务时间', value: '', field: 'begin_time' + ' - ' + 'end_time' },
+ { name: '任务时间', value: '', field: 'cycle_time_value' },
{ name: '飞行事件', value: '', field: 'event_number' },
- { name: '任务频次', value: '', field: 'rep_rule_type' + ' - ' + 'rep_rule_val' },
+ { name: '任务频次', value: '', field: 'rep_rule_type rep_rule_val' },
{ name: '任务描述', value: '', field: 'remark' },
])
// 机巢状态
@@ -103,9 +103,8 @@
const achievementList = ref([])
const props = defineProps(['wayLineJodInfoId'])
-const wayLineJodInfoId = computed(()=> props.wayLineJodInfoId)
-provide('wayLineJodInfoId',wayLineJodInfoId)
-
+const wayLineJodInfoId = computed(() => props.wayLineJodInfoId)
+provide('wayLineJodInfoId', wayLineJodInfoId)
const getAchievement = () => {
getJobInfoFiles({ jobInfoId: wayLineJodInfoId.value }).then(res => {
@@ -124,13 +123,16 @@
const getDetails = () => {
getJobDetails({ wayLineJobInfoId: wayLineJodInfoId.value }).then(res => {
detailsData.value = res.data.data
+
infoList.value.forEach(item => {
- 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 ===undefined ? '' : detailsData.value.rep_rule_type + ' -- ' + detailsData.value.rep_rule_val
+ // if (item.name === '任务时间') {
+ // item.value = detailsData.value.begin_time.slice(0, 10) + '-' + detailsData.value.end_time.slice(0, 10)
+ // } else
+ if (item.name === '任务频次') {
+ const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
+ item.value = rep_rule_type + ' -- ' + rep_rule_val
} else {
- item.value = detailsData.value?.[item.field] || ''
+ item.value = detailsData.value?.[item.field] || '--'
}
})
flystatus.value = res.data.data.ai_type_str
@@ -228,6 +230,9 @@
margin-bottom: 24px;
}
}
+ .itemBoxLeft > :last-child:nth-child(odd) {
+ grid-column: 1 / -1;
+ }
.itemTitle {
color: #fff;
}
--
Gitblit v1.9.3