From 73f15098f0f92941178392228e368e3095683a9d Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Fri, 13 Dec 2024 20:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=AF=8F=E6=97=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

（1）港口按顺序排序（青岛港、日照港、烟台港、渤海湾港）
 （2）设备编号字段改成 设备名称（name）
 （3）单位
---
 .../resources/mybatis/oil/ThDeviceReportMapper.xml |  6 ++++--
 ruoyi-ui/src/views/dataStatistics/daily/index.vue  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

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 96a9f66..3121264 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -169,9 +169,11 @@
     <select id="dailyReportDataOverview" parameterType="map" resultType="map">
         SELECT TO_CHAR(d.report_time, 'YYYY-MM-DD') AS day,
                d.sn,
+               td.name,
                p.dept_name                    as "p",
                pp.dept_name                   as "pp",
                ppp.dept_name                  as "ppp",
+               ppp.dept_id                    as "ppp_id",
                ROUND(AVG(TO_NUMBER(d.ds)), 8)       AS avg_ds
         FROM th_device_report d
                  LEFT JOIN th_device td ON d.sn = td.sn
@@ -180,8 +182,8 @@
                  LEFT JOIN sys_dept ppp ON pp.parent_id = ppp.dept_id
         WHERE d.sn IN (SELECT d.sn FROM th_device d)
           AND TO_CHAR(d.report_time, 'YYYY-MM-DD') = #{day}
-        GROUP BY TO_CHAR(d.report_time, 'YYYY-MM-DD'), ppp.dept_name, pp.dept_name, p.dept_name, d.sn
-        ORDER BY ppp.dept_name, pp.dept_name, p.dept_name
+        GROUP BY TO_CHAR(d.report_time, 'YYYY-MM-DD'), ppp.dept_name, pp.dept_name, p.dept_name, d.sn, ppp.dept_id, td.name
+        ORDER BY ppp.dept_id  ASC
     </select>
     <!--  选择日期范围内 某个部门id下的所有子部门的所有设备的报警每日数量；统计(d.zt = '一级报警' OR d.zt = '二级报警')的alarm_count， 统计当天全部的数量count -->
     <select id="selectAlarmCountByDeptIdAndDateRange" parameterType="map" resultType="map">
diff --git a/ruoyi-ui/src/views/dataStatistics/daily/index.vue b/ruoyi-ui/src/views/dataStatistics/daily/index.vue
index 1f4acd3..c43c517 100644
--- a/ruoyi-ui/src/views/dataStatistics/daily/index.vue
+++ b/ruoyi-ui/src/views/dataStatistics/daily/index.vue
@@ -38,7 +38,7 @@
             <div style="display: flex; gap: 10px">
               <el-tag>港区数: {{ getChildCount(row, "ppp", "pp") }}</el-tag>
               <el-tag type="warning"
-                >平均值: {{ calculateChildAvg(row, "ppp") }}</el-tag
+                >平均值: {{ calculateChildAvg(row, "ppp") }} mg/m³</el-tag
               >
             </div>
           </template>
@@ -50,7 +50,7 @@
             <div style="display: flex; gap: 10px">
               <el-tag>企业数: {{ getChildCount(row, "pp", "p") }}</el-tag>
               <el-tag type="warning"
-                >平均值: {{ calculateChildAvg(row, "pp") }}</el-tag
+                >平均值: {{ calculateChildAvg(row, "pp") }} mg/m³</el-tag
               >
             </div>
           </template>
@@ -62,19 +62,23 @@
             <div style="display: flex; gap: 10px">
               <el-tag>设备数: {{ getChildCount(row, "p", "sn") }}</el-tag>
               <el-tag type="warning"
-                >平均值: {{ calculateChildAvg(row, "p") }}</el-tag
+                >平均值: {{ calculateChildAvg(row, "p") }} mg/m³</el-tag
               >
             </div>
           </template>
         </el-table-column>
 
-        <el-table-column prop="sn" label="设备编号"></el-table-column>
+        <el-table-column prop="name" label="设备名称"></el-table-column>
 
         <el-table-column
           prop="avgDs"
           label="当日均值"
           align="center"
-        ></el-table-column>
+        >
+          <template slot-scope="{ row }">
+            <div>{{ row.avgDs }} mg/m³</div>
+          </template>
+      </el-table-column>
       </el-table>
     </el-row>
   </div>