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 ea00db5..97ef69d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html +++ b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html @@ -124,6 +124,13 @@ height: 22vw; } + #chartDivs { + height: calc(100vh - 4.2vw - 0.8vw - 15px); + overflow-y: auto; + -ms-overflow-style: none; + scrollbar-width: none; + } + .border { min-height: 10.5vw; border: 0; diff --git a/ruoyi-admin/src/main/resources/templates/system/TempertureData/DistributionCabinetMonitor.html b/ruoyi-admin/src/main/resources/templates/system/TempertureData/DistributionCabinetMonitor.html index fcc52c8..9e5e323 100644 --- a/ruoyi-admin/src/main/resources/templates/system/TempertureData/DistributionCabinetMonitor.html +++ b/ruoyi-admin/src/main/resources/templates/system/TempertureData/DistributionCabinetMonitor.html @@ -452,7 +452,8 @@ var minTemperature = parseTemperature(v.humidity); var maxTemperature = parseTemperature(v.tempreture); var avgTemperature = parseTemperature(v.illuminance); - var progress = getTemperatureProgress(minTemperature, maxTemperature, avgTemperature); + // var progress = getTemperatureProgress(minTemperature, maxTemperature, avgTemperature); + var progress = v.tempreture var tempClass = getTemperatureBarClass(v.tempreture); var html = "" + "