|
|
@@ -1023,18 +1023,18 @@
|
|
|
if (yingsf_option_data.length > 0) {
|
|
|
// chart_option4_data 排序
|
|
|
const new_yingsf_option_data = _.sortBy(yingsf_option_data, 'yearmonth');
|
|
|
- for (const [i,c4] of new_yingsf_option_data.entries()) {
|
|
|
+ for (const c4 of new_yingsf_option_data) {
|
|
|
show_yingsf_option_data.yearmonth.push(c4.yearmonth);
|
|
|
- show_yingsf_option_data.yf_tp.push(c4.yf_tp);
|
|
|
show_yingsf_option_data.ys_tp.push(c4.ys_tp);
|
|
|
+ show_yingsf_option_data.yf_tp.push(c4.yf_tp);
|
|
|
}
|
|
|
}
|
|
|
const yingsf_option = yingsfChart.getOption();
|
|
|
yingsf_option.dataZoom[0].start = 0;
|
|
|
yingsf_option.dataZoom[0].end = computedPosition(show_yingsf_option_data.yearmonth.length);
|
|
|
yingsf_option.xAxis[0].data = show_yingsf_option_data.yearmonth;
|
|
|
- yingsf_option.series[0].data = show_yingsf_option_data.yf_tp;
|
|
|
- yingsf_option.series[1].data = show_yingsf_option_data.ys_tp;
|
|
|
+ yingsf_option.series[0].data = show_yingsf_option_data.ys_tp;
|
|
|
+ yingsf_option.series[1].data = show_yingsf_option_data.yf_tp;
|
|
|
if (show_yingsf_option_data.yearmonth.length >= 8) {
|
|
|
yingsf_option.dataZoom[0].show = true;
|
|
|
} else {
|
|
|
@@ -1048,18 +1048,18 @@
|
|
|
};
|
|
|
if (yisf_option_data.length > 0) {
|
|
|
const new_yisf_option_data = _.sortBy(yisf_option_data, 'yearmonth');
|
|
|
- for (const [i,c4] of new_yisf_option_data.entries()) {
|
|
|
+ for (const c4 of new_yisf_option_data) {
|
|
|
show_yisf_option_data.yearmonth.push(c4.yearmonth);
|
|
|
- show_yisf_option_data.yf_tp.push(c4.yf_tp);
|
|
|
show_yisf_option_data.ys_tp.push(c4.ys_tp);
|
|
|
+ show_yisf_option_data.yf_tp.push(c4.yf_tp);
|
|
|
}
|
|
|
}
|
|
|
const yisf_option = yisfChart.getOption();
|
|
|
yisf_option.dataZoom[0].start = 0;
|
|
|
yisf_option.dataZoom[0].end = computedPosition(show_yisf_option_data.yearmonth.length);
|
|
|
yisf_option.xAxis[0].data = show_yisf_option_data.yearmonth;
|
|
|
- yisf_option.series[0].data = show_yisf_option_data.yf_tp;
|
|
|
- yisf_option.series[1].data = show_yisf_option_data.ys_tp;
|
|
|
+ yisf_option.series[0].data = show_yisf_option_data.ys_tp;
|
|
|
+ yisf_option.series[1].data = show_yisf_option_data.yf_tp;
|
|
|
if (show_yisf_option_data.yearmonth.length >= 8) {
|
|
|
yisf_option.dataZoom[0].show = true;
|
|
|
} else {
|
