修改时间选择

ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js

@@ -32,7 +32,7 @@ const sensorInfoList = function (sensorTypeId) {
                             columnsArray.push({
                                 field: property,
                                 title: typeof(sensorTypeArray.find(x=>x.paramTitle.includes(property))) == "undefined" ? property : sensorTypeArray.find(x=>x.paramTitle.includes(property)).paramText,
-                                width: property == "imgstr" || property == "md5" ? 500 : 140,
+                                width: property == "imgstr" || property == "md5" ? 500 : 170,
                                 align: "center",height: 60
                             });
                         }

ruoyi-admin/src/main/resources/templates/section/transformer-detail.html

@@ -238,9 +238,9 @@
     #sensor-card-group {
       position: absolute;
       width: 49%;
-      height: 85%;
+      height: 90%;
       left: 49%;
-      top: 13%;
+      top: 7%;
       overflow-y: scroll;
       display: flex;
       flex-wrap: wrap;
@@ -502,22 +502,6 @@
 </div>
 
 
-<nav class="nav search-bar d-inline-block" id="main-search-bar">
-  <form action="#" class="search-form-nav">
-    <input id="monitorUnitId" name="monitorUnitId" type="hidden">
-    <label class="search-label" for="monitor-unit">监控单元:</label>
-    <input class="form-control d-inline-block" id="monitor-unit" name="monitor-unit" placeholder="请输入监控单元"
-           type="text">
-    <label class="search-label" for="sensor-type">传感器类型:</label>
-    <input class="form-control d-inline-block" id="sensor-type" name="sensor-type" placeholder="请输入传感器类型"
-           type="text">
-    <label class="search-label" for="sensor-name">传感器名称:</label>
-    <input class="form-control d-inline-block" id="sensor-name" name="sensor-name" placeholder="请输入传感器名称"
-           type="text">
-
-    <button class="btn btn-primary search-btn">搜索</button>
-  </form>
-</nav>
 <div id="sensor-card-group">
 </div>
 <div class="imgMagnification" id="imgMagnification">
@@ -596,7 +580,8 @@
           ...e,
           nodes,
         }
-      })
+      }).filter(e=>!!e)
+      console.log(data)
       // console.log(data)
       initSelectableTree(data)
       // return $selectableTree.treeview('search', [$('#input-select-node').val(), {
@@ -605,7 +590,7 @@
       // }]);
     };
 
-    $('#input-select-node').on('keyup', function (e) {
+    $('#input-select-node').on('input', function (e) {
      findSelectableNodes();
      //  initSelectableTree([])
       // $('.select-node').prop('disabled', !(selectableNodes.length >= 1));