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 84ffcda..e67f44d 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 @@ -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 }); } 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 25ebc2c..de2a422 100644 --- a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html +++ b/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 @@ -
@@ -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));