From e8af50a22b2c521416d85eb9926904dc377daa97 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期五, 21 一月 2022 15:47:53 +0800
Subject: [PATCH] geoserver 天时 bug fix

---
 widgetsTS/dataTime/widget.js |    7 ++++---
 widgetsTS/dataTime/view.html |   13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/widgetsTS/dataTime/view.html b/widgetsTS/dataTime/view.html
index f5a9275..302233b 100644
--- a/widgetsTS/dataTime/view.html
+++ b/widgetsTS/dataTime/view.html
@@ -9,6 +9,12 @@
       <div class="layui-form-item">
         <div class="layui-inline">
           <div class="layui-input-inline">
+            <input type="radio" name="datatype" value="min" title="15鍒嗛挓鏁版嵁">
+            <input type="text" class="layui-input" id="datatype_min" placeholder="yyyy-mm-dd hh:ii:00">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <div class="layui-input-inline">
             <input type="radio" name="datatype" value="hour" title="灏忔椂鏁版嵁" checked>
             <input type="text" class="layui-input" id="datatype_hour" placeholder="yyyy-mm-dd hh">
           </div>
@@ -19,12 +25,7 @@
             <input type="text" class="layui-input" id="datatype_day" placeholder="yyyy-mm-dd">
           </div>
         </div>
-        <div class="layui-inline">
-          <div class="layui-input-inline">
-            <input type="radio" name="datatype" value="min" title="15鍒嗛挓鏁版嵁">
-            <input type="text" class="layui-input" id="datatype_min" placeholder="yyyy-mm-dd hh:ii:00">
-          </div>
-        </div>
+        
       </div>
     </div>
   </ul>
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 3dfe7ea..6d2bb0e 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -99,6 +99,7 @@
           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;
           reLoadLayers();
           refreshWidgets();
         }else if (value == 'day') {
@@ -112,6 +113,7 @@
           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;
           reLoadLayers();
           refreshWidgets();
         }else if(value = 'min'){ 
@@ -145,7 +147,7 @@
         // 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 = "day";
         reLoadLayers();
         refreshWidgets();
 
@@ -166,14 +168,13 @@
         initialDate: new Date(),
         todayHighlight: 1  //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
       }).on("changeDate", function () {
-
         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.DefaultDateTimeStart =  $('#appDateHour').val().substring(0,11)+"00:00:00";
         mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
-
+        mars3d.global_variables.queryDataType = "hour";
         reLoadLayers();
         refreshWidgets();
       });

--
Gitblit v1.9.1