|
@@ -160,7 +160,7 @@ function topAreaClick(index) {
|
|
|
// let unique = uniqueObjects(echartNow.value, 'time');
|
|
|
let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
|
|
|
setData.forEach(el => {
|
|
|
- if (el.value && el.value != '0' && el.value1!='0') {
|
|
|
+ if (el.value && el.value != '0') {
|
|
|
echartDataFc.maxData.data.push(el.value);
|
|
|
echartDataFc.minData.data.push(el.value1);
|
|
|
echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
|
|
@@ -222,7 +222,7 @@ function getSysWarnList(id, type) {
|
|
|
// let unique = uniqueObjects(echartNow.value, 'time');
|
|
|
let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
|
|
|
setData.forEach(el => {
|
|
|
- if (el.value && el.value != '0' && el.value1!='0') {
|
|
|
+ if (el.value && el.value != '0') {
|
|
|
echartDataFc.maxData.data.push(el.value);
|
|
|
echartDataFc.minData.data.push(el.value1);
|
|
|
echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
|
|
@@ -243,7 +243,7 @@ function getSysWarnList(id, type) {
|
|
|
// let unique = uniqueObjects(echartNow.value, 'time');
|
|
|
let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
|
|
|
setData.forEach(el => {
|
|
|
- if (el.value && el.value != '0' && el.value1!='0') {
|
|
|
+ if (el.value && el.value != '0') {
|
|
|
echartDataFc.maxData.data.push(el.value);
|
|
|
echartDataFc.minData.data.push(el.value1);
|
|
|
echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
|