From 3f435173d4aa85d4cc1b2ce27aae81f3e5b042ea Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 21 Apr 2025 17:33:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/command-center-dashboard into feature_1.0.0
---
src/components/DeviceJobDetails/DeviceJobDetails.vue | 14 ++++++++------
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 3 ++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/components/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
index 4f432ca..3accea9 100644
--- a/src/components/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -18,7 +18,7 @@
<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>
@@ -74,7 +74,7 @@
{ 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: 'remark' },
@@ -123,14 +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 === '任务频次') {
+ // 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
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 860834d..591a78a 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -107,7 +107,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="industry_type_str" label="任务类型" />
- <el-table-column prop="begin_time" label="任务时间" width="150" />
+ <el-table-column prop="cycle_time_value" label="任务时间" width="150" />
<el-table-column prop="event_number" label="关联事件">
<template #default="scope">
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
@@ -241,6 +241,7 @@
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
+
})
}
// 机巢列表数据
--
Gitblit v1.9.3