From 003efa79f6a920b491af796ef50ff01828a5a13e Mon Sep 17 00:00:00 2001 From: "wanling040@gmail.com" Date: Fri, 8 Jul 2022 16:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E8=A9=9E=E5=AE=9A=E7=BE=A9:=20?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=97=A5=E7=85=A7=E6=99=82=E6=95=B8=E6=94=B9?= =?UTF-8?q?=E7=82=BA=E6=97=A5=E5=9D=87=E7=99=BC=E9=9B=BB=E5=BA=A6=E6=95=B8?= =?UTF-8?q?=EF=BC=8CKW=E6=94=B9=E7=82=BA=20kW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AnalysisInverterController.cs | 28 +++++++++---------- .../Views/AnalysisInverter/Index.cshtml | 14 +++++----- SolarPower/Views/PowerGeneration/Index.cshtml | 14 +++++----- .../Views/StationOverview/_History.cshtml | 2 +- SolarPower/Views/StationReport/Index.cshtml | 14 +++++----- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/SolarPower/Controllers/AnalysisInverterController.cs b/SolarPower/Controllers/AnalysisInverterController.cs index 9167117..bf973f5 100644 --- a/SolarPower/Controllers/AnalysisInverterController.cs +++ b/SolarPower/Controllers/AnalysisInverterController.cs @@ -122,23 +122,23 @@ namespace SolarPower.Controllers analysisInverter.MultipleYaxes = new Dictionary(){ { "IrrDay", "累積日照量"}, - { "DCKW", "直流功率 (KW)"}, - { "ACKW", "輸出功率 (KW)"}, + { "DCKW", "直流功率 (kW)"}, + { "ACKW", "輸出功率 (kW)"}, { "DC1V", "直流電壓1 (V)"}, { "DC1A", "直流電流1 (A)"}, - { "DC1KW", "直流功率1 (KW)"}, + { "DC1KW", "直流功率1 (kW)"}, { "DC2V", "直流電壓2 (V)"}, { "DC2A", "直流電流2 (A)"}, - { "DC2KW", "直流功率2 (KW)"}, + { "DC2KW", "直流功率2 (kW)"}, { "DC3V", "直流電壓3 (V)"}, { "DC3A", "直流電流3 (A)"}, - { "DC3KW", "直流功率3 (KW)"}, + { "DC3KW", "直流功率3 (kW)"}, { "DC4V", "直流電壓4 (V)"}, { "DC4A", "直流電流4 (A)"}, - { "DC4KW", "直流功率4 (KW)"}, + { "DC4KW", "直流功率4 (kW)"}, { "DC5V", "直流電壓5 (V)"}, { "DC5A", "直流電流5 (A)"}, - { "DC5KW", "直流功率5 (KW)"}, + { "DC5KW", "直流功率5 (kW)"}, { "AC1V", "交流電壓A (V)"}, { "AC2V", "交流電壓B (V)"}, { "AC3V", "交流電壓C (V)"}, @@ -183,7 +183,7 @@ namespace SolarPower.Controllers InverterHistoryInfo DCKW = new InverterHistoryInfo(); - DCKW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率 (KW)"); + DCKW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率 (kW)"); DCKW.YaxesKey = "DCKW"; DCKW.Values = new List(); foreach (var history in temp_item) @@ -200,7 +200,7 @@ namespace SolarPower.Controllers series.Add(DCKW); InverterHistoryInfo ACKW = new InverterHistoryInfo(); - ACKW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "輸出功率 (KW)"); + ACKW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "輸出功率 (kW)"); ACKW.YaxesKey = "ACKW"; ACKW.Values = new List(); foreach (var history in temp_item) @@ -251,7 +251,7 @@ namespace SolarPower.Controllers series.Add(DC1A); InverterHistoryInfo DC1KW = new InverterHistoryInfo(); - DC1KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率1 (KW)"); + DC1KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率1 (kW)"); DC1KW.YaxesKey = "DC1KW"; DC1KW.Values = new List(); foreach (var history in temp_item) @@ -302,7 +302,7 @@ namespace SolarPower.Controllers series.Add(DC2A); InverterHistoryInfo DC2KW = new InverterHistoryInfo(); - DC2KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率2 (KW)"); + DC2KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率2 (kW)"); DC2KW.YaxesKey = "DC2KW"; DC2KW.Values = new List(); foreach (var history in temp_item) @@ -353,7 +353,7 @@ namespace SolarPower.Controllers series.Add(DC3A); InverterHistoryInfo DC3KW = new InverterHistoryInfo(); - DC3KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率3 (KW)"); + DC3KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率3 (kW)"); DC3KW.YaxesKey = "DC3KW"; DC3KW.Values = new List(); foreach (var history in temp_item) @@ -404,7 +404,7 @@ namespace SolarPower.Controllers series.Add(DC4A); InverterHistoryInfo DC4KW = new InverterHistoryInfo(); - DC4KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率4 (KW)"); + DC4KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率4 (kW)"); DC4KW.YaxesKey = "DC4KW"; DC4KW.Values = new List(); foreach (var history in temp_item) @@ -455,7 +455,7 @@ namespace SolarPower.Controllers series.Add(DC5A); InverterHistoryInfo DC5KW = new InverterHistoryInfo(); - DC5KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率5 (KW)"); + DC5KW.Name = string.Format("{0}:{1}", item.First().INVERTERName, "直流功率5 (kW)"); DC5KW.YaxesKey = "DC5KW"; DC5KW.Values = new List(); foreach (var history in temp_item) diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml index ea7c280..5f96a2f 100644 --- a/SolarPower/Views/AnalysisInverter/Index.cshtml +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -158,23 +158,23 @@ var current_compare_col = []; var Single_day_compare_col = [ { key: "IrrDay", title: "累積日照量", default: true }, - { key: "DCKW", title: "直流功率 (KW)", default: false }, - { key: "ACKW", title: "輸出功率 (KW)", default: true }, + { key: "DCKW", title: "直流功率 (kW)", default: false }, + { key: "ACKW", title: "輸出功率 (kW)", default: true }, { key: "DC1V", title: "直流電壓1 (V)", default: false }, { key: "DC1A", title: "直流電流1 (A)", default: false }, - { key: "DC1KW", title: "直流功率1 (KW)", default: false }, + { key: "DC1KW", title: "直流功率1 (kW)", default: false }, { key: "DC2V", title: "直流電壓2 (V)", default: false }, { key: "DC2A", title: "直流電流2 (A)", default: false }, - { key: "DC2KW", title: "直流功率2 (KW)", default: false }, + { key: "DC2KW", title: "直流功率2 (kW)", default: false }, { key: "DC3V", title: "直流電壓3 (V)", default: false }, { key: "DC3A", title: "直流電流3 (A)", default: false }, - { key: "DC3KW", title: "直流功率3 (KW)", default: false }, + { key: "DC3KW", title: "直流功率3 (kW)", default: false }, { key: "DC4V", title: "直流電壓4 (V)", default: false }, { key: "DC4A", title: "直流電流4 (A)", default: false }, - { key: "DC4KW", title: "直流功率4 (KW)", default: false }, + { key: "DC4KW", title: "直流功率4 (kW)", default: false }, { key: "DC5V", title: "直流電壓5 (V)", default: false }, { key: "DC5A", title: "直流電流5 (A)", default: false }, - { key: "DC5KW", title: "直流功率5 (KW)", default: false }, + { key: "DC5KW", title: "直流功率5 (kW)", default: false }, { key: "AC1V", title: "交流電壓A (V)", default: false }, { key: "AC2V", title: "交流電壓B (V)", default: false }, { key: "AC3V", title: "交流電壓C (V)", default: false }, diff --git a/SolarPower/Views/PowerGeneration/Index.cshtml b/SolarPower/Views/PowerGeneration/Index.cshtml index 24cd908..2c1d9f4 100644 --- a/SolarPower/Views/PowerGeneration/Index.cshtml +++ b/SolarPower/Views/PowerGeneration/Index.cshtml @@ -236,11 +236,11 @@ 預估值 CBA 監控系統 台電售電記錄 - 平均發電度數小計
(/kW) + 日均發電度數小計
(/kW) 建置容量(kW) - 發電度數(kW/日) + 日均發電度數(kW/日) 售電單價(NT$/度) 建置容量(kW) 售電單價(NT$/度) @@ -271,11 +271,11 @@ 總售電收入(NT$) 總發電量(度數) 總售電收入(NT$) - CBA每KW平均發電度數 - 監控系統每KW平均發電度數 - 每KW平均發電度數比較(CBA vs 監控系統) - 實際售電收入每KW品駿發電度數 - 每KW平均發電度數比較(CBA vs 實際售電收入) + CBA每kW平均發電度數 + 監控系統每kW平均發電度數 + 每kW平均發電度數比較(CBA vs 監控系統) + 實際售電收入每kW日均發電度數 + 每kW平均發電度數比較(CBA vs 實際售電收入) diff --git a/SolarPower/Views/StationOverview/_History.cshtml b/SolarPower/Views/StationOverview/_History.cshtml index 6156175..9acb695 100644 --- a/SolarPower/Views/StationOverview/_History.cshtml +++ b/SolarPower/Views/StationOverview/_History.cshtml @@ -84,7 +84,7 @@ 時間 發電量(kWh) - 有效發電小時 + 日均發電度數 累積日照量(W/m2) @*日照量(W/m2)*@ PR(%) diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml index 0dcabd3..40f36db 100644 --- a/SolarPower/Views/StationReport/Index.cshtml +++ b/SolarPower/Views/StationReport/Index.cshtml @@ -267,7 +267,7 @@ 縣市 平均發電量(kWp) - 有效發電小時 + 日均發電度數 @@ -787,7 +787,7 @@ str += "日
發電量
(kWh)"; str += "日
發電量
百分比
(%)"; str += "日照小時(hr)"; - str += "有效發電小時"; + str += "日均發電度數"; str += "PR%"; str += "累積日照量(W/㎡)"; str += "日
平均
模組溫度
(°C)"; @@ -799,7 +799,7 @@ str += "區域"; str += "電站名稱"; str += "發電量"; - str += "有效發電小時"; + str += "日均發電度數"; str += "平均日照"; str += "PR"; if (rel.data.showMoney == 1) { @@ -817,7 +817,7 @@ str += "月
發電量
(kWh)"; str += "月
發電量
百分比
(%)"; str += "日照小時(hr)"; - str += "有效發電小時"; + str += "日均發電度數"; str += "PR%"; str += "月
平均
日照度
(W/㎡)"; str += "月
平均
模組溫度
(°C)"; @@ -951,7 +951,7 @@ }) var stc = ""; /* stc += "" + '日照小時' + "";*/ - stc += "" + '有效發電小時' + ""; + stc += "" + '日均發電度數' + ""; stc += "" + 'PR%' + ""; stc += "" + '日發電量(kWh)' + ""; stc += "" + '裝置容量' + ""; @@ -1032,7 +1032,7 @@ var stc = ""; /*stc += "" + '日照平均(日)' + "";*/ - stc += "" + '有效發電小時(日)' + ""; + stc += "" + '日均發電度數(日)' + ""; stc += "" + '發電量平均(kWh)(日)' + ""; stc += "" + '發電量(kWh)(月)' + ""; stc += "" + '裝置容量' + ""; @@ -1158,7 +1158,7 @@ var stc = ""; stc += "" + '日照平均(月)' + ""; - stc += "" + '有效發電小時(月)' + ""; + stc += "" + '日均發電度數(月)' + ""; stc += "" + '發電量平均(kWh)(月)' + ""; stc += "" + '發電量(kWh)(年)' + ""; if (showmoney == 1) {