master-rewrite-addnew online

@@ -29,6 +29,7 @@ Component({
       //event {type: 1, date: "2019-12-31", dur_time: "NaN", dateIndex: 0}
       //event {type: 1, date: "2019-12-31", dur_time: "NaN", dateIndex: 0}
       PubSub.on('add-time-dur',(event)=>{
       PubSub.on('add-time-dur',(event)=>{
         console.log('add-time-dur.PubSub',event)
         console.log('add-time-dur.PubSub',event)
+        this.hasManual=false
         this.config=null
         this.config=null
         this.ddate_solt=-1
         this.ddate_solt=-1
         this.date=event.date
         this.date=event.date
@@ -122,7 +123,10 @@ Component({
     },
     },
     selectedValue(e){
     selectedValue(e){
       console.log('add-time-dur.selectedValue',e)
       console.log('add-time-dur.selectedValue',e)
-      this.ddate_solt=util.attr(e,'value')
+      let ddate_solt=util.attr(e,'value')
+      if(this.ddate_solt==ddate_solt) return;
+      this.ddate_solt=ddate_solt
+      this.hasManual=true //手动选择时段
       this.config.forEach((t,ti)=>{
       this.config.forEach((t,ti)=>{
         //t.hasDisabled=false
         //t.hasDisabled=false
         t.hasChecked=ti==this.ddate_solt
         t.hasChecked=ti==this.ddate_solt
@@ -141,12 +145,13 @@ Component({
       let time=this.dur_time
       let time=this.dur_time
       min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00"))
       min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00"))
       max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00"))
       max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00"))
-      if(defTime && this.type!=2){//非修改时，优先默认时间
+      if(defTime && (this.type!=2 || this.hasManual)){//非修改时或手动选择，优先默认时间
         defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00"))
         defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00"))
         if(defTime>time || this.dateIndex>0){
         if(defTime>time || this.dateIndex>0){
           time=defTime
           time=defTime
         }
         }
       }
       }
+      console.log('add-time-dur.ttime',defTime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS"))
       let nowtime=parseInt(new Date()/1000)
       let nowtime=parseInt(new Date()/1000)
       let dur,timeCheckedIndex=-1,list=[];
       let dur,timeCheckedIndex=-1,list=[];
       for(dur=parseInt(min);dur<=max;dur+=1800){
       for(dur=parseInt(min);dur<=max;dur+=1800){