From ed1b3d212c9498fa9b646a310942b8ff1146243f Mon Sep 17 00:00:00 2001 From: "wanling040@gmail.com" Date: Thu, 4 Aug 2022 10:21:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E9=9B=BB=E7=AB=99=E8=B3=87=E8=A8=8A-=E5=8D=B3=E6=99=82?= =?UTF-8?q?=E8=B3=87=E8=A8=8A:=E4=BB=8A=E6=97=A5=E7=9A=84=E5=9C=96?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=96=E7=B4=AF=E7=A9=8D=E6=97=A5=E7=85=A7?= =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=B0=8F=E6=99=82=E7=9A=84=E5=B7=AE=E9=A1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StationOverviewController.cs | 2 +- SolarPower/Models/Overview.cs | 2 + .../Implement/OverviewRepository.cs | 12 +- .../Views/AnalysisInverter/Index.cshtml | 110 +++++++++--------- .../Views/AnalysisStationCombine/Index.cshtml | 56 ++++----- .../Views/AnalysisStationInfo/Index.cshtml | 46 ++++---- .../Views/ElectricitySoldRecord/Index.cshtml | 6 +- SolarPower/Views/ExceptionRecord/Index.cshtml | 4 +- SolarPower/Views/MapOverview/Index.cshtml | 44 +++---- SolarPower/Views/NoticeSchedule/Index.cshtml | 6 +- SolarPower/Views/Operation/Index.cshtml | 4 +- .../Views/Operation/OperationRecord.cshtml | 4 +- SolarPower/Views/PowerGeneration/Index.cshtml | 6 +- SolarPower/Views/StationOverview/Index.cshtml | 36 +++--- .../StationOverviewInfo.cshtml | 36 +++--- .../Views/StationOverview/_History.cshtml | 4 +- .../Views/StationOverview/_UpToDate.cshtml | 38 +++--- SolarPower/Views/StationReport/Index.cshtml | 14 +-- 18 files changed, 216 insertions(+), 214 deletions(-) diff --git a/SolarPower/Controllers/StationOverviewController.cs b/SolarPower/Controllers/StationOverviewController.cs index 284911c..caec31c 100644 --- a/SolarPower/Controllers/StationOverviewController.cs +++ b/SolarPower/Controllers/StationOverviewController.cs @@ -356,7 +356,7 @@ namespace SolarPower.Controllers PowerIrradianceChart powerIrradianceTodayChart = new PowerIrradianceChart(); powerIrradianceTodayChart.Labels = powerIrradianceToday.Select(x => x.Label).ToList(); powerIrradianceTodayChart.PowerDatas = powerIrradianceToday.Select(x => x.PowerData).ToList(); - powerIrradianceTodayChart.IrradianceDatas = powerIrradianceToday.Select(x => x.IrradianceData).ToList(); + powerIrradianceTodayChart.IrradianceDatas = powerIrradianceToday.Select(x => x.IrrDayHourData).ToList(); powerIrradianceTodayChart.TemperatureDatas = powerIrradianceToday.Select(x => x.TemperatureData).ToList(); chartUptoDate.ChartToday = powerIrradianceTodayChart; diff --git a/SolarPower/Models/Overview.cs b/SolarPower/Models/Overview.cs index 38d6d6f..f5fc772 100644 --- a/SolarPower/Models/Overview.cs +++ b/SolarPower/Models/Overview.cs @@ -95,6 +95,7 @@ namespace SolarPower.Models public double PowerData { get; set; } public double IrradianceData { get; set; } public double TemperatureData { get; set; } + public double IrrDayHourData { get; set; } } public class PowerIrradianceChart @@ -202,6 +203,7 @@ namespace SolarPower.Models /// 累計日照 /// public double IrrDay { get; set; } + public double IrrDayHour { get; set; } } public class ExceptionEmailInfo diff --git a/SolarPower/Repository/Implement/OverviewRepository.cs b/SolarPower/Repository/Implement/OverviewRepository.cs index 6f76dca..8dca441 100644 --- a/SolarPower/Repository/Implement/OverviewRepository.cs +++ b/SolarPower/Repository/Implement/OverviewRepository.cs @@ -212,7 +212,7 @@ namespace SolarPower.Repository.Implement { try { - var sql_power = @$"SELECT DATE_FORMAT(ps.timestamp,'%H %p') AS Label, ps.KWH AS PowerData, pyr.Irradiance AS IrradianceData, pyr.Temperature AS TemperatureData + var sql_power = @$"SELECT DATE_FORMAT(ps.timestamp,'%H %p') AS Label, ps.KWH AS PowerData, pyr.IrrDayHour AS IrrDayHourData, pyr.Temperature AS TemperatureData FROM power_station_history_hour ps LEFT JOIN sensor_history_hour pyr ON ps.PowerStationId = pyr.PowerStationId AND DATE_FORMAT(ps.timestamp, '%Y-%m-%d %H') = DATE_FORMAT(pyr.timestamp, '%Y-%m-%d %H') WHERE ps.PowerStationId = @PowerStationId @@ -681,7 +681,7 @@ namespace SolarPower.Repository.Implement { // range 查詢同一天 range2 = @$" AND DATE_FORMAT(C.`TIMESTAMP`,'%Y-%m-%d') BETWEEN '{ d1 }' AND '{ d2 }'"; sql = $@" SELECT C.TIMESTAMP, C.KWH AS KWH,C.SOLARHOUR, C.PR, - P.Irradiance, P.Temperature AS Temp , C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR + P.Irradiance, P.IrrDayHour, P.Temperature AS Temp , C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR FROM power_station_history_hour C LEFT JOIN sensor_history_hour P ON P.`TIMESTAMP` =C.`TIMESTAMP` AND P.PowerStationId = C.PowerStationId WHERE C.PowerStationId = {post.PowerstationId}{range2} "; @@ -696,7 +696,7 @@ namespace SolarPower.Repository.Implement // LEFT JOIN sensor_history_day P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%m-%d') = DATE_FORMAT(C.TIMESTAMP, '%Y-%m-%d') AND P.PowerStationId = C.PowerStationId // join power_station_history_month m on DATE_FORMAT(P.TIMESTAMP, '%Y-%m') = DATE_FORMAT(m.TIMESTAMP, '%Y-%m') AND m.PowerStationId = C.PowerStationId // WHERE C.PowerStationId = {post.PowerstationId}{range} order by C.TIMESTAMP"; - sql = $@" SELECT C.TIMESTAMP, C.TODAYKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR + sql = $@" SELECT C.TIMESTAMP, C.TODAYKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.IrrDayHour, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR FROM power_station_history_day C LEFT JOIN sensor_history_day P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%m-%d') = DATE_FORMAT(C.TIMESTAMP, '%Y-%m-%d') AND P.PowerStationId = C.PowerStationId WHERE C.PowerStationId = {post.PowerstationId}{range} order by C.TIMESTAMP"; break; @@ -704,16 +704,16 @@ namespace SolarPower.Repository.Implement } break; case 1: // day 沒有 dateRange - 月 - sql = $@" SELECT C.TIMESTAMP, {kwh} AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR + sql = $@" SELECT C.TIMESTAMP, {kwh} AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.IrrDayHour, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR FROM {usedb} C LEFT JOIN {pyrdb} P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%m-%d') = DATE_FORMAT(C.TIMESTAMP, '%Y-%m-%d') AND P.PowerStationId = C.PowerStationId WHERE C.PowerStationId = {post.PowerstationId}{range} order by C.TIMESTAMP"; break; case 2: // month 單月 - //sql = $@" SELECT C.TIMESTAMP, C.MONTHKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR + //sql = $@" SELECT C.TIMESTAMP, C.MONTHKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.IrrDayHour, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR // FROM power_station_history_month C // LEFT JOIN sensor_history_month P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%m') = DATE_FORMAT(C.TIMESTAMP, '%Y-%m') AND P.PowerStationId = C.PowerStationId // WHERE C.PowerStationId = {post.PowerstationId}{range}"; - sql = $@" SELECT C.TIMESTAMP, C.MONTHKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR + sql = $@" SELECT C.TIMESTAMP, C.MONTHKWH AS KWH, C.SOLARHOUR, C.PR, P.Irradiance, P.IrrDayHour, P.Temperature AS Temp ,C.KWHKWP, P.IrrDay, 0 AS DiffSOLARHOUR, C.PR avgPR FROM power_station_history_month C LEFT JOIN sensor_history_month P ON DATE_FORMAT(P.TIMESTAMP, '%Y-%m') = DATE_FORMAT(C.TIMESTAMP, '%Y-%m') AND P.PowerStationId = C.PowerStationId WHERE C.PowerStationId = {post.PowerstationId}{range}"; diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml index 0e0d81e..adeba19 100644 --- a/SolarPower/Views/AnalysisInverter/Index.cshtml +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -11,7 +11,7 @@
-
+
@@ -83,53 +83,53 @@
@*
-
-
- -
- 2021 四月 - 2021 三月 -
+
+
+ +
+ 2021 四月 + 2021 三月
-
- -
*@ +
+
+ +
*@
@@ -475,25 +475,25 @@ '' + '
' + '
'; - Object.keys(inverterCollapse[key]).map(function (powerStationkey, index2) { - str += '
' + - '
' + - '
' + - '' + - '
' + - '' + - '
' + powerStationkey + '
' + - '
' + powerStationkey + '
' + - '' + - '
' + - '
' + - '
' + - '
    '; + Object.keys(inverterCollapse[key]).map(function (powerStationkey, index2) { + str += '
    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '' + + '
    ' + powerStationkey + '
    ' + + '
    ' + powerStationkey + '
    ' + + '    ' + + '
    ' + + '
    ' + + '
    ' + + '
      '; $.each(inverterCollapse[key][powerStationkey], function (index, inverter) { str += '
    • ' + '
      ' + '
      ' + '' + inverter.inverterName + '' + - '
      • '; + ''; }); str += '
    '; str += '
    '; diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml index 81bceea..ad6772d 100644 --- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml +++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml @@ -13,12 +13,12 @@
    -
    +
    -
    +
    -
    +
    @@ -75,36 +75,36 @@
    -
    +

    發電量

    kW h
    -

    當日發電量

    +

    今日

    0.00

    -

    總發電量

    +

    總計

    0.00

    @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) { -
    +

    發電金額

    NTD
    -

    當日發電金額

    +

    發電金額

    0

    -

    總發金額

    +

    總發電金額

    0

    @@ -112,67 +112,67 @@ } else { -
    +
    -

    日照度

    -
    W/m2
    +

    累積日照量

    +
    Wh/m2
    -

    當日日照度

    +

    今日

    0.00

    -

    平均日照度(30天)

    +

    30天平均

    0.00

    } -
    +

    PR值

    %
    -

    當日PR值

    +

    今日

    0.00

    -

    平均 PR 值(30天)

    +

    30天平均

    0.00

    -
    +

    日均發電度數

    -
    hr
    +
    kWh/kWp
    -

    當日日均發電度數

    +

    今日

    0.00

    -

    平均日均發電度數(30天)

    +

    30天平均

    0.00

    -
    +

    減碳量

    kG
    -

    當日減碳量

    +

    今日

    0.00

    -

    總減碳量

    +

    總計

    0.00

    @@ -338,7 +338,7 @@ $("#today_kwhkwp_label").html(timename + "日均發電度數"); $("#today_PR_label").html(timename + "PR值"); $("#today_carbon_label").html(timename + "減碳量"); - $("#today_irradiance_label").html(timename + "日照度"); + $("#today_irradiance_label").html(timename + "累積日照量"); if (type == 1) { timerange = $('#DateGettext').val(); @@ -556,7 +556,7 @@ data: listtemperature },{ type: 'line', - label: '日照度(W/㎡)', + label: '累積日照度(Wh/㎡)', borderColor: 'rgb(190, 45, 45)', pointBackgroundColor: 'rgb(190, 45, 45)', pointBorderColor: 'rgb(190, 45, 45)', @@ -576,7 +576,7 @@ options: { title: { display: true, - text: '發電量及日照度' + text: '發電量及累積日照量' }, legend: { display: true, @@ -701,7 +701,7 @@ '
    ' + '' + '
    ' + - '
    ' + powerStation.name + '
    ' + + '
    ' + powerStation.name + '
    ' + '
    ' + ''; }); diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml index eff6911..fe998f6 100644 --- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -11,7 +11,7 @@
    -
    +
    @@ -88,19 +88,19 @@
    @*
    -
    -
    - -
    - 2021 四月 - 2021 三月 -
    +
    +
    + +
    + 2021 四月 + 2021 三月
    -
    - -
    *@ +
    +
    + +
    *@
    @@ -509,18 +509,18 @@ '
    '; Object.keys(deviceCollapse[key]).map(function (powerStationkey, index2) { str += '
    ' + - '
    ' + - '
    ' + - '' + - '
    ' + - '' + - '
    ' + powerStationkey + '
    ' + - '
    ' + powerStationkey + '
    ' + - '    ' + - '
    ' + - '
    ' + - '
    ' + - '
      '; + '
      ' + + '
      ' + + '' + + '
      ' + + '' + + '
      ' + powerStationkey + '
      ' + + '
      ' + powerStationkey + '
      ' + + '      ' + + '
      ' + + '
      ' + + '
      ' + + '
        '; $.each(deviceCollapse[key][powerStationkey], function (index, device) { var device_icon = ""; @*switch (device.deviceType) { diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml index 0d53561..bc29fec 100644 --- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml +++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml @@ -13,7 +13,7 @@
        -
        +
        @@ -421,7 +421,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } @@ -431,7 +431,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } diff --git a/SolarPower/Views/ExceptionRecord/Index.cshtml b/SolarPower/Views/ExceptionRecord/Index.cshtml index 290238b..6056b16 100644 --- a/SolarPower/Views/ExceptionRecord/Index.cshtml +++ b/SolarPower/Views/ExceptionRecord/Index.cshtml @@ -634,12 +634,12 @@ if ($.inArray(parseInt(val.cityId), ids) > -1) { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); powerids.push(String(val.id)); } else { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); if ($.inArray(parseInt(val.id), powerids) > -1) { powerids.splice($.inArray(parseInt(val.id), powerids), 1); diff --git a/SolarPower/Views/MapOverview/Index.cshtml b/SolarPower/Views/MapOverview/Index.cshtml index 71cc93a..874e48c 100644 --- a/SolarPower/Views/MapOverview/Index.cshtml +++ b/SolarPower/Views/MapOverview/Index.cshtml @@ -18,89 +18,89 @@ @*
        *@
        -
        +

        發電量

        kW h
        -

        今日總發電量

        +

        今日

        0.00

        -

        累積發電量

        +

        總計

        0.00

        -
        +
        -

        日照度

        -
        W/m2
        +

        累積日照量

        +
        Wh/m2
        -

        今日累積日照量

        +

        今日

        0.00

        -

        日均累積日照量(30天)

        +

        30天平均

        0.00

        -
        +

        PR值

        %
        -

        今日 PR 值

        +

        今日

        0.00

        -

        平均 PR 值(30天)

        +

        30天平均

        0.00

        -
        +

        日均發電度數

        -
        hr
        +
        kWh/kWp
        -

        日均發電度數(kwh/kwp)

        +

        今日

        0.00

        -

        日均發電度數 (30天)

        +

        30天平均

        0.00

        -
        +

        減碳量

        kG
        -

        今日減碳量

        +

        今日

        0.00

        -

        總減碳量

        +

        總計

        0.00

        @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) { -
        +

        自建躉售

        NTD
        @@ -112,7 +112,7 @@
        -
        +

        租建躉售

        NTD
        @@ -124,7 +124,7 @@
        -
        +

        自發自用

        NTD
        @@ -389,7 +389,7 @@ '
        ' + '
        ' + '
        今日發電量(kW h)：' + item.today_kWh.toFixed(2) + '
        '+ - '
        今日日照度(W/m2)：' + item.today_irradiance + '
        '+ + '
        今日累積日照量(Wh/m2)：' + item.today_irradiance + '
        '+ '
        日均發電度數(kwh/kwp)：' + item.today_kwhkwp.toFixed(2) + '
        ' + '
        裝置容量(kWp)：' + item.generatingCapacity.toFixed(3) + '
        ' + '
        掛錶日期：' + item.electricityMeterAt + '
        ' + diff --git a/SolarPower/Views/NoticeSchedule/Index.cshtml b/SolarPower/Views/NoticeSchedule/Index.cshtml index 847cf57..c6c3510 100644 --- a/SolarPower/Views/NoticeSchedule/Index.cshtml +++ b/SolarPower/Views/NoticeSchedule/Index.cshtml @@ -13,7 +13,7 @@
        -
        +
        @@ -518,7 +518,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } @@ -528,7 +528,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } diff --git a/SolarPower/Views/Operation/Index.cshtml b/SolarPower/Views/Operation/Index.cshtml index f3947a9..a5d142f 100644 --- a/SolarPower/Views/Operation/Index.cshtml +++ b/SolarPower/Views/Operation/Index.cshtml @@ -577,12 +577,12 @@ if ($.inArray(parseInt(val.cityId), ids) > -1) { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); powerids.push(String(val.id)); } else { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); if ($.inArray(parseInt(val.id), powerids) > -1) { powerids.splice($.inArray(parseInt(val.id), powerids), 1); diff --git a/SolarPower/Views/Operation/OperationRecord.cshtml b/SolarPower/Views/Operation/OperationRecord.cshtml index 27cc594..34d7cbf 100644 --- a/SolarPower/Views/Operation/OperationRecord.cshtml +++ b/SolarPower/Views/Operation/OperationRecord.cshtml @@ -663,12 +663,12 @@ if ($.inArray(parseInt(val.cityId), ids) > -1) { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); powerids.push(String(val.id)); } else { $('#CheckPowerStation').append("
        "); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); if ($.inArray(parseInt(val.id), powerids) > -1) { powerids.splice($.inArray(parseInt(val.id), powerids), 1); diff --git a/SolarPower/Views/PowerGeneration/Index.cshtml b/SolarPower/Views/PowerGeneration/Index.cshtml index 49bcf65..dd4d840 100644 --- a/SolarPower/Views/PowerGeneration/Index.cshtml +++ b/SolarPower/Views/PowerGeneration/Index.cshtml @@ -13,7 +13,7 @@
        -
        +
        @@ -436,7 +436,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } @@ -446,7 +446,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } diff --git a/SolarPower/Views/StationOverview/Index.cshtml b/SolarPower/Views/StationOverview/Index.cshtml index 2925935..ed54d4b 100644 --- a/SolarPower/Views/StationOverview/Index.cshtml +++ b/SolarPower/Views/StationOverview/Index.cshtml @@ -76,7 +76,7 @@
        -
        +

        發電量

        kW h
        @@ -92,66 +92,66 @@
        -
        +
        -

        日照度

        -
        W/㎡
        +

        累積日照量

        +
        Wh/㎡
        -

        今日日照量

        +

        今日

        0.00

        -

        日平均累積日照度(30天)

        +

        30天平均

        0.00

        -
        +

        PR值

        %
        -

        今日 PR 值

        +

        今日

        0.00

        -

        平均 PR 值(30天)

        +

        30天平均

        0.00

        -
        +

        日均發電度數

        -
        hr
        +
        kWh/kWp
        -

        日均發電度數(kwh/kwp)

        +

        今日

        0.00

        -

        日均發電度數(30天)

        +

        30天平均

        0.00

        -
        +

        減碳量

        kG
        -

        今日減碳量

        +

        今日

        0.00

        -

        累積減碳量

        +

        總計

        0.00

        @@ -240,7 +240,7 @@ 平均日照 @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) { - 今日收入 + 發電金額 } 掛表日期 狀況 @@ -284,7 +284,7 @@ 平均日照 @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) { - 今日收入 + 發電金額 } 掛表日期 狀況 diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index ecc43bb..937852d 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -311,16 +311,16 @@ if (stationOverview.solarType == 0) { $("#money-card-title").html("發電金額"); - $("#money-card-subtitle-total").html("總發電金額"); - $("#money-card-subtitle-avg").html("今日發電金額"); + $("#money-card-subtitle-total").html("總計"); + $("#money-card-subtitle-avg").html("今日"); } else if (stationOverview.solarType == 1) { $("#money-card-title").html("租金收入"); - $("#money-card-subtitle-total").html("總租金收入"); - $("#money-card-subtitle-avg").html("今日租金收入"); + $("#money-card-subtitle-total").html("總計"); + $("#money-card-subtitle-avg").html("今日"); } else { $("#money-card-title").html("省電費用"); - $("#money-card-subtitle-total").html("總省電費用"); - $("#money-card-subtitle-avg").html("今日省電費用"); + $("#money-card-subtitle-total").html("總計"); + $("#money-card-subtitle-avg").html("今日"); } hideLoading(); }, 'json'); @@ -385,7 +385,7 @@ data: chartToday.powerDatas }, { type: 'line', - label: '日照度', + label: '累積日照量', yAxisID: 'B', borderColor: 'rgb(190, 45, 45)', pointBackgroundColor: 'rgb(190, 45, 45)', @@ -443,7 +443,7 @@ }, scaleLabel: { display: true, - labelString: 'W/㎡' + labelString: 'Wh/㎡' } }, { id: 'C', @@ -477,7 +477,7 @@ data: chart7day.powerDatas }, { type: 'line', - label: '日照度', + label: '累積日照量', yAxisID: 'B', borderColor: 'rgb(190, 45, 45)', pointBackgroundColor: 'rgb(190, 45, 45)', @@ -535,7 +535,7 @@ }, scaleLabel: { display: true, - labelString: 'W/㎡' + labelString: 'Wh/㎡' } }, { id: 'C', @@ -569,7 +569,7 @@ data: chartMonth.powerDatas }, { type: 'line', - label: '日照度', + label: '累積日照量', yAxisID: 'B', borderColor: 'rgb(190, 45, 45)', pointBackgroundColor: 'rgb(190, 45, 45)', @@ -627,7 +627,7 @@ }, scaleLabel: { display: true, - labelString: 'W/㎡' + labelString: 'Wh/㎡' } }, { id: 'C', @@ -661,7 +661,7 @@ data: chartYear.powerDatas }, { type: 'line', - label: '日照度', + label: '累積日照量', yAxisID: 'B', borderColor: 'rgb(190, 45, 45)', pointBackgroundColor: 'rgb(190, 45, 45)', @@ -719,7 +719,7 @@ }, scaleLabel: { display: true, - labelString: 'W/㎡' + labelString: 'Wh/㎡' } }, { id: 'C', @@ -2692,7 +2692,7 @@ '' + val.timestamp + '' + '' + (toThousands(val.kwh.toFixed(2))) + '' + '' + (toThousands(val.kwhkwp.toFixed(2))) + '' + - '' + (toThousands(val.irrDay.toFixed(2))) + '' + + '' + (toThousands(val.irrDayHour.toFixed(2))) + '' + //irrDay //'' + val.irradiance.toFixed(2) + '' + '' + (toThousands(val.pr.toFixed(2))) + '' + '' + (toThousands(val.temp.toFixed(2))) + '' + @@ -2763,7 +2763,7 @@ animation: false }, title: { - text: '發電量及日照度' + text: '發電量及累積日照量' }, xAxis: { categories: listmonth, @@ -2777,7 +2777,7 @@ showEmpty: false }, { title: { - text: "W/㎡" + text: "Wh/㎡" }, id: "B", opposite: true, @@ -2814,7 +2814,7 @@ zIndex: 4 }, { type: 'spline', - name: "日照度(W/㎡)", + name: "累積日照(Wh/㎡)", data: listirradiance, yAxis: "B", color: "rgb(190, 45, 45)", diff --git a/SolarPower/Views/StationOverview/_History.cshtml b/SolarPower/Views/StationOverview/_History.cshtml index 9acb695..5510c9c 100644 --- a/SolarPower/Views/StationOverview/_History.cshtml +++ b/SolarPower/Views/StationOverview/_History.cshtml @@ -61,7 +61,7 @@ 時間 發電量(kWh) 日均發電度數 - 累積日照量(W/m2) + 累積日照量(Wh/m2) PR(%) 溫度(℃) @@ -85,7 +85,7 @@ 時間 發電量(kWh) 日均發電度數 - 累積日照量(W/m2) + 累積日照量(Wh/m2) @*日照量(W/m2)*@ PR(%) 溫度(℃) diff --git a/SolarPower/Views/StationOverview/_UpToDate.cshtml b/SolarPower/Views/StationOverview/_UpToDate.cshtml index abe8df5..3b01085 100644 --- a/SolarPower/Views/StationOverview/_UpToDate.cshtml +++ b/SolarPower/Views/StationOverview/_UpToDate.cshtml @@ -1,22 +1,22 @@ 
        -
        +

        發電量

        kW h
        -

        今日發電量

        +

        今日

        0.00

        -

        累積發電量

        +

        總計

        0.00

        -
        +

        發電金額

        NTD
        @@ -32,66 +32,66 @@
        -
        +
        -

        日照度

        -
        W/m2
        +

        累積日照量

        +
        Wh/m2
        -

        即時日照度

        +

        今日

        0.00

        -

        平均日照度(30天)

        +

        30天平均

        0.00

        -
        +

        PR值

        %
        -

        今日 PR 值

        +

        今日

        0.00

        -

        平均 PR 值(30天)

        +

        30天平均

        0.00

        -
        +

        日均發電度數

        -
        hr
        +
        kWh/kWp
        -

        日均發電度數(kwh/kwp)

        +

        今日

        0.00

        -

        日均發電度數(30天)

        +

        30天平均

        0.00

        -
        +

        減碳量

        kG
        -

        今日減碳量

        +

        今日

        0.00

        -

        累積減碳量

        +

        總計

        0.00

        diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml index 8dede79..794f1e0 100644 --- a/SolarPower/Views/StationReport/Index.cshtml +++ b/SolarPower/Views/StationReport/Index.cshtml @@ -13,7 +13,7 @@
        -
        +
        @@ -666,7 +666,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } @@ -676,7 +676,7 @@ '
        ' + '' + '
        ' + - '
        ' + inverter.name + '
        ' + + '
        ' + inverter.name + '
        ' + '
        ' + ''; } @@ -824,7 +824,7 @@ }) str += "小時
        發電量
        (kWh)"; str += "小時
        發電量
        百分比
        (%)"; - str += "累積
        日照量
        (W/㎡)"; + str += "累積
        日照量
        (Wh/㎡)"; str += "小時
        平均
        模組
        溫度
        (°C)"; if (rel.data.showMoney == 1) { str += "小時
        售電
        金額
        (NTD)"; @@ -842,7 +842,7 @@ str += "日照小時(hr)"; str += "日均發電度數"; str += "PR%"; - str += "累積
        日照量
        (W/㎡)"; + str += "累積
        日照量
        (Wh/㎡)"; str += "日
        平均
        模組溫度
        (°C)"; if (rel.data.showMoney == 1) { str += "日
        售電金額
        (NTD)"; @@ -860,7 +860,7 @@ str += "日照小時(hr)"; str += "日均發電度數"; str += "PR%"; - str += "累積
        日照量
        (W/㎡)"; + str += "累積
        日照量
        (Wh/㎡)"; str += "日
        平均
        模組溫度
        (°C)"; if (rel.data.showMoney == 1) { str += "日
        售電金額
        (NTD)"; @@ -895,7 +895,7 @@ str += "日照小時(hr)"; str += "日均發電度數"; str += "PR%"; - str += "累積
        日照量
        (W/㎡)"; + str += "累積
        日照量
        (Wh/㎡)"; str += "月
        平均
        模組溫度
        (°C)"; if (rel.data.showMoney == 1) { str += "月
        售電金額
        (NTD)";