优化图表

pages/Charts/mainStatistics.vue

@@ -101,10 +101,12 @@
 		computed: {
 			...mapState(['loginUser']),
 		},
-		onLoad(option){
-			this.init();
-		},
+		// onLoad(option){
+		// 	console.log("onLoad")
+		// 	this.init();
+		// },
 		mounted() {
+			console.log("mounted")
 			this.init();
 		},
 		methods: {
@@ -214,40 +216,38 @@
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}
-				// setTimeout(() => {
 				return this.getStatistics(param)
-						.then(data => {
-								uni.stopPullDownRefresh();
-								if(param['chartType']=='day'){
-									canvaColumn1 = this.initChart('canvaColumn1',data);
-								}
-								if(param['chartType']=='week'){
-									canvaColumn2 = this.initChart('canvaColumn2',data);
-								}
-								if(param['chartType']=='month'){
-									canvaColumn3 = this.initChart('canvaColumn3',data);
-								}
-								if(param['chartType']=='year'){
-									canvaColumn4 = this.initChart('canvaColumn4',data);
-								}
+					.then(data => {
+							uni.stopPullDownRefresh();
+							if(param['chartType']=='day'){
+								canvaColumn1 = this.initChart('canvaColumn1',data);
+							}
+							if(param['chartType']=='week'){
+								canvaColumn2 = this.initChart('canvaColumn2',data);
+							}
+							if(param['chartType']=='month'){
+								canvaColumn3 = this.initChart('canvaColumn3',data);
+							}
+							if(param['chartType']=='year'){
+								canvaColumn4 = this.initChart('canvaColumn4',data);
+							}
+						}
+					, _ => {
+							uni.stopPullDownRefresh();
+							if(param['chartType']=='day'){
+								canvaColumn1 = this.initChart('canvaColumn1',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
+							}
+							if(param['chartType']=='week'){
+								canvaColumn2 = this.initChart('canvaColumn2',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
+							}
+							if(param['chartType']=='month'){
+								canvaColumn3 = this.initChart('canvaColumn3',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
 							}
-						, _ => {
-								uni.stopPullDownRefresh();
-								if(param['chartType']=='day'){
-									canvaColumn1 = this.initChart('canvaColumn1',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
-								}
-								if(param['chartType']=='week'){
-									canvaColumn2 = this.initChart('canvaColumn2',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
-								}
-								if(param['chartType']=='month'){
-									canvaColumn3 = this.initChart('canvaColumn3',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
-								}
-								if(param['chartType']=='year'){
-									canvaColumn4 = this.initChart('canvaColumn4',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
-								}
+							if(param['chartType']=='year'){
+								canvaColumn4 = this.initChart('canvaColumn4',{categories:['暂无数据'],series:[{name: '销售个数',data:[0]}]});
 							}
-						);
-				// }, 0);
+						}
+					);
 			},
 			initChart(canvasId, chartData){
 				return new uCharts({
@@ -287,37 +287,35 @@
 				});
 			},
 			getMainStatisticsData(){
-				// setTimeout(() => {
-					const param = {};
-					if(this.adminId){ // 子组件，则拿传过来的参
-						param['adminId'] = this.adminId;
-					}else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
-						param['adminId'] = this.loginUser['id'];
-					}
-					if (this.equipmentId) {
-						param['equipmentId'] = this.equipmentId;
-					}
-					console.log('getMainStatisticsData:{}',param)
-					return this.getMainStatistics(param)
-						.then(data => {
-							for (let bean of data) {
-								if(bean['categorie']==='day'){
-									this.dayTotalMoney=bean['salePrice'];
-								}
-								if(bean['categorie']==='week'){
-									this.weekTotalMoney=bean['salePrice'];
-								}
-								if(bean['categorie']==='month'){
-									this.monthTotalMoney=bean['salePrice'];
-								}
-								if(bean['categorie']==='year'){
-									this.yearTotalMoney=bean['salePrice'];
-								}
+				const param = {};
+				if(this.adminId){ // 子组件，则拿传过来的参
+					param['adminId'] = this.adminId;
+				}else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
+					param['adminId'] = this.loginUser['id'];
+				}
+				if (this.equipmentId) {
+					param['equipmentId'] = this.equipmentId;
+				}
+				console.log('getMainStatisticsData:{}',param)
+				return this.getMainStatistics(param)
+					.then(data => {
+						for (let bean of data) {
+							if(bean['categorie']==='day'){
+								this.dayTotalMoney=bean['salePrice'];
+							}
+							if(bean['categorie']==='week'){
+								this.weekTotalMoney=bean['salePrice'];
+							}
+							if(bean['categorie']==='month'){
+								this.monthTotalMoney=bean['salePrice'];
+							}
+							if(bean['categorie']==='year'){
+								this.yearTotalMoney=bean['salePrice'];
 							}
-							uni.stopPullDownRefresh();
 						}
-						, _ => void uni.stopPullDownRefresh());
-				// }, 0);
+						uni.stopPullDownRefresh();
+					}
+					, _ => void uni.stopPullDownRefresh());
 			},
 			touchLine1(e) {
 				if(canvaColumn1){