From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/odm/task.vue | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/src/views/odm/task.vue b/src/views/odm/task.vue
index 65ec9fb..a6d1744 100644
--- a/src/views/odm/task.vue
+++ b/src/views/odm/task.vue
@@ -60,6 +60,7 @@
<script>
import { getList, remove, update, add, createOdmTask, restartOdmTask } from '@/api/odm/task';
+import { tourStrategies } from 'element-plus';
import { mapGetters } from 'vuex';
export default {
@@ -96,6 +97,9 @@
label: '任务名称',
prop: 'taskName',
search: true,
+ searchSpan:4,
+ labelWidth: 130,
+ searchPlaceholder:"任务名称",
rules: [
{
required: true,
@@ -105,9 +109,10 @@
],
},
{
- label: '任务编号',
- prop: 'taskId',
- hide: true,
+ label: '地块编号',
+ prop: 'dkbh',
+ labelWidth: 130,
+ // hide:true,
rules: [
{
required: true,
@@ -117,11 +122,36 @@
],
},
{
+ label: '任务编号',
+ prop: 'taskId',
+ hide: true,
+ labelWidth: 130,
+ rules: [
+ {
+ required: true,
+ message: '请输入任务编号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '飞行任务编号',
+ prop: 'waylineJobId',
+ addDisplay: false,
+ editDisplay: false,
+ hide:true,
+ labelWidth: 130,
+ width: 160,
+ },
+ {
label: '任务类型',
prop: 'waylineType',
type: 'select',
search: true,
- searchSpan: 4,
+ searchSpan: 3,
+ width: 100,
+ labelWidth: 130,
+ searchPlaceholder:"任务类型",
dicData: [
{
label: '航测',
@@ -143,24 +173,30 @@
{
label: '图片数量',
prop: 'imageCount',
- width: 100,
+ labelWidth: 130,
+ width: 90,
},
{
label: '拼图耗时',
prop: 'processingTime',
- width: 100,
+ width: 90,
+ labelWidth: 130,
},
{
label: '进度',
prop: 'runningProgress',
+ width: 100,
+ labelWidth: 130,
},
{
label: '任务状态',
prop: 'status',
type: 'select',
search: true,
- searchSpan: 4,
- width: 100,
+ searchSpan: 3,
+ labelWidth: 130,
+ searchPlaceholder:"任务状态",
+ width: 90,
dicData: [
{
label: '待启动',
@@ -200,6 +236,20 @@
format: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
+ {
+ label: '飞行任务完成时间',
+ prop: 'completedTime',
+ type:"date",
+ addDisplay: false,
+ editDisplay: false,
+ searchPlaceholder:"任务完成时间",
+ labelWidth: 130,
+ search:true,
+ searchSpan:4,
+ searchLabelWidth:130,
+ valueFormat: 'YYYY-MM-DD',
+ width: 160,
+ },
],
},
data: [],
@@ -225,7 +275,7 @@
methods: {
// 立即处理
atHandle(row) {
- createOdmTask(row.waylineJobId).then(
+ createOdmTask(row.waylineJobId,row.gsd).then(
() => {
this.onLoad(this.page);
this.$message({
--
Gitblit v1.9.3