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 d078687..d210d13 100644 --- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml +++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml @@ -95,7 +95,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea and t.id=#{id} - and t.name like concat('%', #{monitorName},'%') + and t.name like concat(concat('%', #{monitorName}), '%') and t.sn= #{monitorNo} and t.dept_id= #{deptId} and t.status= #{status} @@ -342,7 +342,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea and report_time >= #{startTime,jdbcType=TIMESTAMP} and report_time <= #{endTime,jdbcType=TIMESTAMP} and th_device_report.sn= #{sn} - and t.name like concat('%', #{name}, '%') + and t.name like concat(concat('%', #{name}), '%') and t.dept_id IN (SELECT dept_id FROM sys_dept START WITH dept_id = #{deptId} diff --git a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue index 377970b..1718b8a 100644 --- a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue +++ b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue @@ -69,9 +69,9 @@ @@ -115,14 +115,14 @@

处理状态

-

{{ detailParams.status === '1' ? '正在处理' : '处理完成' }}

+

{{ detailParams.status == '1' ? '正在处理' : '处理完成' }}

报警信息

报警上报时间: {{ detailParams.reportTime }}

-

报警值: {{ detailParams.ds }}

+

报警值: {{ detailParams.ds }}mg/m³

@@ -132,7 +132,7 @@ - +

处理信息

处理人: {{ detailParams.dealUser }}

备注: {{ detailParams.remark }}

@@ -144,7 +144,7 @@
- +

处理结果

报警原因: {{ detailParams.reason }}

处理人: {{ detailParams.dealUser }}