Merge branch 'v_req_8.2' into develop

src/components/canlendar.vue

@@ -189,30 +189,34 @@
 					let year = this.shareDate.getFullYear();
 					let curMonth = this.shareDate.getMonth();
 					let date = this.shareDate.getDate();
+					console.log(date,'date',curMonth, 'curMonth')
 					let obj = {
 						year: year,
 						month: curMonth,
 						date: date,
 						disable: curMonth !== month,
 						value: this.stringify(year, curMonth, date),
-						signdate: false
+						signdate: false,
+						unrecordedZao: false,
+						unrecordedWu: false,
+						unrecordedWan: false
 					}
-					if (curMonth == month) {
+					if (curMonth == currentToday.month) {
 						let f = this.groupList.filter(y => y.date == date)
 						if (f.length) {
 							obj.signdate = true
 							if(f[0].date == 1){
 								currentToday = Object.assign(currentToday, f[0])
 							}
+							obj = Object.assign(obj, f[0])
+							
 						}
 					}
 					list.push(obj);
 					begin += oneDayMS;
 				}
-				console.log(currentToday, 'currentToday')
 				this.changeToday_(currentToday)
 				this.calendarList = list;
-				console.log(list, 'calendarList')
 			}
 		},
 		watch: {

src/pages/ApplyConsumption/campusReport/campusReport.vue

@@ -464,7 +464,6 @@
 			},
 			// 切换日期
 			changeToday(today) {
-				console.log(today, '111111111111111111111111111111')
 				this.today.date = (today.month + 1) + '月' + (today.date || '1') + '日'
 				if (Reflect.has(today, 'unrecordedZao')) {
 					this.today.zao = today.unrecordedZao || false
@@ -475,7 +474,6 @@
 				if (Reflect.has(today, 'unrecordedWan')) {
 					this.today.wan = today.unrecordedWan || false
 				}
-				console.log(this.today,'222222222222')
 			},
 			dateRangeChange(e) {
 				console.log(e)