This commit is contained in:
cclu 2024-03-06 15:42:19 +08:00
parent 4f760080dc
commit 8e9d6d6923
3 changed files with 17 additions and 15 deletions

View File

@ -187,7 +187,7 @@ export default {
if (query.currentScroll){ if (query.currentScroll){
this.currentScroll = query.currentScroll this.currentScroll = query.currentScroll
}else{ }else{
this.currentScroll = 'item'+ this.lastDay this.currentScroll = 'item'+ '2024-03-05'
} }
// //
@ -206,9 +206,9 @@ export default {
// dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
// } // }
dayNumber = moment().diff("2024-01-26", "days") dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber this.howDayNumber = dayNumber<=40?dayNumber:40
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=this.howDayNumber;i++){
dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
// if (i<7){ // if (i<7){
// dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`}) // dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`})

View File

@ -232,7 +232,7 @@ export default {
if (query.time){ if (query.time){
this.currentScroll = 'item'+ query.time this.currentScroll = 'item'+ query.time
}else{ }else{
this.currentScroll = 'item'+ this.lastDay this.currentScroll = 'item'+ '2024-03-05'
} }
this.ServerpartIds = query.ServerpartIds this.ServerpartIds = query.ServerpartIds
@ -256,10 +256,10 @@ export default {
// }else{ // }else{
// dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
// } // }
dayNumber = moment().diff("2024-01-26", "days") dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber this.howDayNumber = dayNumber<=40?dayNumber:40
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=this.howDayNumber;i++){
dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
// if (i<7){ // if (i<7){
// dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`}) // dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`})
@ -268,7 +268,7 @@ export default {
// } // }
} }
this.scrollList = dateList this.scrollList = dateList
this.selectDateText = dateList[dayNumber-1].value this.selectDateText = dateList[this.howDayNumber-1].value
this.handleGetData() this.handleGetData()
}, },

View File

@ -979,7 +979,8 @@ export default {
this.compareYear = y - 1 this.compareYear = y - 1
this.lastDay = uni.getStorageSync('lastDay') this.lastDay = uni.getStorageSync('lastDay')
this.currentScroll = 'item'+ uni.getStorageSync('lastDay') // this.currentScroll = 'item'+ uni.getStorageSync('lastDay')
this.currentScroll = 'item'+ '2024-03-05'
const lastDate = new Date(this.lastDay) const lastDate = new Date(this.lastDay)
let lastM = lastDate.getMonth() + 1 let lastM = lastDate.getMonth() + 1
let lastD = lastDate.getDate() let lastD = lastDate.getDate()
@ -995,11 +996,12 @@ export default {
// }else{ // }else{
// dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
// } // }
dayNumber = moment().diff("2024-01-26", "days") dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber console.log('dayNumber',dayNumber)
this.howDayNumber = dayNumber<=40?dayNumber:40
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=this.howDayNumber;i++){
dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) dateList.push({label:`${i}`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
// if (i<7){ // if (i<7){
// dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`}) // dateList.push({label:`${i}`,value:`2024-01-${26+i-1}`})
// }else{ // }else{
@ -1012,7 +1014,7 @@ export default {
} }
console.log('dateList',dateList) console.log('dateList',dateList)
this.scrollList = dateList this.scrollList = dateList
this.selectDateText = dateList[dayNumber-1].value this.selectDateText = dateList[this.howDayNumber-1].value
uni.showLoading({ uni.showLoading({
title: '正在加载...' title: '正在加载...'
}) })