From bb3b85e8bb9304f0afba37063857e691c97f5c21 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期五, 21 六月 2024 00:20:54 +0800
Subject: [PATCH] update
---
src/views/mdc/processParam/index.vue | 6 +++---
src/views/mdc/components/Time.vue | 10 +++++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index 6442645..f7b94ea 100644
--- a/src/views/mdc/components/Time.vue
+++ b/src/views/mdc/components/Time.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-06-20 22:54:35
+ * @LastEditTime: 2024-06-21 00:15:44
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -159,6 +159,14 @@
endDate: moment(v.id).endOf('month').format('YYYY-MM-DD')
}
})
+ } else if (data.statisticalMethod === 'DAY') {
+ return res?.data?.map(v => {
+ return {
+ ...v,
+ startDate: v.id,
+ endDate: v.id
+ }
+ })
} else {
return res.data
}
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 1053491..118f469 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -287,7 +287,7 @@
{
data: yAxisData,
type: 'line',
-
+ step: 'start',
}
],
xAxis: {
@@ -313,8 +313,8 @@
setDeviceStatusOptions(data, myname) {
let total = Math.abs(moment(this.timeRange.startTime).diff(moment(this.timeRange.endTime)))
let start = this.timeRange.startTime
- let len = data.data.length
- if (moment(data.data[len - 1].time).unix() < moment(this.timeRange.endTime).unix()) {
+ let len = data?.data?.length
+ if (len > 0 && moment(data.data[len - 1].time).unix() < moment(this.timeRange.endTime).unix()) {
let addItem = {
time: this.timeRange.endTime,
value: data.data[len - 1].value
--
Gitblit v1.9.3