From bbd9972761c8cb0da80f3e222590d6f158d9afa1 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 10 Mar 2025 16:33:55 +0800 Subject: [PATCH] ry-bug --- src/api/core/monitoring/data.js | 7 ++++--- src/views/core/monitoring/lineAuto/index.vue | 3 ++- src/views/equipment/timing-diagram/status/gantt.js | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/api/core/monitoring/data.js b/src/api/core/monitoring/data.js index 17bd4127..94548f2e 100644 --- a/src/api/core/monitoring/data.js +++ b/src/api/core/monitoring/data.js @@ -1,8 +1,8 @@ /* * @Author: Do not edit * @Date: 2023-09-12 09:44:53 - * @LastEditTime: 2023-09-14 10:25:46 - * @LastEditors: DY + * @LastEditTime: 2025-03-03 10:43:34 + * @LastEditors: zwq * @Description: */ import request from '@/utils/request' @@ -37,6 +37,7 @@ export function getPdlAutoReportNewSearchNow(data) { return request({ url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow', method: 'post', - data: data + data: data, + timeout: 60000, }) } diff --git a/src/views/core/monitoring/lineAuto/index.vue b/src/views/core/monitoring/lineAuto/index.vue index 09c784c4..f9548d2a 100644 --- a/src/views/core/monitoring/lineAuto/index.vue +++ b/src/views/core/monitoring/lineAuto/index.vue @@ -1,7 +1,7 @@ @@ -379,6 +379,7 @@ export default { tables.removeChild(tables.querySelector('.el-table__fixed-right')); } let exportTable = XLSX.utils.table_to_book(tables); + exportTable.Sheets.Sheet1.A1.v = '序号' //导出表格第一列表头为序号 var exportTableOut = XLSX.write(exportTable, { bookType: 'xlsx', diff --git a/src/views/equipment/timing-diagram/status/gantt.js b/src/views/equipment/timing-diagram/status/gantt.js index 5e4024f7..c68031c0 100644 --- a/src/views/equipment/timing-diagram/status/gantt.js +++ b/src/views/equipment/timing-diagram/status/gantt.js @@ -62,8 +62,8 @@ function getTodayStart(today) { /** 颜色配置 */ const types = [ { name: '运行', color: '#288AFF' }, - { name: '故障', color: '#FC9C91' }, { name: '计划停机', color: '#FFDC94' }, + { name: '故障', color: '#FC9C91' }, { name: '空白', color: '#F2F4F9' }, ]; @@ -267,7 +267,7 @@ export default class GanttGraph { ylist.push(eqArr.key) eqArr.forEach(item => { xdata.push({ - name: ['运行', '故障', '计划停机'][item.status], + name: ['运行', '计划停机', '故障'][item.status], showName: eqArr.key, value: [index, item.startTime, item.startTime + item.duration * 60 * 1000, 0], itemStyle: {