diff --git a/ruoyi-admin/src/main/resources/static/img/card.png b/ruoyi-admin/src/main/resources/static/img/card.png new file mode 100644 index 0000000..06ecbf9 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/card.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/dg.png b/ruoyi-admin/src/main/resources/static/img/dg.png new file mode 100644 index 0000000..7de912f Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/dg.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/dj.png b/ruoyi-admin/src/main/resources/static/img/dj.png new file mode 100644 index 0000000..71ebf20 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/dj.png differ diff --git a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html index e489f1c..9db06ed 100644 --- a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html +++ b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html @@ -8,10 +8,50 @@ @@ -134,6 +214,10 @@ let time1 = null + function formatValue(value) { + return (value === null || value === undefined || value === "") ? "-" : value; + } + function queryDeptTree() { var url = ctx + "system/Monitor/treeData?monitorType=" + 20; var options = { @@ -160,14 +244,20 @@ data.forEach((v, k) => { var isOver = (v.isThreshold === 1 || v.isThreshold === '1'); var redStyle = isOver ? 'color:#d9534f;font-weight:700;' : ''; + var cardImg = ctx + "img/card.png"; + var sensorImg = ctx + "img/dj.png"; let html = ` -