From 5fa3df191231cfba918b4945122907b1ac0878e6 Mon Sep 17 00:00:00 2001 From: wenjy Date: Sat, 14 May 2022 11:50:14 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=A0=E6=84=9F=E5=99=A8?= =?UTF-8?q?=E9=98=88=E5=80=BC=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=B8=A9=E5=BA=A6=E6=9B=B2=E7=BA=BFy?= =?UTF-8?q?=E8=BD=B4=E5=88=BB=E5=BA=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/record/recordSensorData/temperatureTrend.html | 3 +++ .../src/main/resources/mapper/system/BaseAlarmInfoMapper.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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}