更改合并冲突

cshenfu

2022-10-26 4f1ddb0fb10c00bdc4b63873b7f2552970247f78

更改合并冲突

 widgetsTS/taxiRouteReplay2/view.js

@@ -161,7 +161,6 @@
      todayHighlight: 1,  //如果为true, 高亮当前日期
      endDate: new Date()
    }).on('changeDate', function (ev) {
<<<<<<< HEAD
        ev.preventDefault();
                ev.stopPropagation();
                var startTime = ev.date;
@@ -172,13 +171,6 @@
      // } else {
      //   $(endSelector).datetimepicker('setStartDate', null);
      // }
=======
      if (ev.date) {
        $(endSelector).datetimepicker('setStartDate', new Date(ev.date.valueOf()))
      } else {
        $(endSelector).datetimepicker('setStartDate', null);
      }
>>>>>>> 7d8b1bf5fbfff1e8e3b4284b9b84b6774b95c8a0
      thisWidget.appDateHourStart = $(beginSelector).val();
    })
  $(endSelector).datetimepicker(
@@ -195,13 +187,10 @@
      todayHighlight: 1,  //如果为true, 高亮当前日期
      endDate: new Date()
    }).on('changeDate', function (ev) {
<<<<<<< HEAD
        ev.preventDefault();
                ev.stopPropagation();
                var endTime = ev.date;
                $(beginSelector).datetimepicker('setEndDate',endTime);
=======
>>>>>>> 7d8b1bf5fbfff1e8e3b4284b9b84b6774b95c8a0
      thisWidget.appDateHourEnd = $(endSelector).val();
    })
}