|
@@ -244,17 +244,20 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
const data = await getEchartData({ category: this.activeItem.value, timeBegin, timeEnd });
|
|
const data = await getEchartData({ category: this.activeItem.value, timeBegin, timeEnd });
|
|
- console.log(data);
|
|
|
|
|
|
+
|
|
|
|
+ const reusltData = data.hs.data.splice(data.real.data.length - 1, data.hs.data.length - data.real.data.length);
|
|
|
|
+ const reusltTime = data.hs.time.splice(data.real.time.length - 1, data.hs.time.length - data.real.time.length);
|
|
|
|
+
|
|
let xAxisData = [];
|
|
let xAxisData = [];
|
|
- const realOneList = [];
|
|
|
|
- const realTwoList = [];
|
|
|
|
- const realThreeList = [];
|
|
|
|
- const hsForecastOneList = [];
|
|
|
|
- const hsForecastTwoList = [];
|
|
|
|
- const hsForecastThreeList = [];
|
|
|
|
- const yyForecastOneList = [];
|
|
|
|
- const yyForecastTwoList = [];
|
|
|
|
- const yyForecastThreeList = [];
|
|
|
|
|
|
+ // const realOneList = [];
|
|
|
|
+ // const realTwoList = [];
|
|
|
|
+ // const realThreeList = [];
|
|
|
|
+ // const hsForecastOneList = [];
|
|
|
|
+ // const hsForecastTwoList = [];
|
|
|
|
+ // const hsForecastThreeList = [];
|
|
|
|
+ // const yyForecastOneList = [];
|
|
|
|
+ // const yyForecastTwoList = [];
|
|
|
|
+ // const yyForecastThreeList = [];
|
|
|
|
|
|
// data.map(item => {
|
|
// data.map(item => {
|
|
// const {
|
|
// const {
|
|
@@ -275,10 +278,10 @@ export default {
|
|
// yyForecastThreeList.push(yyForecastThree);
|
|
// yyForecastThreeList.push(yyForecastThree);
|
|
// })
|
|
// })
|
|
|
|
|
|
- xAxisData = data.yy.time
|
|
|
|
|
|
+ xAxisData = [...data.yy.time, ...reusltTime];
|
|
|
|
|
|
const echartData = [
|
|
const echartData = [
|
|
- { name: 'TFT', val: data.hs.data },
|
|
|
|
|
|
+ { name: 'TFT', val: [...data.hs.data, ...reusltData] },
|
|
{ name: '真实值', val: data.real.data },
|
|
{ name: '真实值', val: data.real.data },
|
|
{ name: 'LSTM', val: data.yy.data },
|
|
{ name: 'LSTM', val: data.yy.data },
|
|
// { name: 'TFTpre_1', val: hsForecastOneList },
|
|
// { name: 'TFTpre_1', val: hsForecastOneList },
|
|
@@ -289,7 +292,9 @@ export default {
|
|
// { name: 'LSTMpre_3', val: yyForecastThreeList }
|
|
// { name: 'LSTMpre_3', val: yyForecastThreeList }
|
|
]
|
|
]
|
|
|
|
|
|
- const option = getEchartLineOption({ xAxisData, echartData });
|
|
|
|
|
|
+ const specificData = new Array(data.hs.data.length).fill(null).concat( reusltData );
|
|
|
|
+
|
|
|
|
+ const option = getEchartLineOption({ xAxisData, echartData, specificData:specificData });
|
|
|
|
|
|
echart.setOption(option);
|
|
echart.setOption(option);
|
|
|
|
|