From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001 From: lzhe <lzhe@example.com> Date: 星期四, 06 六月 2024 18:23:01 +0800 Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web --- src/views/mdc/processParam/index.vue | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue index 476f28c..764c3b7 100644 --- a/src/views/mdc/processParam/index.vue +++ b/src/views/mdc/processParam/index.vue @@ -158,7 +158,6 @@ time: [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')], disabledDate: Date => { if (!this.timeStart) return false - console.log(this.timeStart, '????????') let max = moment(this.timeStart, 'YYYY-MM-DD').add(3, 'd').format('YYYY-MM-DD') let min = moment(this.timeStart, 'YYYY-MM-DD').subtract(3, 'd').format('YYYY-MM-DD') return !moment(Date).isBetween(min, max); @@ -258,11 +257,12 @@ }) }, setLineOptions(data, myname) { + if (!data) return console.log(data, myname) - let xAxis = data.map(item => { + let xAxis = data?.map(item => { return item.time }) - let yAxisData = data.map(item => { + let yAxisData = data?.map(item => { return item.value }) let dayCharts = { @@ -388,6 +388,7 @@ }, change(e) { this.timeStart = e[0] || moment().format('YYYY-MM-DD') + if (e[1]) this.timeStart = '' } }, } -- Gitblit v1.9.3