From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/subPackages/flightApplication/index.vue | 118 +++++++++++++++++++++++-----------------------------------
1 files changed, 47 insertions(+), 71 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/index.vue b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
index 4a10046..ec3c256 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/index.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/index.vue
@@ -12,23 +12,25 @@
</view>
</view>
</view>
- <u-search :bgColor="'white'" :show-action="true" actionText="搜索" :animation="true"></u-search>
+ <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>
- <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex">
- <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>
+ <u-list :style="{ height: 'calc(100vh - 240rpx)' }" @scrolltolower="scrolltolower" :lower-threshold="50">
+ <view class="approvalRecord" v-for="(approvalRecord,approvalRecordIndex) in approvalRecords" :key="approvalRecordIndex">
+ <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="status">{{approvalRecord.planStatus || '无状态'}}</view>
+ <view class="txt">飞行设备：{{approvalRecord.device || '无设备'}}</view>
+ <view class="txt">行政区划：{{approvalRecord.area || '无行政区划'}}</view>
+ <view class="txt">飞行时间：{{approvalRecord.time || '无飞行时间'}}</view>
</view>
- <view class="txt">飞行设备：{{approvalRecord.device || '无设备'}}</view>
- <view class="txt">行政区划：{{approvalRecord.area || '无行政区划'}}</view>
- <view class="txt">飞行时间：{{approvalRecord.time || '无飞行时间'}}</view>
- </view>
+ </u-list>
</view>
</view>
</template>
@@ -54,65 +56,23 @@
}
// 审批记录是很多条
-const approvalRecords = ref([
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
- {
- flightPlanName: '飞行需求名称',
- planStatus: '申请中',
- device: '大疆无人机',
- area: '吉州区',
- time: '2026/01/07至2026/01/08',
- },
-])
+const approvalRecords = ref([])
+const formParams = ref({
+ current: 1,
+ size: 10,
+ flightPlanName: '',
+})
// 申请审批列表
const getApprovalRecords = async () => {
try {
- const res = await flightPlanPageInfoApi({
- current: 1,
- size: 10,
- })
- approvalRecords.value = res.data.data.records || []
+ const res = await flightPlanPageInfoApi(formParams.value)
+ const newData = res.data.data.records || []
+ // 如果是第一页，直接替换数据；否则追加数据
+ if (formParams.value.current === 1) {
+ approvalRecords.value = newData
+ } else {
+ approvalRecords.value = approvalRecords.value.concat(newData)
+ }
} catch (error) {
uni.showToast({
title: error.message,
@@ -120,6 +80,22 @@
duration: 2000,
})
}
+}
+// 搜索处理
+const handleSearch = () => {
+ // 搜索时重置为第一页
+ formParams.value.current = 1
+ formParams.value.flightPlanName = formParams.value.flightPlanName.trim()
+ getApprovalRecords()
+}
+// 触底加载
+function scrolltolower() {
+ formParams.value.current++
+ // 停止不刷新
+ if (approvalRecords.value.length < formParams.value.size) {
+ return
+ }
+ getApprovalRecords()
}
onMounted(() => {
getApprovalRecords()
@@ -129,9 +105,9 @@
.flightApplication {
.header-top {
width: 100%;
- height: 350rpx;
- background: url('@/static/images/fxsq-bg.png') no-repeat center;
- background-size: 100% 100%;
+ height: 280rpx;
+ 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;
.ht-content {
@@ -175,7 +151,7 @@
width: 90%;
left: 50%;
transform: translateX(-50%);
- top: 340rpx !important;
+ top: 350rpx !important;
height: 68rpx;
flex: 0;
}
--
Gitblit v1.9.3