diff --git a/SolarPower/Controllers/AnalysisInverterController.cs b/SolarPower/Controllers/AnalysisInverterController.cs new file mode 100644 index 0000000..6459fc0 --- /dev/null +++ b/SolarPower/Controllers/AnalysisInverterController.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace SolarPower.Controllers +{ + public class AnalysisInverterController : MyBaseController + { + public IActionResult Index() + { + return View(); + } + } +} diff --git a/SolarPower/Controllers/AnalysisStationCombineController.cs b/SolarPower/Controllers/AnalysisStationCombineController.cs new file mode 100644 index 0000000..0f98230 --- /dev/null +++ b/SolarPower/Controllers/AnalysisStationCombineController.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace SolarPower.Controllers +{ + public class AnalysisStationCombineController : MyBaseController + { + public IActionResult Index() + { + return View(); + } + } +} diff --git a/SolarPower/Controllers/AnalysisStationInfoController.cs b/SolarPower/Controllers/AnalysisStationInfoController.cs new file mode 100644 index 0000000..ed4e2a4 --- /dev/null +++ b/SolarPower/Controllers/AnalysisStationInfoController.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace SolarPower.Controllers +{ + public class AnalysisStationInfoController : MyBaseController + { + public IActionResult Index() + { + return View(); + } + } +} diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml new file mode 100644 index 0000000..6b1a4a0 --- /dev/null +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -0,0 +1,7 @@ +@{ + ViewData["MainNum"] = "3"; + ViewData["SubNum"] = "3"; + ViewData["Title"] = "逆變器交叉分析"; +} +@using SolarPower.Models.Role +@model RoleLayerEnum \ No newline at end of file diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml new file mode 100644 index 0000000..5b00de7 --- /dev/null +++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml @@ -0,0 +1,427 @@ +@{ + ViewData["MainNum"] = "3"; + ViewData["SubNum"] = "1"; + ViewData["Title"] = "合併電站"; +} +@using SolarPower.Models.Role +@model RoleLayerEnum + +
    +
  1. 交叉分析
    2. +
  2. 合併電站
    3. +
    4. +
+ +
+

+ 合併電站 +

+
+ +
+
+
+
+
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ + + + +
+
+
+ + +
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
+
+

發電量

+
kwh
+
+
+
+

總發電量

+

126,161.72

+
+
+

今日發電量

+

4,069.73

+
+
+
+
+
+

發電金額

+
NTD
+
+
+
+

總發金額

+

126,161.72

+
+
+

今日發電金額

+

4,069.73

+
+
+
+
+
+

kWh / kWp

+
+
+
+

平均 kWh / kWp

+

140.39

+
+
+

今日 kWh / kWp

+

4.53

+
+
+
+
+
+

PR值

+
+
+
+

平均 PR 值

+

119.04

+
+
+

今日PR值

+

3.84

+
+
+
+ +
+
+

減碳量

+
kG
+
+
+
+

總減碳量

+

6,091.78

+
+
+

今日減碳量

+

985.98

+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ @**@ +
+
+
+ + +
+
+
+
+
+ + +@section Scripts{ + +} \ No newline at end of file diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml new file mode 100644 index 0000000..7a827ea --- /dev/null +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -0,0 +1,7 @@ +@{ + ViewData["MainNum"] = "3"; + ViewData["SubNum"] = "2"; + ViewData["Title"] = "電站交叉分析"; +} +@using SolarPower.Models.Role +@model RoleLayerEnum \ No newline at end of file diff --git a/SolarPower/Views/Operation/OperationRecord.cshtml b/SolarPower/Views/Operation/OperationRecord.cshtml index 61ea57c..d921f11 100644 --- a/SolarPower/Views/Operation/OperationRecord.cshtml +++ b/SolarPower/Views/Operation/OperationRecord.cshtml @@ -260,7 +260,7 @@ //#endregion $(function () { - //#region Date Picker + //#region Date-Picker datepicker = $('#date-range').daterangepicker({ autoUpdateInput: false, locale: { format: 'YYYY/MM/DD' }, diff --git a/SolarPower/Views/Shared/_Layout.cshtml b/SolarPower/Views/Shared/_Layout.cshtml index a4437fe..35fb043 100644 --- a/SolarPower/Views/Shared/_Layout.cshtml +++ b/SolarPower/Views/Shared/_Layout.cshtml @@ -225,18 +225,18 @@ 交叉分析
    -
  • - +
  • + 合併電站
    • -
  • - +
  • + 電站交叉分析
    • -
  • - +
  • + 逆變器交叉分析
    • diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index b35d383..213a2e2 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -1901,11 +1901,8 @@ $(e).removeClass("btn-secondary").addClass("btn-success"); selectInverterkwhBarType = 2; - - $('#inverter-selected-kwhbar-date').prop({ 'type': 'number', 'min': 1900, 'max': now_year, 'step': 1 }); - var now_year = new Date().toISOString().substring(0, 4); - + $('#inverter-selected-kwhbar-date').prop({ 'type': 'number', 'min': 1900, 'max': now_year, 'step': 1 }); $('#inverter-selected-kwhbar-date').val(now_year); $('#inverter-selected-kwhbar-quaryerly').show().val(0); } @@ -1918,10 +1915,8 @@ $(e).removeClass("btn-secondary").addClass("btn-success"); selectInverterkwhBarType = 3; - - $('#inverter-selected-kwhbar-date').prop({ 'type': 'number', 'min': 1900, 'max': now_year, 'step': 1 }); - var now_year = new Date().toISOString().substring(0, 4); + $('#inverter-selected-kwhbar-date').prop({ 'type': 'number', 'min': 1900, 'max': now_year, 'step': 1 }); $('#inverter-selected-kwhbar-date').val(now_year); $('#inverter-selected-kwhbar-quaryerly').hide().val(0).trigger('change'); } diff --git a/SolarPower/appsettings.Development.json b/SolarPower/appsettings.Development.json index bb68462..edb74e9 100644 --- a/SolarPower/appsettings.Development.json +++ b/SolarPower/appsettings.Development.json @@ -6,7 +6,7 @@ "Microsoft.Hosting.Lifetime": "Information" } }, - "LoginExpireMinute": 60, //nJɶA() + "LoginExpireMinute": 60, //?n?J???????A???(??) "DBConfig": { "Server": "MVgHWzR3rGDgD57TUoFunA==", "port": "r4AoXMUDodcQjIzofGNCcg==",