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

---
 .../templates/iot-ui/sensorSummary.html       |  8 +++++-
 .../templates/section/transformer-detail.html | 27 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)
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 772e4d6..6a34098 100644
--- a/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html
+++ b/ruoyi-admin/src/main/resources/templates/iot-ui/sensorSummary.html
@@ -10,6 +10,12 @@
     <link rel="stylesheet" th:href="@{/css/lot-ui/bootstrap-table.css}"/>
     <link rel="stylesheet" th:href="@{/css/lot-ui/Iot-sensorSummaryStyle.css}"/>
 </head>
+<style>
+  .bootstrap-table .fixed-table-container .fixed-table-body{
+    height: calc(91vh - 100px);
+
+  }
+</style>
 <body>
 <!--传感器类型-->
 <iframe id="sensorType" name="a_iframe" width="100%" height="100%" frameborder="1" align="middle"
@@ -66,4 +72,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
index a21f0a4..25ebc2c 100644
--- a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
+++ b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
@@ -549,6 +549,7 @@
     })
   }
 
+  let listData = []
   $(function () {
     var search = function () {
       $.ajax({
@@ -557,6 +558,7 @@
         dataType: 'JSON',  // 反序列化
         success: (res) => {  // 成功获取到后端返回结果的回调函数
           initSelectableTree(res);
+          listData = res
           return res;
         },
         error: () => {  // 发送失败的回调函数
@@ -566,6 +568,7 @@
     }
 
     var initSelectableTree = function (defaultData) {
+      console.log(defaultData)
       return $('#treeview-selectable').treeview({
         data: defaultData,
         multiSelect: $('#chk-select-multi').is(':checked'),
@@ -586,16 +589,26 @@
     var $selectableTree = initSelectableTree(search());
 
     var findSelectableNodes = function () {
-      return $selectableTree.treeview('search', [$('#input-select-node').val(), {
-        ignoreCase: false,
-        exactMatch: false,
-      }]);
+      let data = listData.map(e=>{
+        let nodes = e.nodes.filter(val=>val.text.includes($('#input-select-node').val()))
+        if(nodes.length === 0) return
+        return{
+          ...e,
+          nodes,
+        }
+      })
+      // console.log(data)
+      initSelectableTree(data)
+      // return $selectableTree.treeview('search', [$('#input-select-node').val(), {
+      //   ignoreCase: false,
+      //   exactMatch: false,
+      // }]);
     };
-    var selectableNodes = findSelectableNodes();
 
     $('#input-select-node').on('keyup', function (e) {
-      selectableNodes = findSelectableNodes();
-      $('.select-node').prop('disabled', !(selectableNodes.length >= 1));
+     findSelectableNodes();
+     //  initSelectableTree([])
+      // $('.select-node').prop('disabled', !(selectableNodes.length >= 1));
     });
   });
 </script>
