From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/odm/task.vue | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/src/views/odm/task.vue b/src/views/odm/task.vue
index 63e57f4..a09e7d3 100644
--- a/src/views/odm/task.vue
+++ b/src/views/odm/task.vue
@@ -76,7 +76,8 @@
prop: 'taskName',
search: true,
searchSpan: 4,
- labelWidth: 130,
+ searchLabelWidth: 100,
+ //labelWidth: 130,
searchPlaceholder: "任务名称",
rules: [
{
@@ -126,8 +127,9 @@
prop: 'waylineType',
type: 'select',
search: true,
- searchSpan: 3,
- width: 100,
+ searchSpan: 4,
+ searchLabelWidth: 100,
+ //width: 100,
labelWidth: 130,
searchPlaceholder: "任务类型",
dicData: [
@@ -140,13 +142,16 @@
value: 4,
},
],
+ change: (value) => {
+ this.searchChange({ ...this.query,waylineType:value.value}, () => {});
+ }
},
{
label: '机场名称',
prop: 'airportName',
- labelWidth: 130,
- search: true,
searchSpan: 4,
+ searchLabelWidth: 100,
+ //search: true,
},
{
label: '图片数量',
@@ -171,36 +176,21 @@
prop: 'status',
type: 'select',
search: true,
- searchSpan: 3,
- labelWidth: 130,
+ searchSpan: 4,
+ searchLabelWidth: 100,
searchPlaceholder: "任务状态",
width: 90,
dicData: [
- {
- label: '待启动',
- value: 0,
- },
- {
- label: '待处理',
- value: 10,
- },
- {
- label: '处理中',
- value: 20,
- },
- {
- label: '失败',
- value: 30,
- },
- {
- label: '已完成',
- value: 40,
- },
- {
- label: '已取消',
- value: 50,
- },
+ { label: '待启动', value: 0 },
+ { label: '待处理', value: 10 },
+ { label: '处理中', value: 20 },
+ { label: '失败', value: 30 },
+ { label: '已完成', value: 40 },
+ { label: '已取消', value: 50 },
],
+ change: (value) => {
+ this.searchChange({ ...this.query,status:value.value}, () => {});
+ }
},
{
@@ -215,7 +205,7 @@
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
{
- label: '飞行任务完成时间',
+ label: '完成时间',
prop: 'completedTime',
type: "date",
addDisplay: false,
@@ -224,9 +214,12 @@
labelWidth: 130,
search: true,
searchSpan: 4,
- searchLabelWidth: 130,
- valueFormat: 'YYYY-MM-DD',
+ searchLabelWidth: 100,
+ //valueFormat: 'YYYY-MM-DD',
width: 160,
+ change: (value) => {
+ this.searchChange({ ...this.query,completedTime:value.value}, () => {});
+ }
},
],
},
@@ -372,7 +365,7 @@
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange (params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
--
Gitblit v1.9.3