From cdd61fe225ec02defd5707acbc5727fcadb9c7e8 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期五, 28 十月 2022 16:20:31 +0800
Subject: [PATCH] 更改小时和天日历选择bug

---
 widgetsTS/dataTime/widget.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 7935baa..710b4c5 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -97,12 +97,12 @@
           var tmpDatetime =  $('#appDateHour').val();
           tmpDatetime = tmpDatetime.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
           mars3d.global_variables.queryDataTStart =   $('#appDateHour').val();
-          mars3d.global_variables.queryDataTEnd =  $('#appDateHour').val().substring(0,14)+"15:00";
+          mars3d.global_variables.queryDataTEnd =  $('#appDateMin').val().substring(0,14) + (Number($('#appDateMin').val().substring(14,16)) + 14).toString() +":59";
+          // mars3d.global_variables.queryDataTEnd =  $('#appDateHour').val().substring(0,14)+"15:00";
           mars3d.global_variables.DefaultDateTimeStart =  $('#appDateHour').val().substring(0,11)+"00:00:00";
           mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
           mars3d.global_variables.queryDataType = value;
           mars3d.global_variables.timetype = "hour";
-          console.log(mars3d.global_variables.queryDataTStart,"start",mars3d.global_variables.queryDataTEnd,"end",mars3d.global_variables.DefaultDateTimeStart,"涓�澶╃殑鏃堕棿")
           reLoadLayers();
           refreshWidgets();
           timetype_change1();
@@ -119,12 +119,12 @@
           
           tmpDatetime = tmpDatetime.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
           mars3d.global_variables.queryDataTStart =  $('#appDate').val() + " 00:00:00";
-          mars3d.global_variables.queryDataTEnd = $('#appDate').val()+ " 00:15:00";
+          mars3d.global_variables.queryDataTEnd =  $('#appDateMin').val().substring(0,14) + (Number($('#appDateMin').val().substring(14,16)) + 14).toString() +":59";
+          // mars3d.global_variables.queryDataTEnd = $('#appDate').val()+ " 00:15:00";
           mars3d.global_variables.DefaultDateTimeStart = $('#appDate').val().substring(0,8)+"01 00:00:00";
           mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
           mars3d.global_variables.queryDataType = value;
           mars3d.global_variables.timetype = "day";
-          console.log(tmpDatetime,mars3d.global_variables.queryDataTStart,mars3d.global_variables.queryDataTEnd ,mars3d.global_variables.DefaultDateTimeStart,"涓�澶╃殑鏃堕棿")
           reLoadLayers();
           refreshWidgets();
           timetype_change1();
@@ -140,10 +140,12 @@
           $('#appDateHour').hide()
           $('#appDateMin').show()
           // mars3d.global_variables.queryDataTStart =  $('#appDateMin').val();
+          
           mars3d.global_variables.queryDataTStartTaxi =   $('#appDateMin').val();
           mars3d.global_variables.queryDataTEnd =  $('#appDateMin').val().substring(0,14) + (Number($('#appDateMin').val().substring(14,16)) + 14).toString() +":59";
           mars3d.global_variables.DefaultDateTimeStart =  $('#appDateMin').val().substring(0,11)+"00:00:00";
           mars3d.global_variables.timetype = "min";
+          console.log($('#appDateMin').val(),mars3d.global_variables.queryDataTEnd,mars3d.global_variables.DefaultDateTimeStart)
           taxi_reLoadLayers();
           timetype_change1();
           timetype_change2();
@@ -180,7 +182,6 @@
       });
       $("#appDate").datetimepicker("setDate", new Date(this.defaultDate));
       $("#appDate").datetimepicker("setEndDate", new Date(this.defaultDate));
-
       $("#appDateHour").datetimepicker({
         bootcssVer: 3,  //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
         format: 'yyyy-mm-dd hh:00:00',

--
Gitblit v1.9.1