From bf1f4b9ba14da16222b412b5dc4f5822a31dadf1 Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Sun, 15 Dec 2024 20:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E6=8B=89=E6=A1=86=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=9B=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81=E5=8F=AF=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/oil/OilMonitorMapper.xml         | 2 +-
 ruoyi-ui/src/views/alarmMonitor/bound/index.vue                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
             <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
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 @@
           <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>