From 6089ca971c30b045176d1e3146f6eafacb79c0b0 Mon Sep 17 00:00:00 2001
From: rjg <746338628@qq.com>
Date: Tue, 06 May 2025 17:54:04 +0800
Subject: [PATCH] Merge branch 'feature_0.1_04' of http://139.196.74.78:10010/r/drone/drone-web-manage into test
---
src/views/tickets/orderLog.vue | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 65c5b17..012ebaf 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1079,8 +1079,26 @@
let dateRange = this.form.date_range;
console.log('dateRange' + dateRange);
+<<<<<<< HEAD
this.form.begin_time = this.formatDate(dateRange[0]);
this.form.end_time = this.formatDate(dateRange[1]);
+=======
+ menu: true,
+ menuWidth: 210,
+ menuClassName: 'cur-menu',
+ column: [
+ { label: '序号', prop: 'id', width: 72, ellipsis: true },
+ { label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true },
+ { label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true },
+ { label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true },
+ { label: '发起时间', prop: 'create_time', width: 144, ellipsis: true },
+ { label: '已执行次数', prop: 'job_num', width: 100, ellipsis: true },
+
+ { label: '工单内容', prop: 'content', width: 160, ellipsis: true, overHidden: true },
+ { label: '关联航线', prop: 'wayline_name', width: 100, ellipsis: true, overHidden: true },
+ { label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true },
+ { label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true },
+>>>>>>> f5be1b3dd663b012dc74ab1bbca8ffb407e091d7
const submitData = {
...this.form,
--
Gitblit v1.9.3