Showing
1 changed file
with
4 additions
and
2 deletions
| @@ -145,13 +145,15 @@ Component({ | @@ -145,13 +145,15 @@ Component({ | ||
| 145 | let time=this.dur_time | 145 | let time=this.dur_time |
| 146 | min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00")) | 146 | min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00")) |
| 147 | max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00")) | 147 | max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00")) |
| 148 | + let hasUseDeftime=false | ||
| 148 | if(defTime && (this.type!=2 || this.hasManual)){//非修改时或手动选择,优先默认时间 | 149 | if(defTime && (this.type!=2 || this.hasManual)){//非修改时或手动选择,优先默认时间 |
| 149 | defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00")) | 150 | defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00")) |
| 150 | if(defTime>time || this.dateIndex>0){ | 151 | if(defTime>time || this.dateIndex>0){ |
| 151 | time=defTime | 152 | time=defTime |
| 153 | + hasUseDeftime=true | ||
| 152 | } | 154 | } |
| 153 | } | 155 | } |
| 154 | - console.log('add-time-dur.ttime',defTime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS")) | 156 | + console.log('add-time-dur.ttime',hasUseDeftime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS")) |
| 155 | let nowtime=parseInt(new Date()/1000) | 157 | let nowtime=parseInt(new Date()/1000) |
| 156 | let dur,timeCheckedIndex=-1,list=[]; | 158 | let dur,timeCheckedIndex=-1,list=[]; |
| 157 | for(dur=parseInt(min);dur<=max;dur+=1800){ | 159 | for(dur=parseInt(min);dur<=max;dur+=1800){ |
| @@ -165,7 +167,7 @@ Component({ | @@ -165,7 +167,7 @@ Component({ | ||
| 165 | timeCheckedIndex++ | 167 | timeCheckedIndex++ |
| 166 | } | 168 | } |
| 167 | } | 169 | } |
| 168 | - if(this.dateIndex==0 && this.type==1 && !defTime){//新增 &&今天 无默认时间,+1 | 170 | + if(this.dateIndex==0 && this.type==1 && !hasUseDeftime){//新增 &&今天 &&未使用默认时间,+1 |
| 169 | timeCheckedIndex+=1 | 171 | timeCheckedIndex+=1 |
| 170 | } | 172 | } |
| 171 | timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex | 173 | timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex |
-
Please register or login to post a comment