change - 传感器汇总页面过滤条件修改

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)) {

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>
+            <label class="search-label">时间:</label>
-            <input type="text" class="form-control" onkeydown="onSearchByCollectTime(this)" id="collectTime" name="collectTime" placeholder="请输入采集时间">
+            <input type="text" class="form-control" onkeydown="onSearchByCollectTime(this)" id="collectTime" name="collectTime" placeholder="请输入时间">
         </div>
     </form>
 </div>