From 3c5a06b1fe06a30207da0f6dedf2dff99f1899d2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 22 Jan 2026 16:00:25 +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 | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/index.vue b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
index 945ec30..ec9cbf8 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/index.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
@@ -12,26 +12,29 @@
</view>
</view>
</view>
- <u-search v-model="formParams.flightPlanName" :bgColor="'white'" :show-action="true" actionText="搜索" :animation="true" @custom="handleSearch"></u-search>
- <view class="content">
- <view class="sp-title">
- 审批记录
- </view>
- <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
- <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
- <view class="name-status">
- <view class="name-image">
- <u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
- <view class="name">{{approvalRecord.flightPlanName}}</view>
- </view>
- <view class="status">{{approvalRecord.planStatus || '无状态'}}</view>
- </view>
- <view class="txt">飞行设备：{{approvalRecord.device || '无设备'}}</view>
- <view class="txt">行政区划：{{approvalRecord.area || '无行政区划'}}</view>
- <view class="txt">飞行时间：{{approvalRecord.time || '无飞行时间'}}</view>
+ <!-- <view class="search-content"> -->
+ <u-search v-model="formParams.flightPlanName" :bgColor="'white'" :show-action="true" actionText="搜索" :animation="true" @custom="handleSearch"></u-search>
+ <view class="content">
+ <view class="sp-title">
+ 审批记录
</view>
- </u-list>
- </view>
+ <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
+ <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex" @click="handleClick(approvalRecord)">
+ <view class="name-status">
+ <view class="name-image">
+ <u-image :src="spSvg" class="icon" width="16" height="16"></u-image>
+ <view class="name">{{approvalRecord.flightPlanName}}</view>
+ </view>
+ <view class="status">{{approvalRecord.planApprovalStatus || ''}}</view>
+ </view>
+ <view class="txt">飞行器：{{approvalRecord.device || ''}}</view>
+ <view class="txt">飞行任务：{{approvalRecord.flightTaskType || ''}}</view>
+ <view class="txt">飞行起飞时间：{{approvalRecord.actualTakeoffTime || ''}}</view>
+ <view class="txt">飞行降落时间：{{approvalRecord.actualLandingTime || ''}}</view>
+ </view>
+ </u-list>
+ </view>
+ <!-- </view> -->
</view>
</template>
<script setup>
@@ -109,13 +112,16 @@
</script>
<style scoped lang="scss">
.flightApplication {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow-y: hidden;
.header-top {
- width: 100%;
- height: 280rpx;
+ height: 480rpx;
background: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/images/fxsq-bg.png") no-repeat ;
background-size: 100%;
- position: fixed;
- top: 0;
+ position: relative;
.ht-content {
position: absolute;
bottom: -40rpx;
@@ -131,7 +137,7 @@
flex: 1;
max-width: 350rpx;
height: 166rpx;
- background: rgba(251,253,255,0.39);
+ background: rgba(251,253,255,0.57);
box-shadow: inset 0px 0px 7px 0px rgba(64,156,230,0.14), 0px 1px 3px 0px rgba(35,49,96,0.11);
border-radius: 8px 8px 8px 8px;
border: 1px solid #fff;
@@ -153,18 +159,11 @@
}
}
:deep(.u-search) {
- position: absolute;
- width: 90%;
- left: 50%;
- transform: translateX(-50%);
- top: 350rpx !important;
+ padding: 10px 20px;
height: 68rpx;
- flex: 0;
+ margin-top: 50rpx !important;
}
.content {
- position: absolute;
- top: 450rpx !important;
- bottom: 0;
background: white;
width: 100%;
display: flex;
--
Gitblit v1.9.3