From 31a9707d0a9bba96c1a67f26c89ff956a519125f Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Tue, 29 Oct 2024 17:01:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=EF=BC=8C=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oil/controller/OilReportController.java   |   62 +
 .../oil/domain/monitor/ThDeviceDeal.java      |  136 ++
 .../oil/mapper/ThDeviceDealMapper.java        |   16 +
 .../project/oil/mapper/ThDeviceMapper.java    |    7 +
 .../oil/mapper/ThDeviceReportMapper.java      |    2 +
 .../oil/service/IOilThDeviceDealService.java  |    9 +
 .../service/IOilThDeviceReportService.java    |    2 +
 .../oil/service/IOilThDeviceService.java      |    3 +
 .../impl/OilThDeviceDealServiceImpl.java      |   18 +
 .../impl/OilThDeviceReportService.java        |    5 +
 .../service/impl/OilThDeviceServiceImpl.java  |    6 +
 .../resources/mybatis/oil/ThDeviceDeal.xml    |   41 +
 .../resources/mybatis/oil/ThDeviceMapper.xml  |   17 +
 .../mybatis/oil/ThDeviceReportMapper.xml      |   36 +
 ruoyi-ui/src/api/report/index.js              |   17 +
 .../src/views/reportGenerate/bound/index.vue  | 1303 +++++------------
 16 files changed, 734 insertions(+), 946 deletions(-)
 create mode 100644 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
 create mode 100644 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/domain/monitor/ThDeviceDeal.java
 create mode 100644 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
 create mode 100644 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceDealService.java
 create mode 100644 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
 create mode 100644 RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml
 create mode 100644 ruoyi-ui/src/api/report/index.js

diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
new file mode 100644
index 0000000..e5ca76a
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
@@ -0,0 +1,62 @@
+package com.ruoyi.project.oil.controller;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.oil.service.IOilThDeviceDealService;
+import com.ruoyi.project.oil.service.IOilThDeviceService;
+import com.ruoyi.project.oil.service.impl.OilThDeviceReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/report")
+public class OilReportController extends BaseController {
+
+    @Autowired
+    IOilThDeviceService oilThDeviceService;
+
+    @Autowired
+    IOilThDeviceDealService oilThDeviceDealService;
+    @Autowired
+    private OilThDeviceReportService oilThDeviceReportService;
+
+    private int getDeviceCount(Long deptId, String year, Integer status) {
+        Map<String, Object> deviceCountMap = new HashMap<>();
+        deviceCountMap.put("deptId", deptId);
+        deviceCountMap.put("year", year);
+        if (status != null) {
+            deviceCountMap.put("status", status);
+        }
+        return oilThDeviceService.countDevice(deviceCountMap);
+    }
+
+    @GetMapping("/getBoundDashboardData")
+    public AjaxResult getBoundDashboardData(Long deptId, String year) {
+        Map<String, Object> resultMap = new HashMap<>();
+        // 设备总数
+        int deviceCount = getDeviceCount(deptId, year, null);
+        // 正常设备数
+        int normalDeviceCount = getDeviceCount(deptId, year, 1);
+        // 异常设备数
+        int abnormalDeviceCount = getDeviceCount(deptId, year, 0);
+        // 全年解决报警次数
+//        int alarmSolveCountYear = oilThDeviceDealService.countThDeviceDealByYear(year);
+        resultMap.put("deviceCount", deviceCount);
+        resultMap.put("normalDeviceCount", normalDeviceCount);
+        resultMap.put("abnormalDeviceCount", abnormalDeviceCount);
+//        resultMap.put("alarmSolveCountYear", alarmSolveCountYear);
+        return AjaxResult.success(resultMap);
+    }
+
+    @GetMapping("/getBoundTableData")
+    public AjaxResult getBoundTableData(Long deptId, String year) {
+        List<Map<String, Object>> result = oilThDeviceReportService.selectOverLimitCountByYearAndDeptId(deptId, year);
+        return AjaxResult.success(result);
+    }
+}
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/domain/monitor/ThDeviceDeal.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/domain/monitor/ThDeviceDeal.java
new file mode 100644
index 0000000..b6b4e06
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/domain/monitor/ThDeviceDeal.java
@@ -0,0 +1,136 @@
+package com.ruoyi.project.oil.domain.monitor;
+
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+import java.util.Date;
+
+
+public class ThDeviceDeal extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    /** 表id */
+    private Long id;
+
+    /** 报警id */
+    private Long reportId;
+
+    /** 处理人id */
+    private String dealUser;
+
+    /** 处理方式 */
+    private String dealWay;
+
+    /** 处理时间 */
+    private Date dealTime;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    private Date createTime;
+
+    /** 报警原因 */
+    private String reason;
+
+    /** 图片地址 */
+    private String fileUrl;
+
+    /** 1:正在处理 2：处理完成 */
+    private Integer status;
+
+    /** 备注 */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getDealUser() {
+        return dealUser;
+    }
+
+    public void setDealUser(String dealUser) {
+        this.dealUser = dealUser;
+    }
+
+    public String getDealWay() {
+        return dealWay;
+    }
+
+    public void setDealWay(String dealWay) {
+        this.dealWay = dealWay;
+    }
+
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
+    @Override
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
new file mode 100644
index 0000000..73acd7c
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.project.oil.mapper;
+
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * @author Lenovo
+ * @description 针对表【th_device_deal】的数据库操作Mapper
+ * @createDate 2024-10-29 15:40:41
+ * @Entity com.ruoyi.oil.domain.monitor.ThDeviceDeal
+ */
+public interface ThDeviceDealMapper {
+    int countThDeviceDealByYear(@Param("year") String year);
+}
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceMapper.java
index 62a594d..4f80736 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceMapper.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceMapper.java
@@ -3,6 +3,7 @@ package com.ruoyi.project.oil.mapper;
 import com.ruoyi.project.oil.domain.monitor.ThDevice;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Lenovo
