gongjiale
/
gangkou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix: 报警管理下拉框报错；处理状态可清空

This commit is contained in:
LokerL 2024-12-15 20:19:20 +08:00
parent e98809b93a
commit bf1f4b9ba1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
View File

@ -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
<if test="sn != null">and th_device_report.sn= #{sn}</if>
<if test="name != null">and t.name like concat(concat('%',#{name, jdbcType=VARCHAR}),'%')</if>
<if test="dealUser != null">and d.deal_user like concat(concat('%',#{dealUser, jdbcType=VARCHAR}),'%')</if>
<if test="status != null"> and d.staus=#{status}</if>
<if test="status != null"> and d.status=#{status}</if>
</where>
${params.dataScope}
order by th_device_report.report_time desc

2
ruoyi-ui/src/views/alarmMonitor/bound/index.vue
View File

@ -11,7 +11,7 @@
<el-input v-model="queryParams.sn"></el-input>
</el-form-item> -->
<el-form-item label="处理状态">
<el-select v-model="queryParams.status" placeholder="请选择处理状态" style="width: 150px;">
<el-select v-model="queryParams.status" placeholder="请选择处理状态" clearable style="width: 150px;">
<el-option label="正在处理" value="1"></el-option>
<el-option label="处理完成" value="2"></el-option>
</el-select>