From 627e8fd07eeb2293428dc64af2512909e2f1d768 Mon Sep 17 00:00:00 2001 From: LokerL Date: Wed, 9 Oct 2024 11:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=20=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit （1）选择部门，点击后页面无数据，需调整
（2）安装企业为空，应该取deptName
（3）操作中添加按钮“查看位置”。点击可在弹窗中以地图的形式展示设备的位置以及报警值 --- .../mybatis/oil/OilMonitorMapper.xml | 55 +- .../src/views/alarmMonitor/bound/index.vue | 577 +++++++++++------- 2 files changed, 404 insertions(+), 228 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 a96ae9c..27e450b 100644 --- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml +++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml @@ -204,20 +204,20 @@ select t.id,t. name,t.sn,t.file_url,t.note,t.create_by,t.create_time,t.address,t SELECT th_device_report.id AS reportId, th_device_report.sn, - report_time, - power, - qb, - wd, - yl, + th_device_report.report_time, + th_device_report.power, + th_device_report.qb, + th_device_report.wd, + th_device_report.yl, th_device_report.latitude, th_device_report.longitude, - cgq, + th_device_report.cgq, th_device_report.ds AS ds, th_device_report.dw AS dw, - th_device_report.zl AS zl, + th_device_report.zl AS zl, th_device_report.zt AS zt, th_device_report.dbz AS dbz, - th_device_report.gbz AS gbz, + th_device_report.gbz AS gbz, t.NAME, t.dept_id, dept.dept_name, @@ -233,21 +233,32 @@ select t.id,t. name,t.sn,t.file_url,t.note,t.create_by,t.create_time,t.address,t LEFT JOIN sys_dept dept on t.dept_id=dept.dept_id LEFT JOIN th_device_deal d ON th_device_report.id = d.report_id - ( th_device_report.zt='一级报警' or th_device_report.zt='二级报警') - - 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 d.dealUser like concat('%', #{dealUser}, '%') - and t.dept_id=#{deptId} + (th_device_report.zt='一级报警' or th_device_report.zt='二级报警') + + and th_device_report.sn IN ( + SELECT td.sn + FROM th_device td + LEFT JOIN sys_dept p ON td.dept_id = p.dept_id + WHERE td.dept_id IN ( + SELECT dept_id + FROM sys_dept + START WITH dept_id = #{deptId} + CONNECT BY PRIOR dept_id = parent_id + ) + ) + + and th_device_report.report_time > #{startTime,jdbcType=TIMESTAMP} + and th_device_report.report_time < #{endTime,jdbcType=TIMESTAMP} + 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.is_deal='1' - - - and (d.is_deal is null or d.is_deal='0') - + + and d.is_deal='1' + + + and (d.is_deal is null or d.is_deal='0') + ${params.dataScope} diff --git a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue index abe00a2..7689eca 100644 --- a/ruoyi-ui/src/views/alarmMonitor/bound/index.vue +++ b/ruoyi-ui/src/views/alarmMonitor/bound/index.vue @@ -1,162 +1,304 @@ - - + +