吴洪双 před 5 roky
rodič
revize
8d800db307
3 změnil soubory, kde provedl 73 přidání a 25 odebrání
  1. 11 0
      common/lang/en.js
  2. 11 0
      common/lang/zh.js
  3. 51 25
      pages/Charts/mainStatistics.vue

+ 11 - 0
common/lang/en.js

@@ -31,6 +31,17 @@ export default {
 		week:'Sales this week',
 		month:'Sales of this month',
 		year:'Current year sales',
+		week0:'SUN',
+		week1:'MON',
+		week2:'TUE',
+		week3:'WED',
+		week4:'THU',
+		week5:'FRI',
+		week6:'SAT',
+		oclock:'oclock',
+		month:'m',
+		saleNum:'saleNum',
+		saleroom:'saleroom',
 	},
 	merchantList:{
 		title:'Machine Sales',

+ 11 - 0
common/lang/zh.js

@@ -31,6 +31,17 @@ export default {
 		week:'本周销售情况',
 		month:'本月销售情况',
 		year:'本年销售情况',
+		week0:'星期日',
+		week1:'星期一',
+		week2:'星期二',
+		week3:'星期三',
+		week4:'星期四',
+		week5:'星期五',
+		week6:'星期六',
+		oclock:'点',
+		month:'月',
+		saleNum:'saleNum',
+		saleroom:'saleroom',
 	},
 	merchantList:{
 		title:'机器销售',

+ 51 - 25
pages/Charts/mainStatistics.vue

@@ -267,31 +267,31 @@
 				// var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
 				var daystr = dateUtils.formateDate(date, 'yyyy-MM-dd');
 				this.today = daystr;
-				var str= '星期'+'日一二三四五六'.charAt(date.getDay());
-				this.week = str;
-				if(this.$t('mainStatistics.name')=='Name'){
-					if(date.getDay()=='0'){
-						this.week = "SUN";
-					}
-					if(date.getDay()=='1'){
-						this.week = "MON";
-					}
-					if(date.getDay()=='2'){
-						this.week = "TUE";
-					}
-					if(date.getDay()=='3'){
-						this.week = "WED";
-					}
-					if(date.getDay()=='4'){
-						this.week = "THU";
-					}
-					if(date.getDay()=='5'){
-						this.week = "FRI";
-					}
-					if(date.getDay()=='6'){
-						this.week = "SAT";
-					}
-				}
+				// var str= '星期'+'日一二三四五六'.charAt(date.getDay());
+				this.week = this.$t('mainStatistics.week'+date.getDay());
+				// if(this.$t('mainStatistics.name')=='Name'){
+				// 	if(date.getDay()=='0'){
+				// 		this.week = "SUN";
+				// 	}
+				// 	if(date.getDay()=='1'){
+				// 		this.week = "MON";
+				// 	}
+				// 	if(date.getDay()=='2'){
+				// 		this.week = "TUE";
+				// 	}
+				// 	if(date.getDay()=='3'){
+				// 		this.week = "WED";
+				// 	}
+				// 	if(date.getDay()=='4'){
+				// 		this.week = "THU";
+				// 	}
+				// 	if(date.getDay()=='5'){
+				// 		this.week = "FRI";
+				// 	}
+				// 	if(date.getDay()=='6'){
+				// 		this.week = "SAT";
+				// 	}
+				// }
 			},
 			initDateRang(day, chartType) {
 				const daystr = dateUtils.formateDate(day, 'yyyy/MM/dd');
@@ -442,6 +442,32 @@
 					});
 			},
 			initChart(canvasId, chartData) {
+				console.log("chartData:{}",chartData)
+				if(this.$t('lang')!='zh'){
+					chartData.categories = chartData.categories.map(e => {
+						if(e.indexOf('点') >= 0){
+							return e.replace('点',this.$t('mainStatistics.oclock'));
+						}
+						if(e.indexOf('周') >= 0){
+							const weekNum = e.substring(e.length-1)=='日'?'0':e.substring(e.length-1);
+							return this.$t('mainStatistics.week'+weekNum);
+						}
+						if(e.indexOf('月') >= 0){
+							return e.replace('月',this.$t('mainStatistics.month'));
+						}
+						return e;
+					});
+					
+					chartData.series = chartData.series.map(e => {
+						if(e['name']=='销售个数'){
+							e['name']=this.$t('mainStatistics.saleNum');
+						}
+						if(e['name']=='销售额'){
+							e['name']=this.$t('mainStatistics.saleroom');
+						}
+						return e;
+					});
+				}
 				return new uCharts({
 					$this: _self,
 					canvasId: canvasId,