diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml index b347d88..32046e7 100644 --- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml +++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml @@ -264,7 +264,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea and th_device_report.sn= #{sn} and t.name like concat(concat('%',#{name, jdbcType=VARCHAR}),'%') and d.deal_user like concat(concat('%',#{dealUser, jdbcType=VARCHAR}),'%') - and d.staus=#{status} + and d.status=#{status} ${params.dataScope} order by th_device_report.report_time desc diff --git a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue index d9bc596..bf05dce 100644 --- a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue +++ b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue @@ -11,7 +11,7 @@ --> - +