按老板要求调整

pagesFinance/statistics/index.vue

@@ -415,7 +415,7 @@
 			this.queryTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}'),
 
 
-				this.startDate_head = parseUnixTime(beforeTimeStamp(30 * 3), '{y}-{m}-{d}')
+				this.startDate_head = parseUnixTime(beforeTimeStamp(30 ), '{y}-{m}-{d}')
 			this.startTime = parseUnixTime(beforeTimeStamp(7), '{y}-{m}-{d}')
 			this.endTime = parseUnixTime(beforeTimeStamp(1), '{y}-{m}-{d}')
 			//this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
@@ -617,9 +617,9 @@
 				this.current = e
 				this.type_head = e;
 				if (e == 1) {
-					this.startDate_head = parseUnixTime(beforeTimeStamp(30 * 3), '{y}-{m}-{d}')
+					this.startDate_head = parseUnixTime(beforeTimeStamp(30 ), '{y}-{m}-{d}')
 				} else {
-					this.startDate_head = parseUnixTime(beforeTimeStamp(31 * 3), '{y}-{m}-01')
+					this.startDate_head = parseUnixTime(beforeTimeStamp(365), '{y}-{m}-01')
 				}
 				//	this.getPie()
 				this.getDataHome2()
@@ -702,20 +702,25 @@
 					var ap = {
 						name: this.showlist1[j],
 						type: 'line',
-						symbol: 'none',
+						
 						  
-						label: {
-							show: true,
-							position: 'top'
-						},
+						// label: {
+						// 	show: true,
+						// 	position: 'top'
+						// },
 						data: []
 					}
-					
+					if (this.type_head == 1) {
+						 ap.symbol='circle'
+					}
 					for (var i in getData) {
 						//var time=this.queryDate.replace("-","/").replace("-","/")
 						//time+' '+i
 						var obj = getData[i][sz2[j]];
-
+						//'todayAmount', 'todayProfit', 'todayEQNum'
+						if(getData[i].todayAmount==0&&getData[i].todayProfit==0&&getData[i].todayEQNum==0){
+							continue;
+						}
 						var time = i
 						if (this.type_head == 1) {
 							time = i.substring(5)
@@ -817,11 +822,11 @@
 			if (this.type_head == 1) {
 				option.dataZoom = [{
 						type: 'inside',
-						start: 66,
+						start: 0,
 						end: 100
 					},
 					{
-						start: 66,
+						start: 0,
 						end: 100
 					}
 				]