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 | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/src/views/odm/task.vue b/src/views/odm/task.vue
index aa0eaa0..a09e7d3 100644
--- a/src/views/odm/task.vue
+++ b/src/views/odm/task.vue
@@ -143,8 +143,8 @@
},
],
change: (value) => {
- this.searchChange({ ...this.query,waylineType:value.value}, () => {});
- }
+ this.searchChange({ ...this.query,waylineType:value.value}, () => {});
+ }
},
{
label: '机场名称',
@@ -171,27 +171,27 @@
width: 100,
labelWidth: 130,
},
-{
- label: '任务状态',
- prop: 'status',
- type: 'select',
- search: true,
- 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 },
- ],
- change: (value) => {
- this.searchChange({ ...this.query,status:value.value}, () => {});
- }
-},
+ {
+ label: '任务状态',
+ prop: 'status',
+ type: 'select',
+ search: true,
+ 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 },
+ ],
+ change: (value) => {
+ this.searchChange({ ...this.query,status:value.value}, () => {});
+ }
+ },
{
label: '任务创建时间',
@@ -217,11 +217,9 @@
searchLabelWidth: 100,
//valueFormat: 'YYYY-MM-DD',
width: 160,
- change: (value) => {
- console.log('value',value);
-
- this.searchChange({ ...this.query,completedTime:value.value}, () => {});
- }
+ change: (value) => {
+ this.searchChange({ ...this.query,completedTime:value.value}, () => {});
+ }
},
],
},
--
Gitblit v1.9.3