From a7729ab954c949489fd6888fdecdd361d617c39e Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Apr 2025 08:33:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/components/DeviceJobDetails/DeviceJobDetails.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
index 007edb7..0b219d6 100644
--- a/src/components/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -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: 'event_number' },
- { name: '任务频次', value: '', field: 'rep_rule_type' + ' - ' + 'rep_rule_val' },
+ { name: '任务频次', value: '', field: 'rep_rule_type rep_rule_val' },
{ name: '任务描述', value: '', field: 'remark' },
])
// 机巢状态
@@ -128,7 +128,8 @@
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
+ const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
+ item.value = rep_rule_type + ' -- ' + rep_rule_val
} else {
item.value = detailsData.value?.[item.field] || ''
}
--
Gitblit v1.9.3