From 8471345f25f71b2557069af0f241e3d2ffbf5274 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 11 Apr 2024 18:27:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E9=99=8D=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E5=91=A8=E6=8A=A5=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/weeklyreport/WeeklyReportService.java  |  2 +-
 .../WEB-INF/views/business/report/weeklyreport.jsp |  1 +
 .../src/main/webapp/jspJS/report/weeklyreport.js   | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pqs9200/src/main/java/com/pqs9200/service/weeklyreport/WeeklyReportService.java b/pqs9200/src/main/java/com/pqs9200/service/weeklyreport/WeeklyReportService.java
index 0250afe..116cdaf 100644
--- a/pqs9200/src/main/java/com/pqs9200/service/weeklyreport/WeeklyReportService.java
+++ b/pqs9200/src/main/java/com/pqs9200/service/weeklyreport/WeeklyReportService.java
@@ -13,7 +13,7 @@ public interface WeeklyReportService {
     List<AreaPointInfo> getPointData(Date start, Date end,Boolean statFlag);
 
     List<AreaPointInfo> getVoltageData(Date start, Date end,Boolean statFlag);
-
+    //前20
     List<SagEvent> getSagData(Date start, Date end,Boolean statFlag);
 
     List<SagRate> getSagReasonData(Date start, Date end,Boolean statFlag);
diff --git a/pqs9200/src/main/webapp/WEB-INF/views/business/report/weeklyreport.jsp b/pqs9200/src/main/webapp/WEB-INF/views/business/report/weeklyreport.jsp
index 9ed209f..dbc9631 100644
--- a/pqs9200/src/main/webapp/WEB-INF/views/business/report/weeklyreport.jsp
+++ b/pqs9200/src/main/webapp/WEB-INF/views/business/report/weeklyreport.jsp
@@ -155,6 +155,7 @@
                         <th class="text-center">暂降(骤升)幅值(%)</th>
                         <th class="text-center">持续时间(s)</th>
                         <th class="text-center">暂态类型(机器判断)</th>
+                        <th class="text-center">事件类型</th>
                     </tr>
                     </thead>
                 </table>
diff --git a/pqs9200/src/main/webapp/jspJS/report/weeklyreport.js b/pqs9200/src/main/webapp/jspJS/report/weeklyreport.js
index e0ebc41..6fafa0a 100644
--- a/pqs9200/src/main/webapp/jspJS/report/weeklyreport.js
+++ b/pqs9200/src/main/webapp/jspJS/report/weeklyreport.js
@@ -142,6 +142,20 @@ function initSagEventsTable(data) {
         temp.push(data[offset].strEventValue);
         temp.push(data[offset].persistTime);
         temp.push(data[offset].sagTypeDes);
+        switch (data[offset].waveType){
+            case 0:
+                temp.push("扰动");
+            case 1:
+                temp.push("暂降");
+            case 2:
+                temp.push("暂升");
+            case 3:
+                temp.push("中断");
+            case 4:
+                temp.push("其他");
+            default:
+                temp.push("录波");
+        }
         tableData.push(temp);
         offset++;
     }