From 0350cbbe901d29164b7a2308a97e232aab9a3604 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 09 Jul 2025 18:39:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into test
---
src/views/tickets/ticket.vue | 15 ++++++-
src/views/wel/components/statistics.vue | 2
src/views/tickets/orderLog.vue | 66 +++++++++++++++++++++++++--------
src/views/wel/index.vue | 2
src/option/job/jobinfo.js | 7 +++
5 files changed, 72 insertions(+), 20 deletions(-)
diff --git a/src/option/job/jobinfo.js b/src/option/job/jobinfo.js
index ec35b22..369bcf4 100644
--- a/src/option/job/jobinfo.js
+++ b/src/option/job/jobinfo.js
@@ -145,6 +145,7 @@
},
search: true,
display: false,
+ showOverflowTooltip: true,
},
{
label: '任务ID',
@@ -153,6 +154,7 @@
search: true,
width: 80,
display: false,
+ showOverflowTooltip: true,
},
{
label: '任务名称',
@@ -161,6 +163,7 @@
search: true,
width: 200,
display: false,
+ showOverflowTooltip: true,
},
{
label: '定时信息',
@@ -177,6 +180,7 @@
],
width: 120,
display: false,
+ showOverflowTooltip: true,
},
{
label: '执行类型',
@@ -193,6 +197,7 @@
],
width: 110,
display: false,
+ showOverflowTooltip: true,
},
{
label: '处理器类型',
@@ -209,6 +214,7 @@
],
width: 180,
display: false,
+ showOverflowTooltip: true,
},
{
label: '任务状态',
@@ -219,6 +225,7 @@
slot: true,
width: 100,
display: false,
+ showOverflowTooltip: true,
},
],
group: [
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 3f201fb..514e6dd 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -573,19 +573,55 @@
calcHeight: 196,
column: [
- { label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true },
- { label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true },
- { label: '工单状态', prop: 'status', width: 88 },
- { label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true },
- { label: '发起时间', prop: 'create_time', width: 144, ellipsis: true },
- { label: '已执行次数', prop: 'job_num', width: 96, ellipsis: true },
- { label: '工单内容', prop: 'content', 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: 'job_info_num', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单状态', prop: 'status', width: 88,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '发起时间', prop: 'create_time', width: 144, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '已执行次数', prop: 'job_num', width: 96, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单内容', prop: 'content', ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '关联航线', prop: 'wayline_name', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
- { label: '创建人', prop: 'creator_name', width: 96, ellipsis: true, overHidden: true },
- { label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true },
+ {
+ label: '创建人', prop: 'creator_name', width: 96, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
{
label: '工单周期频次',
prop: '',
@@ -593,6 +629,7 @@
formatter: row => this.formatCycleTime(row),
html: true,
ellipsis: true,
+ showOverflowTooltip: true,
// overHidden: true
},
],
@@ -1336,12 +1373,9 @@
&> ::v-deep(.el-button) {
flex: 1;
- max-width: 44px;
+ margin-left: 0;
margin-right: 10px;
- &:nth-child(4n) {
- margin-left: 0;
- }
}
}
}
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 5039e56..34a7844 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -173,7 +173,8 @@
<!-- 工单详情对话框 -->
<el-dialog v-model="detailVisible" title="工单详情" width="80%" append-to-body>
<div class="detail-container">
- <div class="event-title-center">{{ currentDetail.orderName || '事件名称' }}</div>
+ <div class="detail-top-title"> <div class="event-title-center event-orderNumber">{{ currentDetail.orderNumber || '工单编号' }}</div>
+ <div class="event-title-center">{{ currentDetail.orderName || '事件名称' }}</div></div>
<div v-if="totalTime" class="event-total-time">
总耗时：{{ totalTime }}
</div>
@@ -496,7 +497,7 @@
@close="reCheckDialog = false">
<div class="dialog-footer">
<el-button type="primary" @click="reCheckConfirm(1)">人工复核</el-button>
- <el-button type="primary" @click="reCheckConfirm(2)">AI复核</el-button>
+ <el-button type="primary" @click="reCheckConfirm(2)">无人机复核</el-button>
</div>
</el-dialog>
</basic-container>
@@ -1568,6 +1569,8 @@
})
}
this.currentDetail.status = row.status
+
+
} catch (error) {
if (this.activeTab === 'myTickets') {
const statusArr = this.workType === 1 ? ['3', '4'] : this.fixedStatuses
@@ -1582,6 +1585,7 @@
}
this.currentDetail = detailData
+ console.log('this.currentDetail',this.currentDetail);
this.detailVisible = true
this.$nextTick(() => {
if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
@@ -2767,6 +2771,13 @@
.detail-container {
padding: 20px;
+ .detail-top-title {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .event-orderNumber{
+ margin-right: 10px;}
+ }
}
.status-flow {
diff --git a/src/views/wel/components/statistics.vue b/src/views/wel/components/statistics.vue
index d0642df..ab9b6c4 100644
--- a/src/views/wel/components/statistics.vue
+++ b/src/views/wel/components/statistics.vue
@@ -198,7 +198,7 @@
// 样式配置对象
const statusStyles = {
机巢保险: {
- 0: { class: 'expired', color: 'rgba(186, 186, 186, 1)', background: 'rgba(186, 186, 186, 1)' },
+ 0: { class: 'expired', color: '#FFA600', background: '#FFA600' },
1: { class: 'normal', color: 'rgba(27, 148, 255, 1)', background: 'rgba(27, 148, 255, 1)' },
},
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 99462e3..ec47397 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -378,7 +378,7 @@
yAxis: [
{
type: 'log',
- name: '单位:万套',
+ name: '单位:万',
nameTextStyle: {
color: '#383838',
fontSize: '1.2rem'
--
Gitblit v1.9.3