From 9ad1ef1d8d480df117cb7577128fb22d237ff838 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期二, 25 十月 2022 12:13:34 +0800
Subject: [PATCH] 更改轨迹回放时间选择bug
---
widgetsTS/taxiRouteReplay2/view.js | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/widgetsTS/taxiRouteReplay2/view.js b/widgetsTS/taxiRouteReplay2/view.js
index 8f1fe8d..f221a6b 100644
--- a/widgetsTS/taxiRouteReplay2/view.js
+++ b/widgetsTS/taxiRouteReplay2/view.js
@@ -161,6 +161,7 @@
todayHighlight: 1, //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
endDate: new Date()
}).on('changeDate', function (ev) {
+<<<<<<< HEAD
ev.preventDefault();
ev.stopPropagation();
var startTime = ev.date;
@@ -171,6 +172,13 @@
// } 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(
@@ -187,10 +195,13 @@
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