From 0ef47a49fa6dce546be2d0f23b4949734e6a0cf9 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 29 Jan 2026 18:31:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-wx/src/subPackages/flightApplication/index.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/index.vue b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
index f060e70..d2a747b 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/index.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
@@ -29,10 +29,11 @@
{{ approvalRecord.planApprovalStatusLabel || ''}}
</view>
</view>
+ <view class="txt">计划起飞状态:{{approvalRecord.fly_activity_takeoff_status || ''}}</view>
<view class="txt">飞行器：{{approvalRecord.spacecraftLabel || '无'}}</view>
<view class="txt">飞行任务：{{approvalRecord.flightTaskTypeLabel || ''}}</view>
- <view class="txt">飞行起飞时间：{{approvalRecord.actualTakeoffTime || ''}}</view>
- <view class="txt">飞行降落时间：{{approvalRecord.actualLandingTime || ''}}</view>
+ <view class="txt">飞行起飞时间：{{approvalRecord.flightStartTime || ''}}</view>
+ <view class="txt">飞行降落时间：{{approvalRecord.flightEndTime || ''}}</view>
</view>
</u-list>
</view>
@@ -115,6 +116,7 @@
newData.forEach(item => {
item.spacecraftLabel = aircraftInfoList.value.find(info => info.value === item.spacecraftId)?.label || '无'
item.planApprovalStatusLabel = appStore.flyActivityStatus.find(status => status.dictValue === item.planApprovalStatus)?.dictLabel || '无'
+ item.flyActivityTakeoffStatusLabel = appStore.flyActivityTakeoffStatus.find(status => status.dictValue === item.planStatus)?.dictLabel || '无'
item.flightTaskTypeLabel = appStore.taskType.find(type => type.dictValue === item.flightTaskType)?.dictLabel || '无'
})
// 如果是第一页，直接替换数据；否则追加数据
--
Gitblit v1.9.3