Commit 87263009 authored by gengchunlei's avatar gengchunlei

居民端小程序 v1.2 1、时间组件bug修复

parent 65434353
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
if (!token) { if (!token) {
token = sessionStorage.getItem('token') token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
token = '80fa0d29-73b2-4593-87b8-fc46b53bf49e' token = '660972fe-8a58-4e69-be0f-ff60366c8ffb'
} }
} }
if (token) { if (token) {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
v-model='data.selectedValues' v-model='data.selectedValues'
:min-date='data.minDate' :min-date='data.minDate'
:max-date='data.maxDate' :max-date='data.maxDate'
@change='changeTime'
/> />
</van-popup> </van-popup>
</template> </template>
...@@ -74,6 +74,10 @@ watch( ...@@ -74,6 +74,10 @@ watch(
} }
) )
watch(()=> data.selectedValues, val => {
changeTime()
})
function getcolumns() { function getcolumns() {
let strtime = props.values //传入的时间 let strtime = props.values //传入的时间
//console.log(strtime); 2023-09-05 19:28:00 //console.log(strtime); 2023-09-05 19:28:00
...@@ -159,7 +163,7 @@ function getcolumns() { ...@@ -159,7 +163,7 @@ function getcolumns() {
if (data.minDate && minYear == Y) { if (data.minDate && minYear == Y) {
let minDay = new Date(data.minDate).getDate() let minDay = new Date(data.minDate).getDate()
let allD = Object.keys(Array.apply(null, { length: days + 1 })) let allD = Object.keys(Array.apply(null, { length: days + 1 }))
allDays = allD.filter(item => item >= minDay) allDays = allD.filter(item => item >=(minDay - 1))
} else { } else {
allDays = Object.keys(Array.apply(null, { length: days + 1 })) allDays = Object.keys(Array.apply(null, { length: days + 1 }))
} }
...@@ -183,7 +187,9 @@ function getcolumns() { ...@@ -183,7 +187,9 @@ function getcolumns() {
if (data.showType.includes('hour')) { if (data.showType.includes('hour')) {
let hour = [] //创建小时数组 let hour = [] //创建小时数组
let allHour = [] let allHour = []
if (data.minDate && minYear == Y) { let minMon = new Date(data.minDate).getMonth()
let minDay = new Date(data.minDate).getDate()
if (data.minDate && minYear == Y && minMon == M && minDay == D) {
let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours() let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours()
let allH = Object.keys(Array.apply(null, { length: 24 })) let allH = Object.keys(Array.apply(null, { length: 24 }))
allHour = allH.filter(item => item >= minHour) allHour = allH.filter(item => item >= minHour)
...@@ -366,10 +372,10 @@ function changeColumns(val) { ...@@ -366,10 +372,10 @@ function changeColumns(val) {
let allDays = [] let allDays = []
if (data.minDate && minYear == Y) { if (data.minDate && minYear == Y) {
let minDay = new Date(data.minDate).getDate() let minDay = new Date(data.minDate).getDate()
let allD = Object.keys(Array.apply(null, { length: days + 1 })) let allD = Object.keys(Array.apply(null, { length: days + 1}))
allDays = allD.filter(item => item >= minDay) allDays = allD.filter(item => item >= (minDay - 1))
} else { } else {
allDays = Object.keys(Array.apply(null, { length: days + 1 })) allDays = Object.keys(Array.apply(null, { length: days + 1}))
} }
day = allDays.map(function(item) { day = allDays.map(function(item) {
if (+item + 1 <= 10) { if (+item + 1 <= 10) {
...@@ -391,7 +397,9 @@ function changeColumns(val) { ...@@ -391,7 +397,9 @@ function changeColumns(val) {
if (data.showType.includes('hour')) { if (data.showType.includes('hour')) {
let hour = [] //创建小时数组 let hour = [] //创建小时数组
let allHour = [] let allHour = []
if (data.minDate && minYear == Y) { let minMon = new Date(data.minDate).getMonth()
let minDay = new Date(data.minDate).getDate()
if (data.minDate && minYear == Y && minMon == M && minDay == D) {
let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours() let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours()
let allH = Object.keys(Array.apply(null, { length: 24 })) let allH = Object.keys(Array.apply(null, { length: 24 }))
allHour = allH.filter(item => item >= minHour) allHour = allH.filter(item => item >= minHour)
......
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
this.currentTime1 = time.split('-') this.currentTime1 = time.split('-')
this.startTime = new dayjs().add(1, 'day').format('YYYY-MM-DD HH:mm:ss') this.startTime = new dayjs().add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
this.startDateRange.max = new Date(date.year() + 10, date.month(), date.date()) this.startDateRange.max = new Date(date.year() + 10, date.month(), date.date())
this.startDateRange.min = new Date(date.year(), date.month(), date.date()) this.startDateRange.min = new Date(date.year(), date.month(), date.date() + 1)
}, },
methods: { methods: {
setForm(data = {}) { setForm(data = {}) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment