From d426b773610ac02000b66037a437f8fa5c98d11a Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 25 Aug 2021 14:58:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E5=B7=A6=E9=82=8A?= =?UTF-8?q?=E9=81=B8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AnalysisInverter/Index.cshtml | 2 +- .../Views/AnalysisStationCombine/Index.cshtml | 5 +- .../Views/ElectricitySoldRecord/Index.cshtml | 2 +- SolarPower/Views/NoticeSchedule/Index.cshtml | 2 +- SolarPower/Views/PowerGeneration/Index.cshtml | 2 +- .../Views/StationOverview/_UpToDate.cshtml | 24 +++++----- SolarPower/Views/StationReport/Index.cshtml | 46 ++++++++++--------- 7 files changed, 42 insertions(+), 41 deletions(-) diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml index a13cffe..02ae2c4 100644 --- a/SolarPower/Views/AnalysisInverter/Index.cshtml +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -6,7 +6,7 @@
-
+
diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml index 201ea9a..4512822 100644 --- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml +++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml @@ -10,7 +10,7 @@
-
+
@@ -212,10 +212,7 @@
-
- -
diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml index e4b1515..45757ca 100644 --- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml +++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml @@ -8,7 +8,7 @@
-
+
diff --git a/SolarPower/Views/NoticeSchedule/Index.cshtml b/SolarPower/Views/NoticeSchedule/Index.cshtml index 5f8f33c..6af5479 100644 --- a/SolarPower/Views/NoticeSchedule/Index.cshtml +++ b/SolarPower/Views/NoticeSchedule/Index.cshtml @@ -8,7 +8,7 @@
-
+
diff --git a/SolarPower/Views/PowerGeneration/Index.cshtml b/SolarPower/Views/PowerGeneration/Index.cshtml index 8ad6541..dcabc15 100644 --- a/SolarPower/Views/PowerGeneration/Index.cshtml +++ b/SolarPower/Views/PowerGeneration/Index.cshtml @@ -8,7 +8,7 @@
-
+
diff --git a/SolarPower/Views/StationOverview/_UpToDate.cshtml b/SolarPower/Views/StationOverview/_UpToDate.cshtml index bb5c5be..ae82fa9 100644 --- a/SolarPower/Views/StationOverview/_UpToDate.cshtml +++ b/SolarPower/Views/StationOverview/_UpToDate.cshtml @@ -8,11 +8,11 @@

今日發電量

-

126,161.72

+

0.00

累積發電量

-

4,069.73

+

0.00

@@ -24,11 +24,11 @@

總發金額

-

126,161.72

+

0.00

平均發電金額

-

4,069.73

+

0.00

@@ -40,11 +40,11 @@

即時平均日照度

-

126,161.72

+

0.00

平均日照度(30天)

-

4,069.73

+

0.00

@@ -56,11 +56,11 @@

即時平均 PR 值

-

119.04

+

0.00

平均 PR 值(30天)

-

3.84

+

0.00

@@ -72,11 +72,11 @@

即時平均有效日照時數

-

140.39

+

0.00

平均有效日照時數(30天)

-

4.53

+

0.00

@@ -88,11 +88,11 @@

今日減碳量

-

6,091.78

+

0.00

累積減碳量

-

985.98

+

0.00

diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml index 6d9f426..f3bb283 100644 --- a/SolarPower/Views/StationReport/Index.cshtml +++ b/SolarPower/Views/StationReport/Index.cshtml @@ -8,7 +8,7 @@
-
+
@@ -229,7 +229,7 @@
-
+
@@ -241,7 +241,7 @@
-
+
@@ -259,7 +259,7 @@
-
+
@@ -276,7 +276,7 @@
-
+
@@ -305,11 +305,11 @@ $(function () { //#region 預設初始值 - var a = $('#collapse').trigger("click"); - //document.getElementById("collapse").click(); - $('.overflow-auto').hide(); + $('#collapse').trigger("click"); + $('#overviewtable').hide(); $('#maxtable').hide(); $('#hiretable').hide(); + $('#detailtable').hide(); $('#DateGet').val(new Date().toISOString().substring(0, 10)); document.getElementById("DateGettextdiv").style.display = "none";//隱藏 $('#DateGet').attr('style', 'width:205px'); @@ -488,11 +488,11 @@ $.each(selecterd_invert, function (index, inverter) { if (inverter.value == nowpowerstation) { - stri += ''; + stri += ''; } else { - stri += ''; + stri += ''; } }) $('#selectOneStation').append(stri); @@ -542,14 +542,14 @@ selecterd_invert.push(getstation); } else { var a = selecterd_invert.filter(function (n, i) { - + if (n.name === getstation.name && n.value === getstation.value) { if (nowpowerstation == getstation.value) { nowpowerstation = null; } selecterd_invert.splice(i, 1); } - + }); } AddButtonWithStation(); @@ -645,8 +645,8 @@ } }); $("#js_list_accordion .collapse").collapse('show'); - - + + }, 'json'); } //#endregion @@ -938,7 +938,9 @@ haveinvertName = []; } - $('.overflow-auto').show(); + $('#overviewtable').show(); + $('#detailtable').show(); + nowform = form; }, 'json'); } @@ -1007,7 +1009,7 @@ } else { - var npush = true; + var npush = true; CityArray.filter(function (n, i) { if (n.city == data.cityName) { n.kwp += cityinfo.kwp; @@ -1032,11 +1034,11 @@ if (showmoney == 1) { StrInfoBody += ""; - StrInfoBody += ""; + StrInfoBody += ""; - StrInfoBody += ""; + StrInfoBody += ""; } - + StrInfoBody += ""; @@ -1079,7 +1081,9 @@ $('#maxtableBody').append(CityInfoBody); $('#maxtable').show(); - $('.overflow-auto').show(); + $('#overviewtable').show(); + $('#detailtable').show(); + nowform = 2; }) } @@ -1106,7 +1110,7 @@ }) } }); - return hirerate; + return hirerate; } From 0567483eba25193fc9bff0c52b5bd226056af6bd Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 25 Aug 2021 17:00:05 +0800 Subject: [PATCH 2/2] 1. bug fix --- SolarPower/Controllers/AnalysisStationInfoController.cs | 4 ++-- SolarPower/Views/AnalysisStationInfo/Index.cshtml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SolarPower/Controllers/AnalysisStationInfoController.cs b/SolarPower/Controllers/AnalysisStationInfoController.cs index 7ebccc2..6b3d2d9 100644 --- a/SolarPower/Controllers/AnalysisStationInfoController.cs +++ b/SolarPower/Controllers/AnalysisStationInfoController.cs @@ -276,8 +276,8 @@ namespace SolarPower.Controllers analysisDevice.Series.Add(PR); DeviceHistoryInfo modelTemperature = new DeviceHistoryInfo(); - modelTemperature.Name = string.Format("{0}:{1}", powerStation.Name, analysisDevice.MultipleYaxes["ModelTemperature"]); - modelTemperature.YaxesKey = "ModelTemperature"; + modelTemperature.Name = string.Format("{0}:{1}", powerStation.Name, analysisDevice.MultipleYaxes["Temperature"]); + modelTemperature.YaxesKey = "Temperature"; modelTemperature.Values = new List(); foreach (var history in temp_item) { diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml index 70eb257..ca8844b 100644 --- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -126,7 +126,7 @@ { key: "Irradiance", title: "日照度", default: true }, { key: "KWHKWP", title: "發電小時", default: false }, { key: "PR", title: "PR %", default: false }, - { key: "ModelTemperature", title: "模組溫度", default: false }, + { key: "Temperature", title: "模組溫度", default: false }, { key: "SolarHour", title: "日照小時", default: false } ] var PWR_compare_col = [
" + data.todayMoney.toFixed(2) + "" + (data.todayMoney * hirerate * 0.01).toFixed(2)+ "" + (data.todayMoney * hirerate * 0.01).toFixed(2)+ "" + data.todayMoney.toFixed(2) + "" + data.todayMoney.toFixed(2) + "