@@ -28,6 +29,12 @@ public interface ThDeviceMapper {
      */
     List<ThDevice> selectDeviceList(ThDevice thDevice);
 
+    /**
+     * 设备统计
+     * @return 设备统计
+     */
+    int countDevice(Map<String, Object> params);
+
 }
 
 
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceReportMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceReportMapper.java
index 72dea74..f03879d 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceReportMapper.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceReportMapper.java
@@ -78,4 +78,6 @@ public interface ThDeviceReportMapper {
     @MapKey("sn")
     List<Map<String, Object>> selectAlarmCountByDeptIdAndDateRangeDesc(@Param("deptId") Long deptId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
 
+    @MapKey("sn")
+    List<Map<String, Object>> selectOverLimitCountByYearAndDeptId(@Param("deptId") Long deptId, @Param("year") String year);
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceDealService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceDealService.java
new file mode 100644
index 0000000..032ef2c
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceDealService.java
@@ -0,0 +1,9 @@
+package com.ruoyi.project.oil.service;
+
+public interface IOilThDeviceDealService {
+
+    /**
+     * 根据年份查询设备处理数量
+     */
+    int countThDeviceDealByYear(String year);
+}
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceReportService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceReportService.java
index c4ab0b1..48d6047 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceReportService.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceReportService.java
@@ -13,4 +13,6 @@ public interface IOilThDeviceReportService {
     List<Map<String, Object>> selectAlarmCountByDeptIdAndDateRange(Long deptId, String beginDate, String endDate);
 
     List<Map<String, Object>> selectAlarmCountByDeptIdAndDateRangeDesc(Long deptId, String beginDate, String endDate);
+
+    List<Map<String, Object>> selectOverLimitCountByYearAndDeptId(Long deptId, String year);
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceService.java
index 817ca1c..37d054d 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceService.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilThDeviceService.java
@@ -56,4 +56,7 @@ public interface IOilThDeviceService {
      * @return 按月度统计的ds平均值
      */
     List<Map<String, Object>> selectAllAvgByMonth(Long deptId, String month);
+
+
+    int countDevice(Map<String, Object> params);
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
new file mode 100644
index 0000000..183bb5f
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.project.oil.service.impl;
+
+import com.ruoyi.project.oil.mapper.ThDeviceDealMapper;
+import com.ruoyi.project.oil.service.IOilThDeviceDealService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OilThDeviceDealServiceImpl implements IOilThDeviceDealService {
+
+    @Autowired
+    private ThDeviceDealMapper thDeviceDealMapper;
+
+    @Override
+    public int countThDeviceDealByYear(String year) {
+        return thDeviceDealMapper.countThDeviceDealByYear(year);
+    }
+}
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceReportService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceReportService.java
index 65bafc5..81ad6b3 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceReportService.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceReportService.java
@@ -41,4 +41,9 @@ public class OilThDeviceReportService  implements IOilThDeviceReportService {
         return camelCaseMapListKey(thDeviceReportMapper.selectAlarmCountByDeptIdAndDateRangeDesc(deptId, beginDate, endDate));
     }
 
+    @Override
+    public List<Map<String, Object>> selectOverLimitCountByYearAndDeptId(Long deptId, String year) {
+        return camelCaseMapListKey(thDeviceReportMapper.selectOverLimitCountByYearAndDeptId(deptId, year));
+    }
+
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceServiceImpl.java
index d7f16cb..cdf2732 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceServiceImpl.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceServiceImpl.java
@@ -91,4 +91,10 @@ public class OilThDeviceServiceImpl implements IOilThDeviceService {
 
         return result;
     }
+
+    @Override
+    public int countDevice(Map<String, Object> params) {
+        return thDeviceMapper.countDevice(params);
+    }
+
 }
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml
new file mode 100644
index 0000000..9bf1bb6
--- /dev/null
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.ruoyi.project.oil.mapper.ThDeviceDealMapper">
+    <parameterMap id="BaseParameterMap" type="com.ruoyi.project.oil.domain.monitor.ThDeviceDeal">
+        <parameter property="id" jdbcType="BIGINT" />
+        <parameter property="reportId" jdbcType="BIGINT" />
+        <parameter property="dealUser" jdbcType="VARCHAR" />
+        <parameter property="dealWay" jdbcType="VARCHAR" />
+        <parameter property="dealTime" jdbcType="TIMESTAMP" />
+        <parameter property="createBy" jdbcType="VARCHAR" />
+        <parameter property="createTime" jdbcType="TIMESTAMP" />
+        <parameter property="reason" jdbcType="VARCHAR" />
+        <parameter property="fileUrl" jdbcType="VARCHAR" />
+        <parameter property="status" jdbcType="INTEGER" />
+        <parameter property="remark" jdbcType="VARCHAR" />
+    </parameterMap>
+    <resultMap id="ThDeviceDealResultMap" type="com.ruoyi.project.oil.domain.monitor.ThDeviceDeal">
+        <id property="id" column="ID" jdbcType="BIGINT" />
+        <result property="reportId" column="REPORT_ID" jdbcType="BIGINT" />
+        <result property="dealUser" column="DEAL_USER" jdbcType="VARCHAR" />
+        <result property="dealWay" column="DEAL_WAY" jdbcType="VARCHAR" />
+        <result property="dealTime" column="DEAL_TIME" jdbcType="TIMESTAMP" />
+        <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR" />
+        <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP" />
+        <result property="reason" column="REASON" jdbcType="VARCHAR" />
+        <result property="fileUrl" column="FILE_URL" jdbcType="VARCHAR" />
+        <result property="status" column="STATUS" jdbcType="INTEGER" />
+        <result property="remark" column="REMARK" jdbcType="VARCHAR" />
+    </resultMap>
+
+
+    <select id="countThDeviceDealByYear" parameterType="map" resultType="int">
+        SELECT COUNT(1) FROM th_device_deal
+        WHERE to_char(create_time, 'yyyy') = #{year}
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
index f8d3dbf..619eae9 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
@@ -120,4 +120,21 @@
             #{deptId}
         </foreach>
     </select>
+
+    <select id="countDevice" parameterType="map" resultType="int">
+        select count(1) from th_device d
+        <where>
+            <if test="deptId != null and deptId != ''">
+                AND d.dept_id IN (SELECT dept_id
+                FROM sys_dept START WITH dept_id = #{deptId}
+                CONNECT BY PRIOR dept_id = parent_id)
+            </if>
+            <if test="year != null and year != ''">
+                AND to_char(d.create_time, 'yyyy') = #{year}
+            </if>
+            <if test="status != null">
+                AND d.status = #{status}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
index 61525f2..ed2860b 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -210,4 +210,40 @@
         GROUP BY d.sn, p.dept_name, pp.dept_name, ppp.dept_name, td.address, td.name, d.zt
         ORDER BY count DESC
     </select>
+
+
+    <!--  选择 某年year，每个deptId下的所有设备的每个月的超限次数(ds不在dbz和gbz范围内的行)  -->
+    <select id="selectOverLimitCountByYearAndDeptId" parameterType="map" resultType="map">
+    SELECT d.sn,
+           td.address,
+           p.dept_name   as "p",
+           pp.dept_name  as "pp",
+           ppp.dept_name as "ppp",
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '01' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month1,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '02' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month2,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '03' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month3,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '04' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month4,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '05' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month5,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '06' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month6,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '07' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month7,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '08' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month8,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '09' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month9,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '10' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month10,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '11' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month11,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '12' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month12
+    FROM th_device_report d
+             LEFT JOIN th_device td ON d.sn = td.sn
+             LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
+             LEFT JOIN sys_dept pp ON p.parent_id = pp.dept_id
+             LEFT JOIN sys_dept ppp ON pp.parent_id = ppp.dept_id
+    WHERE d.sn IN (SELECT d.sn
+                   FROM th_device d
+                            LEFT JOIN sys_dept p ON d.dept_id = p.dept_id
+                   WHERE d.dept_id IN (SELECT dept_id
+                                       FROM sys_dept START WITH dept_id = #{deptId}
+                                           CONNECT BY PRIOR dept_id = parent_id))
+        AND TO_CHAR(d.report_time, 'YYYY') = #{year}
+    GROUP BY d.sn, td.address, p.dept_name, pp.dept_name, ppp.dept_name
+    ORDER BY p.dept_name, pp.dept_name, ppp.dept_name, d.sn
+</select>
 </mapper>
diff --git a/ruoyi-ui/src/api/report/index.js b/ruoyi-ui/src/api/report/index.js
new file mode 100644
index 0000000..4582bec
--- /dev/null
+++ b/ruoyi-ui/src/api/report/index.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getBoundTableData(params) {
+  return request({
+    url: '/report/getBoundTableData',
+    params: params,
+    method: 'get',
+  })
+}
+
+export function getBoundDashboardData(params) {
+  return request({
+    url: '/report/getBoundDashboardData',
+    params: params,
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/views/reportGenerate/bound/index.vue b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
index 9e16304..dbd8522 100644
--- a/ruoyi-ui/src/views/reportGenerate/bound/index.vue
+++ b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
@@ -1,959 +1,370 @@
 <template>
-    <div class="app-container"  id="html2canvas1">
-  
-      <!--查询条件-->
-      <el-form ref="form" :model="form" label-width="120px">
-        <div style="flex-direction: row; display: flex;height: 40px">
-          <el-form-item label="选择企业">
-            <el-select v-model="form.factoryId" clearable filterable placeholder="请选择" @change="changeFactory">
-              <el-option v-for="item in factorys" :label="item.factoryName" :value="item.factoryId">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="选择年份" v-model="form.year">
-            <el-date-picker v-model="form.year" type="year" placeholder="选择年"  value-format="yyyy"  @change="changeYear">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="findExamInfo" type="primary">搜索</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport1">生成pdf报告</el-button>
-          </el-form-item>
-  
-        </div>
-      </el-form>
-      <!--概览-->
-      <div class="pop_title">
-        <span class="line_left"></span>
-        <span class="title">概况</span>
-        <span class="line_right"></span>
-      </div>
-      <div class="app-container11">
-  
-        <div class="big">
-          <div class="divni">
-            <h3>{{ 41 }}</h3>
-            <div class="nnn">设备总数</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 39}}</h3>
-            <div class="nnn">正常运行设备数</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 2 }}</h3>
-            <div class="nnn">停运设备数</div>
-          </div>
-         
-          <div class="divni">
-            <h3>2</h3>
-            <div class="nnn">正在报警设备数</div>
-          </div>
-        </div>
-        <div class="big">
-          <div class="divni">
-            <h3>{{302 }}</h3>
-            <div class="nnn">全年报警次数</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 101}}</h3>
-            <div class="nnn">解决报警次数</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 201 }}</h3>
-            <div class="nnn">未解决报警次数</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 103 }}</h3>
-            <div class="nnn">报警维护超时数</div>
-          </div>
-         
-        </div>
-        <div class="big">
-          <div class="divni">
-            <h3>{{34 }}%</h3>
-            <div class="nnn">全年设备报警率</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 95 }}%</h3>
-            <div class="nnn">报警解决率</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 10 }}%</h3>
-            <div class="nnn">一级报警率</div>
-          </div>
-          <div class="divni">
-            <h3>{{ 90 }}%</h3>
-            <div class="nnn">二级报警率</div>
-          </div>
-    
-        </div>
-        
-      </div>
-        <!--表头-->
-        <div class="pop_title">
-        <span class="line_left"></span>
-        <span class="title">报警情况汇总
-        </span>
-        <span class="line_right2"></span>
-      </div>
-      <!--排放量汇总-->
-      <div class="pageStyle">
-        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-          <el-tab-pane :label="ele.text" :name="String(ele.value)" v-for="ele in parkingList" :key="ele.value">
-            <!-- <el-table :data="emissonList" height="300px" :summary-method="getSummaries" show-summary> -->
-            <el-table :data="emissonList" height="300px">
-              <el-table-column prop="examInfo" label="基本信息" width="150" align="center">
-                <el-table-column prop="factoryName" label="企业名称" width="120">
-                </el-table-column>
-                <el-table-column prop="name" label="设备编号" width="120">
-                </el-table-column>
-                <el-table-column prop="address" label="安装位置" width="120">
-                </el-table-column>
-              </el-table-column>
-              <el-table-column prop="season1" label="第一周期" width="150" align="center">
-                <el-table-column prop="month1" label="一月" width="120">
-                </el-table-column>
-                <el-table-column prop="month2" label="二月" width="120">
-                </el-table-column>
-                <el-table-column prop="month3" label="三月" width="120">
-                </el-table-column>
-              </el-table-column>
-              <el-table-column prop="season2" label="第二周期" width="150" align="center">
-                <el-table-column prop="month4" label="四月" width="120">
-                </el-table-column>
-                <el-table-column prop="month5" label="五月" width="120">
-                </el-table-column>
-                <el-table-column prop="month6" label="六月" width="120">
-                </el-table-column>
-              </el-table-column>
-              <el-table-column prop="season3" label="第三周期" width="150" align="center">
-                <el-table-column prop="month7" label="七月" width="120">
-                </el-table-column>
-                <el-table-column prop="month8" label="八月" width="120">
-                </el-table-column>
-                <el-table-column prop="month9" label="九月" width="120">
-                </el-table-column>
-              </el-table-column>
-              <el-table-column prop="season4" label="第四周期" width="150" align="center">
-                <el-table-column prop="month10" label="十月" width="120">
-                </el-table-column>
-                <el-table-column prop="month11" label="十一月" width="120">
-                </el-table-column>
-                <el-table-column prop="month12" label="十二月" width="120">
-                </el-table-column>
-              </el-table-column>
-  
-            </el-table>
-  
-            <pagination v-show="total > 0" :total="emissonTotal" :page.sync="emissonParams.pageNum"
-              :limit.sync="emissonParams.pageSize" @pagination="emissonQuery" />
-          </el-tab-pane>
-  
-        </el-tabs>
-  
-      </div>
-      <!--表头-->
-      <div class="pop_title">
-        <span class="line_left"></span>
-  
-        <span class="title">排放量统计(吨)
-          <!-- <el-tooltip placement="top">
-            <div slot="content">注：1）发发发地方的<br />2）发发发双方都<br />3）发发发双方都</div>
-            <icon class="el-icon-info"></icon>
-          </el-tooltip> -->
-        </span>
-        <span class="line_right3"></span>
-      </div>
-      
-      <!--排放量统计图表-->
-      <div class="pageStyle">
-        <div style="width:100%;height:380px;" class="emission-chart"></div>
-      </div>
-     
-    
-  
-      <!--表头-->
-      <div class="pop_title">
-        <span class="line_left"></span>
-        <span class="title">报表查看
-        </span>
-        <span class="line_right4"></span>
-      </div>
-      <div class="pageStyle1">
-        <div class="app-container110">
-  
-          <div class="big">
-            <div class="divni">
-              <div class="nnnn" @click="handleExport('')">报警数据全年下载</div>
-            </div>
-            <div class="divni">
-              <div class="nnnn" @click="handleExport('是')">一级报警数据下载</div>
-            </div>
-            <div class="divni">
-              <div class="nnnn" @click="handleExport('否')">二级报警数据下载</div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div>
-  
-      </div>
-  
-  
-    </div>
-  </template>
-  
-  <script>
-  import store from "@/store";
-  const echarts = require("echarts/lib/echarts");
-  import { TooltipComponent } from 'echarts/components';
-  import { LegendComponent } from 'echarts/components';
-  import { downloadPDF } from '@/utils/pdf.js'
-  import { GridComponent } from 'echarts/components'
-  echarts.use(GridComponent)
-  echarts.use([TooltipComponent]);
-  echarts.use([LegendComponent]);
-  import { queryDistrict, getAllFactory } from "@/api/oil/factory";
-  import { queryPointStatics, queryLeakStatics, queryExamProgress, queryEmissionCharts, queryEmissionStatics, queryExamList, queryEmissonList } from "@/api/oil/ldar";
-  
-  export default {
-    name: "report",
+  <div class="app-container" id="html2canvas1">
+    <el-row :gutter="10">
+      <el-col :span="6">
+        <dept-tree @deptChange="handleDeptChange" :showQuickGroup="true" />
+      </el-col>
+      <el-col :span="4">
+        <el-date-picker
+          v-model="year"
+          type="year"
+          format="yyyy"
+          value-format="yyyy"
+          placeholder="选择年"
+        >
+        </el-date-picker>
+      </el-col>
+      <el-col :span="4">
+        <el-button type="primary" icon="el-icon-search" @click="handleSearch"
+          >搜索</el-button
+        >
+      </el-col>
+      <el-col :span="8">
+        <el-row type="flex" justify="end">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            @click="generateReport"
+            >生成PDF报告</el-button
+          >
+        </el-row>
+      </el-col>
+    </el-row>
 
-    components: {
-  
-    },
-    data() {
-      return {
-        detailParams: {
-          factoryId: null,
-          factoryName: null,
-          year: null,
-        },
-        pointFullNo: '',
-  
-        openVideo: false,
-        districts: [],//区市
-        factorys: [],//企业
-        form: {
-          year: '',
-          factoryId: null,
-          districtCode: null,
-          startTime: '',
-          endTime: '',
-        },
-        //检测信息查询
-        examParams: {
-          pageNum: 1,
-          pageSize: 10,
-          year: '',
-          factoryId: null,
-          districtCode: null,
-        },
-        //排放量信息查询
-        emissonParams: {
-          pageNum: 1,
-          pageSize: 10,
-          year: '',
-          factoryId: null,
-          districtCode: null,
-          isArrive: '是',
-          isNormal: '',
-        },
-        //密封点信息导出
-        pointImport: {
-          isArrive: '',
-          year: '',
-          factoryId: null,
-          districtCode: null,
-        },
-        videoOptions: {
-          autoplay: false,
-          controls: true,
-          language: 'zh-CN',
-          sources: []
-        },
-        //密封点数量
-        pointStatis: {},
-        //排放量数量
-        emissionStatis: {},
-        //泄漏情况
-        leakStatics: {},
-        //检测进度
-        examProgress: {},
-        //检测数据表格
-        examList: [],
-        examTotal: 0,
-        //排放量数据表格
-        emissonTotal: 0,
-        emissonList: [],
-        xData: [],
-        yData: [],
-        // xData: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-        // yData: [300, 100, 200, 0, 0, 0, 0, 123, 232, 123, 22, 430],
-        activeName: '1',
-        parkingList: [{
-          value: '1',
-          name: 'first',
-          text: '一级报警',
+    <!-- 数据标签 -->
+    <el-row style="padding: 10px">
+      <el-row
+        v-for="(group, index) in groupedDashboardTag"
+        :key="index"
+        :gutter="10"
+        style="margin-bottom: 10px"
+      >
+        <el-col
+          v-for="item in group"
+          :key="item.label"
+          :span="8"
+          style="display: flex; justify-content: center"
+        >
+          <div class="card">
+            <div class="card-img">
+              <i :class="item.icon"></i>
+            </div>
+            <div class="card-content">
+              <div class="card-content__title">
+                <span>{{ item.label }}</span>
+              </div>
+              <div class="card-content__value">
+                <span>{{ dashboardData[item.key] }}</span>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </el-row>
+
+    <!-- 数据表格 -->
+     <el-row>
+        <el-table :data="tableData" style="width: 100%">
+            <el-table-column label="基本信息">
+              <el-table-column
+                prop="p"
+                label="归属企业">
+              </el-table-column>
+              <el-table-column
+                prop="sn"
+                label="设备编号">
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                label="安装位置">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="第一周期">
+              <el-table-column
+                prop="month1"
+                label="一月">
+              </el-table-column>
+              <el-table-column
+                prop="month2"
+                label="二月">
+              </el-table-column>
+              <el-table-column
+                prop="month3"
+                label="三月">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="第二周期">
+              <el-table-column
+                prop="month4"
+                label="四月">
+              </el-table-column>
+              <el-table-column
+                prop="month5"
+                label="五月">
+              </el-table-column>
+              <el-table-column
+                prop="month6"
+                label="六月">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="第三周期">
+              <el-table-column
+                prop="month7"
+                label="七月">
+              </el-table-column>
+              <el-table-column
+                prop="month8"
+                label="八月">
+              </el-table-column>
+              <el-table-column
+                prop="month9"
+                label="九月">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="第四周期">
+              <el-table-column
+                prop="month10"
+                label="十月">
+              </el-table-column>
+              <el-table-column
+                prop="month11"
+                label="十一月">
+              </el-table-column>
+              <el-table-column
+                prop="month12"
+                label="十二月">
+              </el-table-column>
+            </el-table-column>
+        </el-table>
+     </el-row>
+  </div>
+</template>
+
+<script>
+import moment from "moment";
+import {getBoundDashboardData, getBoundTableData} from '@/api/report';
+export default {
+  name: "report-generate-bound",
+  data() {
+    return {
+      dept: null,
+      year: "",
+      total: 0,
+      tableData: [
+        {
+          deptName: "企业1",
+          sn: "SN001",
+          position: "位置1",
+          month1: 1,
+          month2: 2,
+          month3: 3,
+          month4: 4,
+          month5: 5,
+          month6: 6,
+          month7: 7,
+          month8: 8,
+          month9: 9,
+          month10: 10,
+          month11: 11,
+          month12: 12,
         },
         {
-          value: '2',
-          name: 'second',
-          text: '二级报警',
-        }],
-  
-        total: 0,
-  
-        tableData: [],
+          deptName: "企业2",
+          sn: "SN002",
+          position: "位置2",
+          month1: 1,
+          month2: 2,
+          month3: 3,
+          month4: 4,
+          month5: 5,
+          month6: 6,
+          month7: 7,
+          month8: 8,
+          month9: 9,
+          month10: 10,
+          month11: 11,
+          month12: 12,
+        },
+        {
+          deptName: "企业3",
+          sn: "SN003",
+          position: "位置3",
+          month1: 1,
+          month2: 2,
+          month3: 3,
+          month4: 4,
+          month5: 5,
+          month6: 6,
+          month7: 7,
+          month8: 8,
+          month9: 9,
+          month10: 10,
+          month11: 11,
+          month12: 12,
+        }
+      ],
+      dashboardTag: [
+        {
+          label: "设备总数",
+          key: "deviceCount",
+          icon: "el-icon-s-grid",
+        },
+        {
+          label: "正常运行设备数",
+          key: "normalDeviceCount",
+          icon: "el-icon-help",
+        },
+        {
+          label: "异常设备数",
+          key: "abnormalDeviceCount",
+          icon: "el-icon-s-help",
+        },
+        // {
+        //   label: "正在报警设备数",
+        //   key: "alarmDeviceCount",
+        //   icon: "el-icon-message-solid",
+        // },
+        // {
+        //   label: "全年报警次数",
+        //   key: "alarmCountYear",
+        //   icon: "el-icon-s-marketing",
+        // },
+        // {
+        //   label: "全年解决报警次数",
+        //   key: "alarmSolveCountYear",
+        //   icon: "el-icon-folder-checked",
+        // },
+        // {
+        //   label: "全年未解决报警次数",
+        //   key: "alarmUnsolvedCountYear",
+        //   icon: "el-icon-folder-delete",
+        // },
+        // {
+        //   label: "全年设备报警率",
+        //   key: "alarmRateYear",
+        //   icon: "el-icon-edit-outline",
+        // },
+        // {
+        //   label: "全年报警解决率",
+        //   key: "alarmSolveRateYear",
+        //   icon: "el-icon-pie-chart",
+        // },
+      ],
+      // 统计数据
+      dashboardData: {
+        // // 设备总数
+        // deviceCount: 41,
+        // // 正常允许设备数
+        // normalDeviceCount: 40,
+        // // 异常设备数
+        // abnormalDeviceCount: 1,
+        // // 正在报警设备数
+        // alarmDeviceCount: 0,
+        // // 全年报警次数
+        // alarmCountYear: 0,
+        // // 全年解决报警次数
+        // alarmSolveCountYear: 0,
+        // // 全年未解决报警次数
+        // alarmUnsolvedCountYear: 0,
+        // // 全年设备报警率
+        // alarmRateYear: 30,
+        // // 全年报警解决率
+        // alarmSolveRateYear: 88,
+      },
+    };
+  },
+  mounted() {
+    this.year = moment().format("YYYY");
+
+  },
+  computed: {
+    // 按3个为一组拆分的数据 [[], [], []]
+    groupedDashboardTag: function () {
+      function splitArray(arr, size) {
+        let newArr = [];
+        for (let i = 0; i < arr.length; i += size) {
+          newArr.push(arr.slice(i, i + size));
+        }
+        return newArr;
       }
+      return splitArray(this.dashboardTag, 3);
     },
-    created() {
-  
-     // this.queryDistricts()
-      this.getCurrentTime()
+  },
+  methods: {
+    handleDeptChange(dept) {
+      if (this.dept === null) {
+        this.dept = dept;
+        this.handleSearch();
+      }
+      this.dept = dept;
     },
-    mounted() {
-        this.findExamInfo()
-      const alarmEcharts = echarts.init(
-        document.querySelector(".emission-chart")
-      );
-      alarmEcharts.clear();
-      this.getFactory();
+    generateReport() {
+      console.log(this.dept, this.year);
     },
-    methods: {
-      handleExport1() {
-        downloadPDF(document.querySelector('#html2canvas1'), 'LDAR下载')
-      },
-      changeFactory(val) {
-        var result = this.factorys.filter(function (item) {
-          return item.factoryId === val;
-        })
-        this.detailParams.factoryName = result[0].factoryName
-      },
-      getSummaries(param) {
-        const { columns, data } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' ';
-          } else {
-            sums[index] = '';
-          }
-        });
-  
-        return sums;
-      },
-      //跳转密封点查询页面
-      openPointWindow1(val, val2) {
-        let isArrive
-        if(this.activeName=='1'){
-          isArrive='是'
-        }else{
-          isArrive='否'
+    async handleSearch() {
+      if (!this.dept) {
+        this.$message.error("请选择企业");
+        return;
+      }
+      if (!this.year) {
+        this.$message.error("请选择年份");
+        return;
+      }
+      getBoundTableData({
+        deptId: this.dept.deptId,
+        year: this.year,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.tableData = res.data;
         }
-        this.$router.push({
-          path: '/examquery/pointquery',
-          query: {
-            isArrive: isArrive,
-            factoryId: val.factoryId,
-            equipmentName: val.equipmentName
-          }
-        })
-      },
-      //跳转密封点查询页面
-      openPointWindow(val, isArrive) {
-        this.$router.push({
-          path: '/examquery/pointquery',
-          query: {
-            isArrive: isArrive,
-            factoryId: val.factoryId,
-            equipmentName: val.equipmentName
-          }
-        })
-      },
-      //跳转检测页面
-      openExamWindow(val) {
-        this.$router.push({
-          path: '/examquery/firstquery',
-          query: {
-            year: this.form.year,
-            factoryId: val.factoryId,
-            equipmentName: val.equipmentName
-          }
-        })
-      },
-      //跳转复测页面
-      openRecheckWindow(val) {
-        this.$router.push({
-          path: '/examquery/secondquery',
-          query: {
-            year: this.form.year,
-            factoryId: val.factoryId,
-            equipmentName: val.equipmentName,
-            isArrive: this.emissonQuery.isArrive,
-          }
-        })
-      },
-      videoClose() {
-        console.log('关闭播放界面');
-        this.$refs.child.reset()
-      },
-      //打开视频弹窗
-      openVideoWindow(url) {
-        this.openVideo = true;
-        this.title = "预览密封点视频";
-        this.videoOptions.sources = [
-          {
-            //  src: row[column.property]
-            src: url
-          }
-        ]
-        if (this.$refs.child) {
-          // this.$refs.child.setource(row[column.property])
-          this.$refs.child.setource(url)
+      });
+
+      getBoundDashboardData({
+        deptId: this.dept.deptId,
+        year: this.year,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.dashboardData = res.data;
         }
-      },
-      openProcessWindow(val) {
-        this.pointFullNo = val
-        this.isShowProcess = true
-  
-      },//打开设备校准详情表
-      openDeviceWindow(val) {
-        this.deviceParams.deviceNo = val
-        this.deviceParams.factoryId = this.form.factoryId
-        this.deviceParams.year = this.form.year
-        //  this.deviceParams.season=this.queryParams.season
-        this.isShowDevice = true
-      },
-      //关闭进度
-      closeProcess(val) {
-        this.isShowProcess = val
-      },
-      closeDevice(val) {
-        this.isShowDevice = val
-      },
-      //获取当前时间
-      getCurrentTime() {
-        let yy = new Date().getFullYear();
-        let mm = new Date().getMonth() + 1;
-        let dd = new Date().getDate();
-        let hh = new Date().getHours();
-        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes();
-        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds();
-        let time = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
-        const date = new Date()
-        this.form.year = date.getFullYear().toString()
-        // this.form.year = Number(this.form.year)
-  
-      },
-      //查询概况
-      findExamInfo() {
-        //查询密封点
-        // queryPointStatics(this.form).then(response => {
-        //   this.pointStatis = response.data
-        // });
-        //TODO VOCS排放量
-        queryEmissionStatics(this.form).then(response => {
-          this.emissionStatis = response.data
-        });
-        //泄漏统计
-        // queryLeakStatics(this.form).then(response => {
-        //   this.leakStatics = response.data
-        // });
-        //当前检测情况
-        // queryExamProgress(this.form).then(response => {
-        //   this.examProgress = response.data
-        // });
-        //查询检测列表
-      //  this.examQuery()
-        //查询排放量柱状图
-        this.queryEmissionsEchartsData()
-        //查询排放量列表
-        this.emissonQuery()
-      },
-      //查询检测表
-      examQuery() {
-        this.examParams.factoryId = this.form.factoryId
-        this.examParams.districtCode = this.form.districtCode
-        this.examParams.year = this.form.year
-        queryExamList(this.examParams).then(response => {
-          this.examList = response.rows;
-          this.examTotal = response.total;
-        });
-      },
-      //查询排放量表
-      emissonQuery() {
-        this.emissonParams.factoryId = this.form.factoryId
-        this.emissonParams.districtCode = this.form.districtCode
-        this.emissonParams.year = this.form.year
-        // queryEmissonList(this.emissonParams).then(response => {
-        //   this.emissonList = response.rows;
-        //   this.emissonotal = response.total;
-        // });
-        this.emissonList =[{factoryName:'***有限公司',name:'SNYDS0001',status:'正在运行','address':'第一车间',month1:1,month2:2,month3:3,month4:4
-        ,month5:5,month6:6,month7:7,
-        month8:8,month9:3,month10:3,month11:3,month12:3},
-        {factoryName:'***有限公司',name:'SNYDS0001',status:'正在运行','address':'第一车间',month1:1,month2:2,month3:3,month4:4
-        ,month5:5,month6:6,month7:7,
-        month8:8,month9:3,month10:3,month11:3,month12:3}] ;
-        this.emissonotal = 4004;
-      },
-      //查询排放量柱状图
-      queryEmissionsEchartsData() {
-        queryEmissionCharts(this.form).then(response => {
-          this.xData = []
-          this.yData = []
-          response.data.forEach(item => {
-            this.xData.push(item.year);
-            this.yData.push(item.total);
-          });
-          this.queryEmissionsEcharts(this.xData, this.yData)
-        });
-  
-      },
-      //查询排放量柱状图
-      queryEmissionsEcharts(xData, yData) {
-        const dataList = {
-          xAxisData: xData,
-          dataList2: yData, //险情数据
-        };
-        const alarmEcharts = echarts.init(
-          document.querySelector(".emission-chart")
-        );
-        const reservoirDangerBar = (chartData) => {
-          const option = {
-            tooltip: {
-              trigger: "axis",
-              axisPointer: {
-                type: "shadow",
-              },
-              formatter: function (params) {
-                var arr1 = [...params].reverse();
-                let templateList = [];
-                arr1.map((item) => {
-                  let str = `
-              <div>
-                ${item.marker}
-                <span>${item.seriesName}</span>
-                <span>${item.value}吨</span>
-              </div>
-            `;
-                  templateList.push(str);
-                });
-                return templateList.join("");
-              },
-            },
-            // dataZoom: [
-            //   {
-            //     type: "slider",
-            //     show: dataList.xAxisData.length > 12,
-            //     // xAxisIndex: [0],
-            //     handleSize: 0, //滑动条的 左右2个滑动条的大小
-            //     startValue: 0, // 初始显示值
-            //     endValue: 4, // 结束显示值
-            //     height: 5, //组件高度
-            //     left: "5%", //左边的距离
-            //     right: "4%", //右边的距离
-            //     bottom: 5, //底边的距离
-            //     borderColor: "transparent",
-            //     fillerColor: "#269cdb",
-            //     borderRadius: 5,
-            //     // backgroundColor: '#33384b',//两边未选中的滑动条区域的颜色
-            //     showDataShadow: false, //是否显示数据阴影 默认auto
-            //     showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-            //     realtime: true, //是否实时更新
-            //     filterMode: "filter",
-            //   },
-            //   //下面这个属性是里面拖到
-            //   {
-            //     type: "inside",
-            //     show: dataList.xAxisData.length > 4,
-            //     // xAxisIndex: [0],
-            //     start: 0, //默认为1
-            //     end: 4, //默认为100
-            //   },
-            // ],
-            legend: {
-              show: false,
-              itemGap: 30,
-              itemWidth: 14,
-              itemHeight: 14,
-              textStyle: {
-                fontSize: 16,
-                color: "#fff",
-                rich: {
-                  a: {
-                    fontSize: 20,
-                  },
-                },
-              },
-              icon: "rect",
-              right: 10,
-              top: 25,
-              formatter: function (name) {
-                return name + " " + `KG`;
-                // return name;
-              },
-            },
-            grid: {
-              left: "3%",
-              right: "4%",
-              bottom: "3%",
-              containLabel: true,
-            },
-            xAxis: [
-              {
-                type: "category",
-                data: chartData.xAxisData,
-                axisLabel: {
-                  color: "#0A7EB8",
-                  fontSize: 18,
-                  interval: 0,
-                },
-                axisLine: {
-                  lineStyle: {
-                    color: "#0A7EB8",
-                  },
-                },
-                axisTick: {
-                  show: false,
-                },
-              },
-            ],
-            yAxis: [
-              {
-                type: "value",
-                axisLabel: {
-                  color: "#1d7bdb",
-                  fontSize: 18,
-                },
-  
-                minInterval: 1,
-                axisLine: {
-                  show: false,
-                },
-                splitLine: {
-                  lineStyle: {
-                    color: "#1d7bdb",
-                  },
-                },
-              },
-            ],
-            series: [
-              {
-                name: "排放量",
-                type: "line",
-                stack: "1",
-                barWidth: 24,
-                label: {
-                  show: false,
-                },
-                itemStyle: {
-                  color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
-                    { offset: 0, color: "#125c94" },
-                    { offset: 1, color: "#00fbff" },
-                  ]),
-                },
-                data: chartData.dataList2,
-              },
-            ],
-          };
-          return option;
-        };
-        alarmEcharts.clear();
-        alarmEcharts.setOption(reservoirDangerBar(dataList));
-      },
-      //
-      /** 导出按钮操作 */
-      handleExport(val) {
-        this.pointImport.factoryId = this.form.factoryId
-        this.pointImport.districtCode = this.form.districtCode
-        this.pointImport.year = this.form.year
-        this.pointImport.isArrive = val
-        this.download('oil/point/export', {
-          ...this.examParams
-        }, `point_${new Date().getTime()}.xlsx`)
-      },
-      //查询区划
-      queryDistricts() {
-        let cityCode = '136'
-        //定制-青岛市
-        if (CONFIGITEM.city == 'qingdao') {
-          cityCode = '136'
-        } else if (CONFIGITEM.city == 'zibo') {
-          cityCode = '137'
-        } else if (CONFIGITEM.city == 'yantai') {
-          cityCode = '140'
-        } else if (CONFIGITEM.city == 'taian') {
-          cityCode = '151'
-        } else if (CONFIGITEM.city == 'linyi') {
-          cityCode = '147'
-        } else if (CONFIGITEM.city == 'jining') {
-          cityCode = '142'
-        }
-        let thirdParams = {
-          type: "district",
-          code: cityCode,
-        }
-        queryDistrict(thirdParams).then(thirdRes => {
-          this.districts = thirdRes.data
-          if (store.getters.user.districtCode) {
-            this.form.districtCode = Number(store.getters.user.districtCode)
-          }
-  
-        })
-      },
-      //改变区划时查询该区划下的企业
-      changeDistrict() {
-        let thirdParams = {
-          districtCode: this.form.districtCode
-        }
-        getAllFactory(thirdParams).then(response => {
-          this.factorys = response.data;
-        })
-      },
-      //查询企业
-      getFactory() {
-        let params = {
-          factoryId: store.getters.user.factoryId,
-          districtCode: store.getters.user.districtCode
-        }
-  
-        getAllFactory(params).then(response => {
-          this.factorys = response.data;
-          var query = this.$route.query;
-  
-          if (query && query.factoryId) {
-  
-            this.examParams.factoryId = Number(query.factoryId)
-            this.form.factoryId = Number(query.factoryId)
-            this.emissonParams.factoryId = Number(query.factoryId)
-  if(query.year){
-    this.form.year=query.year
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.card {
+  width: 70%;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  padding: 5px 20px;
+  text-align: center;
+  transition: all 0.3s;
+  display: flex;
+  flex-direction: row;
+
+  .card-img {
+    font-size: 60px;
   }
-          } else {
-            this.examParams.factoryId = store.getters.user.factoryId
-            this.form.factoryId = store.getters.user.factoryId
-            this.emissonParams.factoryId = store.getters.user.factoryId
-  
-          }
-  
-          this.findExamInfo()
-  
-        })
-      },
-      //tab切换事件
-      handleClick() {
-        if (this.activeName == '1') {
-          this.emissonParams.isArrive = "是"
-        } if (this.activeName == '2') {
-          this.emissonParams.isArrive = "否"
-  
-        }
-        this.emissonQuery()
-      },
-      toPage() {
-        this.$router.push({
-          path: '/recheckQuery/recheck',
-          query: {
-            pointNoFull: this.pointNoFull
-          }
-        })
-      },
-      toDetail() {
-        this.$router.push({
-          path: '/factoryquery',
-          query: {
-            factoryId: this.form.factoryId,
-            factoryName: this.detailParams.factoryName,
-            year: this.form.year
-          }
-        })
-      },
-  
-      //更改月份
-      changeYear(val) {
-        this.form.year = val
-      },
-  
-  
-  
-      handleSizeChange(val) {
-        this.examParams.pageSize = val
-        this.examQuery()
-      },
-      handleCurrentChange(val) {
-        this.examParams.currentPage = val
-        this.examQuery()
-      },
-  
-  
+
+  .card-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: end;
+
+    .card-content__title {
+      font-size: 14px;
+      color: #909399;
+      margin-bottom: 10px;
+    }
+
+    .card-content__value {
+      font-size: 35px;
+      font-weight: bold;
+      color: #303133;
     }
   }
-  </script>
-  <style scoped>
-  .pageStyle {
-    height: 400px;
-  
-    margin: 10px;
-  
-    border: 1px dashed #c0b9b9;
-  }
-  
-  .pageStyle1 {
-    height: 40px;
-    line-height: 40px;
-    margin: 10px;
-  
-    border: 1px dashed #c0b9b9;
-  }
-  
-  .pop_title {
-    line-height: 20px;
-    text-align: center;
-    margin-top: 10px;
-  }
-  
-  .pop_title .line_left {
-    /* padding-top: 10px; */
-    display: inline-block;
-    width: 10px;
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .pop_title .line_right {
-    /* padding-top: 10px; */
-    display: inline-block;
-    width: calc(100% - 70px);
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .pop_title .title {
-    position: relative;
-    color: #0A7EB8;
-    vertical-align: middle;
-  }
-  
-  .pop_title .line_right1 {
-  
-    display: inline-block;
-    width: calc(100% - 155px);
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .pop_title .line_right2 {
-  
-    display: inline-block;
-    width: calc(100% - 220px);
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .pop_title .line_right3 {
-  
-    display: inline-block;
-    width: calc(100% - 150px);
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .pop_title .line_right4 {
-  
-    display: inline-block;
-    width: calc(100% - 100px);
-    border-top: 2px solid #0A7EB8;
-  }
-  
-  .nnn {
-    font-size: 14px;
-    margin-top: -15px;
-  }
-  
-  .nnnn {
-    cursor: pointer;
-    text-decoration: underline;
-    color: #5a5e66;
-    font-size: 12px;
-    margin-top: -15px;
-  }
-  
-  .nnnn:hover {
-    color: #18828c
-  }
-  
-  .nnnn:active {
-    color: #18828c
-  }
-  
-  .big {
-    margin-top: 5px;
-    display: flex;
-    /*重要*/
-    justify-content: space-between;
-    /*重要*/
-  
-  }
-  
-  .divni {
-    font-size: 22px;
-    width: 250px;
-  }
-  
-  .app-container11 {
-    border-top-width: 0px;
-    margin-top: 0px;
-    margin-left: 20px;
-    margin-right: 20px;
-    padding: 10px;
-  }
-  
-  .app-container110 {
-    border-top-width: 0px;
-    margin-top: 0px;
-    margin-left: 20px;
-    margin-right: 20px;
-    padding: 10px;
-    width: 800px;
-  }
-  
-  .title {
-    position: absolute;
-    font-size: 18px;
-    /*color: #707791;*/
-    font-weight: bold;
-  }
-  
-  ::v-deep .el-tabs__content {
-    overflow: visible;
-  }
-  
-  ::v-deep .el-tabs__item.is-active {
-    color: #18828c;
-  }
-  
-  ::v-deep .el-tabs__nav-wrap::after {
-    height: 0;
-  }
-  
-  ::v-deep .el-tabs__active-bar {
-    background-color: #18828c;
-  }
-  
-  ::v-deep .el-tabs__header .el-tabs__item.is-active {
-    color: #18828c;
-    border-bottom: 2px solid #18828c;
-  }
-  </style>
-  
\ No newline at end of file
+}
+</style>

From 2346ffc7c14b43251db9a5ee665270d9bea51953 Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Tue, 29 Oct 2024 17:06:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0PDF=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/reportGenerate/bound/index.vue  | 164 +++++++-----------
 1 file changed, 60 insertions(+), 104 deletions(-)

diff --git a/ruoyi-ui/src/views/reportGenerate/bound/index.vue b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
index dbd8522..75b6f3a 100644
--- a/ruoyi-ui/src/views/reportGenerate/bound/index.vue
+++ b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="html2canvas1">
+  <div class="app-container">
     <el-row :gutter="10">
       <el-col :span="6">
         <dept-tree @deptChange="handleDeptChange" :showQuickGroup="true" />
@@ -30,119 +30,76 @@
         </el-row>
       </el-col>
     </el-row>
-
-    <!-- 数据标签 -->
-    <el-row style="padding: 10px">
-      <el-row
-        v-for="(group, index) in groupedDashboardTag"
-        :key="index"
-        :gutter="10"
-        style="margin-bottom: 10px"
-      >
-        <el-col
-          v-for="item in group"
-          :key="item.label"
-          :span="8"
-          style="display: flex; justify-content: center"
+    <div id="html2canvas1">
+      <!-- 数据标签 -->
+      <el-row style="padding: 10px">
+        <el-row
+          v-for="(group, index) in groupedDashboardTag"
+          :key="index"
+          :gutter="10"
+          style="margin-bottom: 10px"
         >
-          <div class="card">
-            <div class="card-img">
-              <i :class="item.icon"></i>
-            </div>
-            <div class="card-content">
-              <div class="card-content__title">
-                <span>{{ item.label }}</span>
+          <el-col
+            v-for="item in group"
+            :key="item.label"
+            :span="8"
+            style="display: flex; justify-content: center"
+          >
+            <div class="card">
+              <div class="card-img">
+                <i :class="item.icon"></i>
               </div>
-              <div class="card-content__value">
-                <span>{{ dashboardData[item.key] }}</span>
+              <div class="card-content">
+                <div class="card-content__title">
+                  <span>{{ item.label }}</span>
+                </div>
+                <div class="card-content__value">
+                  <span>{{ dashboardData[item.key] }}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </el-col>
+          </el-col>
+        </el-row>
       </el-row>
-    </el-row>
 
-    <!-- 数据表格 -->
-     <el-row>
+      <!-- 数据表格 -->
+      <el-row>
         <el-table :data="tableData" style="width: 100%">
-            <el-table-column label="基本信息">
-              <el-table-column
-                prop="p"
-                label="归属企业">
-              </el-table-column>
-              <el-table-column
-                prop="sn"
-                label="设备编号">
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="安装位置">
-              </el-table-column>
-            </el-table-column>
-            <el-table-column label="第一周期">
-              <el-table-column
-                prop="month1"
-                label="一月">
-              </el-table-column>
-              <el-table-column
-                prop="month2"
-                label="二月">
-              </el-table-column>
-              <el-table-column
-                prop="month3"
-                label="三月">
-              </el-table-column>
-            </el-table-column>
-            <el-table-column label="第二周期">
-              <el-table-column
-                prop="month4"
-                label="四月">
-              </el-table-column>
-              <el-table-column
-                prop="month5"
-                label="五月">
-              </el-table-column>
-              <el-table-column
-                prop="month6"
-                label="六月">
-              </el-table-column>
-            </el-table-column>
-            <el-table-column label="第三周期">
-              <el-table-column
-                prop="month7"
-                label="七月">
-              </el-table-column>
-              <el-table-column
-                prop="month8"
-                label="八月">
-              </el-table-column>
-              <el-table-column
-                prop="month9"
-                label="九月">
-              </el-table-column>
-            </el-table-column>
-            <el-table-column label="第四周期">
-              <el-table-column
-                prop="month10"
-                label="十月">
-              </el-table-column>
-              <el-table-column
-                prop="month11"
-                label="十一月">
-              </el-table-column>
-              <el-table-column
-                prop="month12"
-                label="十二月">
-              </el-table-column>
-            </el-table-column>
+          <el-table-column label="基本信息">
+            <el-table-column prop="p" label="归属企业"> </el-table-column>
+            <el-table-column prop="sn" label="设备编号"> </el-table-column>
+            <el-table-column prop="address" label="安装位置"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="第一周期">
+            <el-table-column prop="month1" label="一月"> </el-table-column>
+            <el-table-column prop="month2" label="二月"> </el-table-column>
+            <el-table-column prop="month3" label="三月"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="第二周期">
+            <el-table-column prop="month4" label="四月"> </el-table-column>
+            <el-table-column prop="month5" label="五月"> </el-table-column>
+            <el-table-column prop="month6" label="六月"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="第三周期">
+            <el-table-column prop="month7" label="七月"> </el-table-column>
+            <el-table-column prop="month8" label="八月"> </el-table-column>
+            <el-table-column prop="month9" label="九月"> </el-table-column>
+          </el-table-column>
+          <el-table-column label="第四周期">
+            <el-table-column prop="month10" label="十月"> </el-table-column>
+            <el-table-column prop="month11" label="十一月"> </el-table-column>
+            <el-table-column prop="month12" label="十二月"> </el-table-column>
+          </el-table-column>
         </el-table>
-     </el-row>
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
 import moment from "moment";
-import {getBoundDashboardData, getBoundTableData} from '@/api/report';
+import { getBoundDashboardData, getBoundTableData } from "@/api/report";
+import { downloadPDF } from "@/utils/pdf.js";
 export default {
   name: "report-generate-bound",
   data() {
@@ -201,7 +158,7 @@ export default {
           month10: 10,
           month11: 11,
           month12: 12,
-        }
+        },
       ],
       dashboardTag: [
         {
@@ -275,7 +232,6 @@ export default {
   },
   mounted() {
     this.year = moment().format("YYYY");
-
   },
   computed: {
     // 按3个为一组拆分的数据 [[], [], []]
@@ -299,7 +255,7 @@ export default {
       this.dept = dept;
     },
     generateReport() {
-      console.log(this.dept, this.year);
+      downloadPDF(document.querySelector("#html2canvas1"), "LDAR下载");
     },
     async handleSearch() {
       if (!this.dept) {

From 0050fd0d27916445fdc8cef89a78727324596443 Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Tue, 29 Oct 2024 17:11:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=A3=80=E7=B4=A2=E8=AE=BE=E5=A4=87=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/oil/ThDeviceReportMapper.xml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
index ed2860b..695aab0 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -241,7 +241,9 @@
                             LEFT JOIN sys_dept p ON d.dept_id = p.dept_id
                    WHERE d.dept_id IN (SELECT dept_id
                                        FROM sys_dept START WITH dept_id = #{deptId}
-                                           CONNECT BY PRIOR dept_id = parent_id))
+                                           CONNECT BY PRIOR dept_id = parent_id)
+                     AND TO_CHAR(d.create_time, 'yyyy') = #{year}
+                   )
         AND TO_CHAR(d.report_time, 'YYYY') = #{year}
     GROUP BY d.sn, td.address, p.dept_name, pp.dept_name, ppp.dept_name
     ORDER BY p.dept_name, pp.dept_name, ppp.dept_name, d.sn

From 13a54ebcb6412f6ed0f0311a6f003585f4e8457e Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Fri, 1 Nov 2024 15:10:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oil/controller/OilReportController.java   |   4 +-
 .../project/oil/mapper/OilMonitorMapper.java  |   2 +-
 .../oil/mapper/ThDeviceDealMapper.java        |   9 +-
 .../impl/OilThDeviceDealServiceImpl.java      |   5 +-
 .../mybatis/oil/OilMonitorMapper.xml          |   5 +
 .../resources/mybatis/oil/ThDeviceDeal.xml    |  41 -------
 .../src/views/reportGenerate/bound/index.vue  | 102 ++++++------------
 7 files changed, 43 insertions(+), 125 deletions(-)
 delete mode 100644 RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml

diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
index e5ca76a..dbcd15b 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilReportController.java
@@ -46,11 +46,11 @@ public class OilReportController extends BaseController {
         // 异常设备数
         int abnormalDeviceCount = getDeviceCount(deptId, year, 0);
         // 全年解决报警次数
-//        int alarmSolveCountYear = oilThDeviceDealService.countThDeviceDealByYear(year);
+        int alarmSolveCountYear = oilThDeviceDealService.countThDeviceDealByYear(year);
         resultMap.put("deviceCount", deviceCount);
         resultMap.put("normalDeviceCount", normalDeviceCount);
         resultMap.put("abnormalDeviceCount", abnormalDeviceCount);
-//        resultMap.put("alarmSolveCountYear", alarmSolveCountYear);
+        resultMap.put("alarmSolveCountYear", alarmSolveCountYear);
         return AjaxResult.success(resultMap);
     }
 
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java
index 943fbdd..0fa096c 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java
@@ -114,5 +114,5 @@ public interface OilMonitorMapper {
 
     Integer querryDealTotal(@Param("reportId") Long reportId);
 
-
+    Integer countThDeviceDealByYear(@Param("year") String year);
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
index 73acd7c..c38a008 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/ThDeviceDealMapper.java
@@ -3,14 +3,7 @@ package com.ruoyi.project.oil.mapper;
 
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Map;
 
-/**
- * @author Lenovo
- * @description 针对表【th_device_deal】的数据库操作Mapper
- * @createDate 2024-10-29 15:40:41
- * @Entity com.ruoyi.oil.domain.monitor.ThDeviceDeal
- */
 public interface ThDeviceDealMapper {
-    int countThDeviceDealByYear(@Param("year") String year);
+    int selectThDeviceDealByYear(@Param("year") String year);
 }
diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
index 183bb5f..984031b 100644
--- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
+++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilThDeviceDealServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.oil.service.impl;
 
+import com.ruoyi.project.oil.mapper.OilMonitorMapper;
 import com.ruoyi.project.oil.mapper.ThDeviceDealMapper;
 import com.ruoyi.project.oil.service.IOilThDeviceDealService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,10 +10,10 @@ import org.springframework.stereotype.Service;
 public class OilThDeviceDealServiceImpl implements IOilThDeviceDealService {
 
     @Autowired
-    private ThDeviceDealMapper thDeviceDealMapper;
+    private OilMonitorMapper oilMonitorMapper;
 
     @Override
     public int countThDeviceDealByYear(String year) {
-        return thDeviceDealMapper.countThDeviceDealByYear(year);
+        return oilMonitorMapper.countThDeviceDealByYear(year);
     }
 }
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 8603449..0413d70 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
@@ -471,4 +471,9 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
     <select id="querryDealTotal" resultType="java.lang.Integer">
         select count(*) from th_device_deal where report_id=#{reportId}
     </select>
+
+    <select id="countThDeviceDealByYear" parameterType="string" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM th_device_deal
+        WHERE to_char(create_time, 'yyyy') = #{year}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml
deleted file mode 100644
index 9bf1bb6..0000000
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceDeal.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.project.oil.mapper.ThDeviceDealMapper">
-    <parameterMap id="BaseParameterMap" type="com.ruoyi.project.oil.domain.monitor.ThDeviceDeal">
-        <parameter property="id" jdbcType="BIGINT" />
-        <parameter property="reportId" jdbcType="BIGINT" />
-        <parameter property="dealUser" jdbcType="VARCHAR" />
-        <parameter property="dealWay" jdbcType="VARCHAR" />
-        <parameter property="dealTime" jdbcType="TIMESTAMP" />
-        <parameter property="createBy" jdbcType="VARCHAR" />
-        <parameter property="createTime" jdbcType="TIMESTAMP" />
-        <parameter property="reason" jdbcType="VARCHAR" />
-        <parameter property="fileUrl" jdbcType="VARCHAR" />
-        <parameter property="status" jdbcType="INTEGER" />
-        <parameter property="remark" jdbcType="VARCHAR" />
-    </parameterMap>
-    <resultMap id="ThDeviceDealResultMap" type="com.ruoyi.project.oil.domain.monitor.ThDeviceDeal">
-        <id property="id" column="ID" jdbcType="BIGINT" />
-        <result property="reportId" column="REPORT_ID" jdbcType="BIGINT" />
-        <result property="dealUser" column="DEAL_USER" jdbcType="VARCHAR" />
-        <result property="dealWay" column="DEAL_WAY" jdbcType="VARCHAR" />
-        <result property="dealTime" column="DEAL_TIME" jdbcType="TIMESTAMP" />
-        <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR" />
-        <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP" />
-        <result property="reason" column="REASON" jdbcType="VARCHAR" />
-        <result property="fileUrl" column="FILE_URL" jdbcType="VARCHAR" />
-        <result property="status" column="STATUS" jdbcType="INTEGER" />
-        <result property="remark" column="REMARK" jdbcType="VARCHAR" />
-    </resultMap>
-
-
-    <select id="countThDeviceDealByYear" parameterType="map" resultType="int">
-        SELECT COUNT(1) FROM th_device_deal
-        WHERE to_char(create_time, 'yyyy') = #{year}
-    </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/reportGenerate/bound/index.vue b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
index 75b6f3a..358add0 100644
--- a/ruoyi-ui/src/views/reportGenerate/bound/index.vue
+++ b/ruoyi-ui/src/views/reportGenerate/bound/index.vue
@@ -42,7 +42,7 @@
           <el-col
             v-for="item in group"
             :key="item.label"
-            :span="8"
+            :span="24/rowTagNum"
             style="display: flex; justify-content: center"
           >
             <div class="card">
@@ -107,59 +107,8 @@ export default {
       dept: null,
       year: "",
       total: 0,
-      tableData: [
-        {
-          deptName: "企业1",
-          sn: "SN001",
-          position: "位置1",
-          month1: 1,
-          month2: 2,
-          month3: 3,
-          month4: 4,
-          month5: 5,
-          month6: 6,
-          month7: 7,
-          month8: 8,
-          month9: 9,
-          month10: 10,
-          month11: 11,
-          month12: 12,
-        },
-        {
-          deptName: "企业2",
-          sn: "SN002",
-          position: "位置2",
-          month1: 1,
-          month2: 2,
-          month3: 3,
-          month4: 4,
-          month5: 5,
-          month6: 6,
-          month7: 7,
-          month8: 8,
-          month9: 9,
-          month10: 10,
-          month11: 11,
-          month12: 12,
-        },
-        {
-          deptName: "企业3",
-          sn: "SN003",
-          position: "位置3",
-          month1: 1,
-          month2: 2,
-          month3: 3,
-          month4: 4,
-          month5: 5,
-          month6: 6,
-          month7: 7,
-          month8: 8,
-          month9: 9,
-          month10: 10,
-          month11: 11,
-          month12: 12,
-        },
-      ],
+      tableData: [],
+      rowTagNum: 4,
       dashboardTag: [
         {
           label: "设备总数",
@@ -171,26 +120,26 @@ export default {
           key: "normalDeviceCount",
           icon: "el-icon-help",
         },
-        {
-          label: "异常设备数",
-          key: "abnormalDeviceCount",
-          icon: "el-icon-s-help",
-        },
+        // {
+        //   label: "异常设备数",
+        //   key: "abnormalDeviceCount",
+        //   icon: "el-icon-s-help",
+        // },
         // {
         //   label: "正在报警设备数",
         //   key: "alarmDeviceCount",
         //   icon: "el-icon-message-solid",
         // },
-        // {
-        //   label: "全年报警次数",
-        //   key: "alarmCountYear",
-        //   icon: "el-icon-s-marketing",
-        // },
-        // {
-        //   label: "全年解决报警次数",
-        //   key: "alarmSolveCountYear",
-        //   icon: "el-icon-folder-checked",
-        // },
+        {
+          label: "全年报警次数",
+          key: "alarmCountYear",
+          icon: "el-icon-s-marketing",
+        },
+        {
+          label: "全年解决报警次数",
+          key: "alarmSolveCountYear",
+          icon: "el-icon-folder-checked",
+        },
         // {
         //   label: "全年未解决报警次数",
         //   key: "alarmUnsolvedCountYear",
@@ -243,7 +192,7 @@ export default {
         }
         return newArr;
       }
-      return splitArray(this.dashboardTag, 3);
+      return splitArray(this.dashboardTag, this.rowTagNum);
     },
   },
   methods: {
@@ -272,6 +221,17 @@ export default {
       }).then((res) => {
         if (res.code === 200) {
           this.tableData = res.data;
+          console.log(this.tableData);
+          this.dashboardData.alarmCountYear = res.data.reduce((prev, cur) => {
+            for (let key in cur) {
+              if (key.includes("month")) {
+                prev += cur[key];
+              }
+            }
+            return prev;
+          },
+            0
+          );
         }
       });
 
@@ -308,7 +268,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: end;
+    align-items: flex-end;
 
     .card-content__title {
       font-size: 14px;