From cb4522501767fe8d924f5f43ffe178de5a536368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 16 May 2023 09:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recordSensorData/recordSensorData.html    | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/record/recordSensorData/recordSensorData.html b/ruoyi-admin/src/main/resources/templates/record/recordSensorData/recordSensorData.html
index 52034bb..4badeda 100644
--- a/ruoyi-admin/src/main/resources/templates/record/recordSensorData/recordSensorData.html
+++ b/ruoyi-admin/src/main/resources/templates/record/recordSensorData/recordSensorData.html
@@ -18,11 +18,8 @@
             </li>
             <li class="select-time">
               <label>采集时间：</label>
-              <input class="time-input" id="startTime" name="beginCollectTime" placeholder="开始时间"
-                     type="text"/>
-              <span>-</span>
-              <input class="time-input" id="endTime" name="endCollectTime" placeholder="结束时间"
-                     type="text"/>
+              <input class="time-input" id="startEndTime" name="beginCollectTime" placeholder="开始时间"
+                     type="text" style="width:275px"/>
             </li>
             <li>
               <a class="btn btn-primary btn-rounded btn-sm" onclick="tableRefresh()"><i
@@ -63,8 +60,8 @@
     let formData = new FormData();
     formData.append("sensorId", sensorId[0]);
     formData.append("sensorType", sensorId[1]);
-    formData.append("beginCollectTime", $("#startTime").val());
-    formData.append("endCollectTime", $("#endTime").val());
+    formData.append("beginCollectTime", $("#startEndTime").val().split(' - ')?.[0] || '');
+    formData.append("endCollectTime", $("#startEndTime").val().split(' - ')?.[1] || '');
 
     $.ajax({
       type: "post",
@@ -204,15 +201,11 @@
     var laydate = layui.laydate;
 
     laydate.render({
-      elem: '#startTime',
+      elem: '#startEndTime',
       type: 'datetime',
-      trigger: 'click'
-    });
-
-    laydate.render({
-      elem: '#endTime',
-      type: 'datetime',
-      trigger: 'click'
+      trigger: 'click',
+      range: true,
+      format: 'yyyy-MM-dd HH:mm:ss',
     });
   });
 </script>