From 1667dd2c5c593f2cfa98cdc5e85d795ce71496c6 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 31 Mar 2022 15:22:04 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/Iot-ui/sensorTableList.js  | 6 +++---
 .../src/main/resources/templates/iot-ui/sensorSummary.html  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js b/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
index 24c7513..7d8808f 100644
--- a/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
+++ b/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
@@ -106,7 +106,7 @@ const onSearchByMonitorLocation = function (obj) {
         var storeId = document.getElementById('table');
         var rowsLength = storeId.rows.length;
         var key = obj.value;
-        var searchCol = 3;
+        var searchCol = storeId.rows.item(0).cells.length-3;
         for (var i = 1; i < rowsLength; i++) {
             var searchText = storeId.rows[i].cells[searchCol].innerHTML;
             if (searchText.match(key)) {
@@ -123,7 +123,7 @@ const onSearchBySensorId = function (obj) {
         var storeId = document.getElementById('table');
         var rowsLength = storeId.rows.length;
         var key = obj.value;
-        var searchCol = 2;
+        var searchCol = 1;
         for (var i = 1; i < rowsLength; i++) {
             var searchText = storeId.rows[i].cells[searchCol].innerHTML;
             if (searchText.match(key)) {
@@ -140,7 +140,7 @@ const onSearchByCollectTime = function (obj) {
         var storeId = document.getElementById('table');
         var rowsLength = storeId.rows.length;
         var key = obj.value;
-        var searchCol = 4;
+        var searchCol = storeId.rows.item(0).cells.length-2;
         for (var i = 1; i < rowsLength; i++) {
             var searchText = storeId.rows[i].cells[searchCol].innerHTML;
             if (searchText.match(key)) {
diff --git a/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html b/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html
index df8e048..7f35fe6 100644
--- a/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html
+++ b/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html
@@ -30,8 +30,8 @@
             <input type="text" class="form-control" onkeydown="onSearchBySensorId(this)" id="sensorId" name="sensorId"
                    placeholder="请输入传感器编号">
 
-            <label class="search-label">采集时间:</label>
-            <input type="text" class="form-control" onkeydown="onSearchByCollectTime(this)" id="collectTime" name="collectTime" placeholder="请输入采集时间">
+            <label class="search-label">时间:</label>
+            <input type="text" class="form-control" onkeydown="onSearchByCollectTime(this)" id="collectTime" name="collectTime" placeholder="请输入时间">
         </div>
     </form>
 </div>