diff --git a/ruoyi-admin/src/main/resources/templates/record/recordSensorData/temperatureTrend.html b/ruoyi-admin/src/main/resources/templates/record/recordSensorData/temperatureTrend.html index 7712279..d81eff5 100644 --- a/ruoyi-admin/src/main/resources/templates/record/recordSensorData/temperatureTrend.html +++ b/ruoyi-admin/src/main/resources/templates/record/recordSensorData/temperatureTrend.html @@ -383,6 +383,9 @@ color: "#000000", }, }, + min:20, + max:30, + interval: 1, }, ], dataZoom: [ diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml index dd6c532..a2d2b52 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmInfoMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_alarm_type t2 on t1.AlarmType_Id = t2.alarmType_Id left join base_sensor_info t3 on t1.Sensor_Id = t3.Sensor_Id - and t3.Sensor_Name like concat('%', #{sensorId}, '%') + and t3.Sensor_Id like concat('%', #{sensorId}, '%') and t1.AlarmType_Id = #{alarmtypeId}