|
@@ -243,11 +243,9 @@ export default {
|
|
this.activeIndex = index === -1 ? 0 : index;
|
|
this.activeIndex = index === -1 ? 0 : index;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
const data = await getEchartData({ category: this.activeItem.value, timeBegin, timeEnd });
|
|
const data = await getEchartData({ category: this.activeItem.value, timeBegin, timeEnd });
|
|
-
|
|
|
|
-
|
|
|
|
- const xAxisData = [];
|
|
|
|
|
|
+ console.log(data);
|
|
|
|
+ let xAxisData = [];
|
|
const realOneList = [];
|
|
const realOneList = [];
|
|
const realTwoList = [];
|
|
const realTwoList = [];
|
|
const realThreeList = [];
|
|
const realThreeList = [];
|
|
@@ -258,38 +256,40 @@ export default {
|
|
const yyForecastTwoList = [];
|
|
const yyForecastTwoList = [];
|
|
const yyForecastThreeList = [];
|
|
const yyForecastThreeList = [];
|
|
|
|
|
|
- data.map(item => {
|
|
|
|
- const {
|
|
|
|
- remark,
|
|
|
|
- realOne, realTwo, realThree,
|
|
|
|
- hsForecastOne, hsForecastTwo, hsForecastThree,
|
|
|
|
- yyForecastOne, yyForecastTwo, yyForecastThree
|
|
|
|
- } = item;
|
|
|
|
- xAxisData.push(remark);
|
|
|
|
- realOneList.push(realOne);
|
|
|
|
- realTwoList.push(realTwo);
|
|
|
|
- realThreeList.push(realThree);
|
|
|
|
- hsForecastOneList.push(hsForecastOne);
|
|
|
|
- hsForecastTwoList.push(hsForecastTwo);
|
|
|
|
- hsForecastThreeList.push(hsForecastThree);
|
|
|
|
- yyForecastOneList.push(yyForecastOne);
|
|
|
|
- yyForecastTwoList.push(yyForecastTwo);
|
|
|
|
- yyForecastThreeList.push(yyForecastThree);
|
|
|
|
- })
|
|
|
|
|
|
+ // data.map(item => {
|
|
|
|
+ // const {
|
|
|
|
+ // remark,
|
|
|
|
+ // realOne, realTwo, realThree,
|
|
|
|
+ // hsForecastOne, hsForecastTwo, hsForecastThree,
|
|
|
|
+ // yyForecastOne, yyForecastTwo, yyForecastThree
|
|
|
|
+ // } = item;
|
|
|
|
+ // xAxisData.push(remark);
|
|
|
|
+ // realOneList.push(realOne);
|
|
|
|
+ // realTwoList.push(realTwo);
|
|
|
|
+ // realThreeList.push(realThree);
|
|
|
|
+ // hsForecastOneList.push(hsForecastOne);
|
|
|
|
+ // hsForecastTwoList.push(hsForecastTwo);
|
|
|
|
+ // hsForecastThreeList.push(hsForecastThree);
|
|
|
|
+ // yyForecastOneList.push(yyForecastOne);
|
|
|
|
+ // yyForecastTwoList.push(yyForecastTwo);
|
|
|
|
+ // yyForecastThreeList.push(yyForecastThree);
|
|
|
|
+ // })
|
|
|
|
+
|
|
|
|
+ xAxisData = data.yy.time
|
|
|
|
|
|
const echartData = [
|
|
const echartData = [
|
|
- { name: 'Real_1', val: realOneList },
|
|
|
|
- { name: 'Real_2', val: realTwoList },
|
|
|
|
- { name: 'Real_3', val: realThreeList },
|
|
|
|
- { name: 'TFTpre_1', val: hsForecastOneList },
|
|
|
|
- { name: 'TFTpre_2', val: hsForecastTwoList },
|
|
|
|
- { name: 'TFTpre_3', val: hsForecastThreeList },
|
|
|
|
- { name: 'LSTMpre_1', val: yyForecastOneList },
|
|
|
|
- { name: 'LSTMpre_2', val: yyForecastTwoList },
|
|
|
|
- { name: 'LSTMpre_3', val: yyForecastThreeList }
|
|
|
|
|
|
+ { name: '红杉预测值', val: data.hs.data },
|
|
|
|
+ { name: '真实值', val: data.real.data },
|
|
|
|
+ { name: '跃渊预测值', val: data.yy.data },
|
|
|
|
+ // { name: 'TFTpre_1', val: hsForecastOneList },
|
|
|
|
+ // { name: 'TFTpre_2', val: hsForecastTwoList },
|
|
|
|
+ // { name: 'TFTpre_3', val: hsForecastThreeList },
|
|
|
|
+ // { name: 'LSTMpre_1', val: yyForecastOneList },
|
|
|
|
+ // { name: 'LSTMpre_2', val: yyForecastTwoList },
|
|
|
|
+ // { name: 'LSTMpre_3', val: yyForecastThreeList }
|
|
]
|
|
]
|
|
|
|
|
|
- const option = getEchartLineOption({ xAxisData, echartData })
|
|
|
|
|
|
+ const option = getEchartLineOption({ xAxisData, echartData });
|
|
|
|
|
|
echart.setOption(option);
|
|
echart.setOption(option);
|
|
|
|
|