From ea309f83a3de7d8aa4b72eadbd4beb85ae9cf4b8 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 14 Apr 2025 19:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index e9a86fd..03e60dd 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -541,23 +541,28 @@
cancelBtn: true,
cancelBtnText: '取消',
column: [
- { label: '序号', prop: 'id', width: 70 },
- { label: '工单编号', prop: 'job_info_num', width: 150 },
- { label: '工单名称', prop: 'name', width: 150 },
- { label: '所属单位', prop: 'dept_name', width: 100 },
- { label: '发起时间', prop: 'create_time', width: 160 },
- { label: '工单内容', prop: 'content', width: 160 },
- { label: '关联航线', prop: 'wayline_name', width: 160 },
- { label: '关联算法', prop: 'ai_type_str', width: 180 },
- { label: '关联机巢', prop: 'device_names', width: 180 },
+ { label: '序号', prop: 'id', width: 50, 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: 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 },
- { label: '创建人', prop: 'creator_name', width: 180 },
- { label: '关联机巢', prop: 'device_names', width: 108 },
+ { label: '创建人', prop: 'creator_name', width: 50,ellipsis :true,overHidden:true },
+ { label: '关联机巢', prop: 'device_names', width: 80,ellipsis :true,overHidden:true },
{
label: '工单周期凭次',
prop: '',
width: 108,
formatter: row => this.formatCycleTime(row),
+ html: true,
+ ellipsis :true,overHidden:true
+
+
+
},
{ label: '工单状态', prop: 'status', width: 60 },
],
@@ -647,7 +652,8 @@
}
},
formatCycleTime(row) {
- return row.begin_time + '-' + row.end_time + ' ' + row.rep_rule_val;
+ return row.begin_time + '-' + row.end_time +'<br/>'
+ +row.rep_rule_type + row.rep_rule_val;
},
async fetchTableData() {
--
Gitblit v1.9.3