From f8829ec3b7df1dc11b6c92a2fdda28235d170f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Fri, 22 Mar 2024 14:17:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- .../monitoring/equipmentTraceability/index.vue | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.env.dev b/.env.dev index 2f3ffe42..d63d091f 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-03-21 14:45:52 + # @LastEditTime: 2024-03-22 10:57:53 # @LastEditors: zhp # @Description: ### diff --git a/src/views/quality/monitoring/equipmentTraceability/index.vue b/src/views/quality/monitoring/equipmentTraceability/index.vue index fa7b95f1..3d0e7a3f 100644 --- a/src/views/quality/monitoring/equipmentTraceability/index.vue +++ b/src/views/quality/monitoring/equipmentTraceability/index.vue @@ -244,7 +244,7 @@ export default { rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', - param: 'timerange', + param: 'recordTime', }, // { // parent: 'dateFilterType', @@ -270,6 +270,7 @@ export default { btnName: '导出', name: 'export', color: 'warning', + }, // { // type: 'separate', @@ -381,7 +382,7 @@ export default { }, /** 查询列表 */ async getList() { - this.loading = true; + this.loading = true const { code, data } = await this.$axios({ url: '/analysis/equipment-analysis/efficiency', method: 'get', @@ -402,14 +403,14 @@ export default { if (btnName == 'search') { this.queryParams.workOrderId = payload.workOrderId || null; // this.queryParams.lineId = payload.lineId || null; - if (0 == payload.dateFilterType) { - this.queryParams.recordTime = payload.timerange; - } else if (1 == payload.dateFilterType) { + // if (0 == payload.dateFilterType) { + this.queryParams.recordTime = payload.recordTime; + // } else if (1 == payload.dateFilterType) { this.queryParams.recordTime = [ - `${payload.timeday} 00:00:00`, - `${payload.timeday} 23:59:59`, + payload.recordTime[0], + payload.recordTime[1], ]; - } + // } } else { this.handleExport() this.queryParams.recordTime = null;