Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 src/app/routes/dashboard/analysis/analysis.component.ts

@@ -31,14 +31,14 @@
    private http2: HttpClient) {}

    ngOnInit() {
        this.http.get('/chart').subscribe((res: any) => {
            res.offlineData.forEach((item: any) => {
                item.chart = Object.assign([], res.offlineChartData);
            });
            this.data = res;
            this.loading = false;
            this.changeSaleType();
        });
        // this.http.get('/chart').subscribe((res: any) => {
        //     res.offlineData.forEach((item: any) => {
        //         item.chart = Object.assign([], res.offlineChartData);
        //     });
        //     this.data = res;
        //     this.loading = false;
        //     this.changeSaleType();
        // });
    }

    setDate(type: any) {