|
@@ -355,6 +355,8 @@ import {
|
|
getRegionChart,
|
|
getRegionChart,
|
|
getSearchData,
|
|
getSearchData,
|
|
getOverviewPage,
|
|
getOverviewPage,
|
|
|
|
+ getAreaOverviewPage,
|
|
|
|
+ getUserOverviewPage,
|
|
} from "@/api/index";
|
|
} from "@/api/index";
|
|
import * as echarts from "echarts";
|
|
import * as echarts from "echarts";
|
|
import { ElLoading } from 'element-plus'
|
|
import { ElLoading } from 'element-plus'
|
|
@@ -408,15 +410,13 @@ export default {
|
|
this.onSubmit();
|
|
this.onSubmit();
|
|
},
|
|
},
|
|
onSubmit() {
|
|
onSubmit() {
|
|
-
|
|
|
|
- getOverviewPage()
|
|
|
|
- .then(r => {
|
|
|
|
- loadingInstance.close()
|
|
|
|
- this.overview = r
|
|
|
|
- this.overview.areaTop5 = r.area.slice(0,5)
|
|
|
|
|
|
+ getAreaOverviewPage().then(r => {
|
|
|
|
+ loadingInstance.close()
|
|
|
|
+ this.overview.area = r
|
|
|
|
+ this.overview.areaTop5 = r.slice(0,5)
|
|
console.log(r)
|
|
console.log(r)
|
|
if (!this.$refs.regionChart) return;
|
|
if (!this.$refs.regionChart) return;
|
|
- let list = r.area || [];
|
|
|
|
|
|
+ let list = r || [];
|
|
chart && chart.clear();
|
|
chart && chart.clear();
|
|
this.lastParams.cityType = this.form.cityType;
|
|
this.lastParams.cityType = this.form.cityType;
|
|
this.table = list;
|
|
this.table = list;
|
|
@@ -433,6 +433,13 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.createImage(list);
|
|
this.createImage(list);
|
|
|
|
+ })
|
|
|
|
+ getUserOverviewPage().then(r=>{
|
|
|
|
+ this.overview.userOverview = r
|
|
|
|
+ })
|
|
|
|
+ getOverviewPage()
|
|
|
|
+ .then(r => {
|
|
|
|
+ this.overview.keep = r.keep
|
|
this.platformChar(r.appTrend);
|
|
this.platformChar(r.appTrend);
|
|
this.appUserImage(r.compare, 'appUserChart', 'active', 'recMinute');
|
|
this.appUserImage(r.compare, 'appUserChart', 'active', 'recMinute');
|
|
this.appUserImage(r.userTotal, 'appTotalChart', 'totalUser', 'dt');
|
|
this.appUserImage(r.userTotal, 'appTotalChart', 'totalUser', 'dt');
|