Commit 0ded6765a7532db37f08996348ac6b7ac237d4c5

Authored by vking
1 parent 30684256

master-rewrite-addnew online

... ... @@ -139,10 +139,14 @@ Component({
},
initTimeSpaceIndex(){//对选中时段进行展开
if(this.ddate_solt<0) return {list:[],listIndex:-1};
let nowtime=parseInt(new Date()/1000)
let min=this.config[this.ddate_solt].min
let max=this.config[this.ddate_solt].max
let defTime=this.config[this.ddate_solt].defTime
let time=this.dur_time
if(this.type==3 && nowtime>time){
time=nowtime
}
min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00"))
max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00"))
let hasUseDeftime=false
... ... @@ -154,7 +158,6 @@ Component({
}
}
console.log('add-time-dur.ttime',hasUseDeftime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS"))
let nowtime=parseInt(new Date()/1000)
let dur,timeCheckedIndex=-1,list=[];
for(dur=parseInt(min);dur<=max;dur+=1800){
let t={
... ... @@ -167,7 +170,7 @@ Component({
timeCheckedIndex++
}
}
if(this.dateIndex==0 && this.type==1 && !hasUseDeftime){//新增 &&今天 &&未使用默认时间,+1
if(this.dateIndex==0 && this.type!=2 && !hasUseDeftime){//非修改 &&今天 &&未使用默认时间,+1
timeCheckedIndex+=1
}
timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex
... ...