1

pagesFinance/statistics/index.vue

@@ -309,7 +309,7 @@
 		daysDistance,
 		beforeTimeStamp,
 		currentTimeStamp,
-		parseUnixTime
+		parseUnixTime, newDate
 	} from '@/utils'
 	export default {
 		data() {
@@ -561,10 +561,12 @@
 				}).then((res) => {
 					this.indexData3 = res.data;
 				
-					if(	this.info.accountType==3){
+					if(	this.info.accountType==3){
+						//getPie2
+						this.getPie2()
+					}else{
+						//getPie
 						this.getPie2()
-					}else{
-						this.getPie()
 					}
 					
 				}).catch(error => {
@@ -755,7 +757,7 @@
 						bl=false;
 						var time = i
 						if (this.type_head == 1) {
-							time = i.substring(5)
+						//	time = i.substring(5)
 						} else {
 
 						}
@@ -794,9 +796,17 @@
 					tooltip: {
 
 						formatter: (value) => {
+							//getPie2
 							var info = value;
-
+							console.log(value)
 							var name = value[0].data[0];
+							
+							var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
+							var now = newDate(name);
+							var day = now.getDay();
+							
+							var week = weeks[day];
+							
 							var style = "float: right;margin-left: 3px;"
 							var text1 = ""
 							for (var i in value) {
@@ -807,8 +817,18 @@
 								text1 += "<p>" + value[i].marker + value[i].seriesName + '<span style="' + style +
 									'">' + value[i].data[1] + u + '</span></p>';
 							}
-
-							return `<p>${name}</p>` + text1
+								
+							if (this.type_head == 1) {
+								//time = i.substring(5)
+								var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
+								var now = newDate(name);
+								var day = now.getDay();
+								var week = weeks[day];
+								return `<p>${name} ${week}</p>` + text1
+							} else {
+								return `<p>${name}</p>` + text1
+							}
+													
 
 						},
 
@@ -841,33 +861,63 @@
 						boundaryGap: false,
 
 						axisLabel: {
-							formatter: (value) => {
- 								if(this.headitemby==""){
-									this.headitemby=value
+							formatter: (value) => {
+								if(this.headitemby==""){
+									this.headitemby=value
 								}
 								var i = 0
 								if (this.type_head == 1) {
-									i = 3;
+									i = 0;
 								} else {
-									i = 5;
+									i = 3;
 								}
 								var showvalue = "";
-								var key = value.substring(0, i);
+								var key = value.substring(0,8-i);
+								
 								if (showkey == ""||value==this.headitemby) {
 									showkey = key
 								
 									showvalue = value
+									showvalue = value.substring(5-i)
 								} else {
 									if (key != showkey) {
 										showkey = key
 										showvalue = value
+										showvalue = value.substring(5-i)
 									} else {
-										showvalue = value.substring(i)
+										showvalue = value.substring(8-i)
 									}
 								}
- 								return showvalue.replace("-",".");
-
+								return showvalue.replace("-",".");
+							
 							},
+							// formatter: (value) => {
+ 						// 		if(this.headitemby==""){
+							// 		this.headitemby=value
+							// 	}
+							// 	var i = 0
+							// 	if (this.type_head == 1) {
+							// 		i = 3;
+							// 	} else {
+							// 		i = 5;
+							// 	}
+							// 	var showvalue = "";
+							// 	var key = value.substring(0, i);
+							// 	if (showkey == ""||value==this.headitemby) {
+							// 		showkey = key
+								
+							// 		showvalue = value
+							// 	} else {
+							// 		if (key != showkey) {
+							// 			showkey = key
+							// 			showvalue = value
+							// 		} else {
+							// 			showvalue = value.substring(i)
+							// 		}
+							// 	}
+ 						// 		return showvalue.replace("-",".");
+
+							// },
 							textStyle: {
 								color: "#333"
 							}
@@ -1053,10 +1103,11 @@
 					tooltip: {
 
 						formatter: (value) => {
-						
+							//getPie
 							var name = value[0].data[0];
-							var info = getData[name];
-							
+							var info = getData[name];
+						
+						
 							
 							var style = "float: right;margin-left: 3px;"
 							var text1 = ""
@@ -1072,8 +1123,17 @@
 								text1 += "<p>" + value[i].marker + value[i].seriesName + '<span style="' + style +
 									'">' + num + u + '</span></p>';
 							}
-
-							return `<p>${name}</p>` + text1
+							if (this.type_head == 1) {
+								//time = i.substring(5)
+								var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
+								var now = newDate(name);
+								var day = now.getDay();
+								var week = weeks[day];
+								return `<p>${name} ${week}</p>` + text1
+							} else {
+								return `<p>${name}</p>` + text1
+							}
+						
 
 						},