From 4f1ddb0fb10c00bdc4b63873b7f2552970247f78 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期三, 26 十月 2022 13:13:19 +0800
Subject: [PATCH] 更改合并冲突
---
widgetsTS/taxiRouteReplay2/view.js | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/widgetsTS/taxiRouteReplay2/view.js b/widgetsTS/taxiRouteReplay2/view.js
index f221a6b..8f1fe8d 100644
--- a/widgetsTS/taxiRouteReplay2/view.js
+++ b/widgetsTS/taxiRouteReplay2/view.js
@@ -161,7 +161,6 @@
todayHighlight: 1, //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
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, //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
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();
})
}
--
Gitblit v1.9.1