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 getPointData(Date start, Date end,Boolean statFlag); List getVoltageData(Date start, Date end,Boolean statFlag); - + //前20 List getSagData(Date start, Date end,Boolean statFlag); List 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 @@ 暂降(骤升)幅值(%) 持续时间(s) 暂态类型(机器判断) + 事件类型 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++; }