diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml index 859559e..0e0d81e 100644 --- a/SolarPower/Views/AnalysisInverter/Index.cshtml +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -10,9 +10,8 @@
-
- -
+
+
@@ -48,7 +47,7 @@
-
+
@@ -568,7 +567,6 @@ } function GetAnalysisInverter() { - showLoading(); var date; if (searchType != 1) { date = $('#DateGet').val(); @@ -590,10 +588,9 @@ } $("#btn-analysis-inverter").html('').attr("disabled", true); - + $('#container').hide(); $.post(url, send_data, function (rel) { if (rel.code != "0000") { - hideLoading(); toast_error(rel.msg); $("#btn-analysis-inverter").html('查詢').attr("disabled", false); return; @@ -609,7 +606,7 @@ ReloadHighCharts(); $("#btn-analysis-inverter").html('查詢').attr("disabled", false); - hideLoading(); + $('#container').show(); }, 'json'); } diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml index 8814ac5..81bceea 100644 --- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml +++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml @@ -12,10 +12,8 @@
-
- -
- +
+
@@ -76,9 +74,8 @@
-
- -
+
+

發電量

kW h
@@ -96,7 +93,7 @@
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) { -
+

發電金額

NTD
@@ -115,7 +112,7 @@ } else { -
+

日照度

W/m2
@@ -132,7 +129,7 @@
} -
+

PR值

%
@@ -148,7 +145,7 @@
-
+

日均發電度數

hr
@@ -164,7 +161,7 @@
-
+

減碳量

kG
@@ -424,6 +421,22 @@ }); //#endregion + function emptyCard() { + $('#today_money').html('0'); + $('#total_money').html('0'); + $('#today_kwh').html('0.00'); + $('#total_kwh').html('0.00'); + $('#today_irradiance').html('0.00'); + $('#total_irradiance').html('0.00'); + $('#today_PR').html('0.00'); + $('#total_PR').html('0.00'); + $('#today_kwhkwp').html('0.00'); + $('#total_kwhkwp').html('0.00'); + $('#today_carbon').html('0.00'); + $('#total_carbon').html('0.00'); + $('#station-convas-div').empty(); + } + //#region 5張卡片值 function GetStationsCard() { var send_data = { @@ -431,6 +444,7 @@ timerange: timerange, seacrhType: searchType } + emptyCard(); showLoading(); var Nurl = "/AnalysisStationCombine/GetStationsCard"; $.post(Nurl, send_data, function (rel) { diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml index c58ec4a..eff6911 100644 --- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -10,9 +10,8 @@
-
- -
+
+
@@ -48,7 +47,7 @@
-
+
@@ -82,7 +81,7 @@
- +
@@ -598,7 +597,7 @@ //在剛開始就在 sensor_type_detail 資料表中 取得ItemName //#region function GetItemInfo(itemId) { - showLoading(); + $("#chooseToCompareBtn").html('').attr("disabled", true); //sensor_type_detail_dictionary = {''} //my_dict = { 'first_name': 'eddie', 'last_name': 'kao', 'age': 30 } @@ -610,19 +609,19 @@ $.post(url, send_data, function (rel) { if (rel.code == "9999") { - hideLoading(); + $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false); toast_error(rel.msg); return; } else if (rel.code == "9998") { - hideLoading(); + $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false); toast_error(rel.msg); return; } var nowCompare_col = [{ key: rel.data.itemEName, title: rel.data.itemName, default: true }]; PushSpecifyCurrentCompareCol(nowCompare_col); ChangeCompareSelectOption(); - hideLoading(); + $("#chooseToCompareBtn").html('選擇比較欄位').attr("disabled", false); }, 'json'); } //#endregion @@ -685,7 +684,6 @@ } function GetAnalysisStationInfo() { - showLoading(); var date; if (searchType != 1) { date = $('#DateGet').val(); @@ -707,10 +705,9 @@ } $("#btn-analysis-stationinfo").html('').attr("disabled", true); - + $('#container').hide(); $.post(url, send_data, function (rel) { if (rel.code != "0000") { - hideLoading(); toast_error(rel.msg); return; } @@ -727,7 +724,8 @@ ReloadHighCharts() $("#btn-analysis-stationinfo").html('查詢').attr("disabled", false); - hideLoading(); + $('#container').show(); + }, 'json'); } diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml index 71d643b..0d53561 100644 --- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml +++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml @@ -12,9 +12,8 @@
-
- -
+
+
@@ -138,7 +137,7 @@
-
+
@@ -189,7 +188,6 @@ -
@@ -260,21 +258,21 @@ var selected_id; var RecordTable; //#region Date-Picker - datepicker = $('#DateGettext').daterangepicker({ - autoUpdateInput: false, - locale: { format: 'YYYY/MM/DD' }, - opens: 'left' - }); + datepicker = $('#DateGettext').daterangepicker({ + autoUpdateInput: false, + locale: { format: 'YYYY/MM/DD' }, + opens: 'left' + }); - $('#DateGettext').on('apply.daterangepicker', function (ev, picker) { - $(this).val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD')); - $(this).trigger('change'); - }); + $('#DateGettext').on('apply.daterangepicker', function (ev, picker) { + $(this).val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD')); + $(this).trigger('change'); + }); - $('#DateGettext').on('cancel.daterangepicker', function (ev, picker) { - $(this).val(''); - $(this).trigger('change'); - }); + $('#DateGettext').on('cancel.daterangepicker', function (ev, picker) { + $(this).val(''); + $(this).trigger('change'); + }); //#endregion function showLoading() { @@ -494,7 +492,7 @@ $('#DateGet').prop({ 'type': 'month' }); var now_month = new Date().toISOString().substring(0, 7); $('#DateGet').val(now_month); - + break; case 3: var now_year = new Date().toISOString().substring(0, 4); @@ -511,8 +509,7 @@ $("#Record-modal").modal(); } - function SaveSoldMoney() - { + function SaveSoldMoney() { if ($("#Record-form").valid()) { showLoading(); var url = "/ElectricitySoldRecord/SaveSoldMoney"; @@ -558,7 +555,7 @@ "data": "id" }, { "data": "powerStationName" - },{ + }, { "data": "month" }, { "data": "startAt" @@ -606,8 +603,8 @@ "type": "POST", "data": function (d) { d.stationId = selecterd_powerstationId, - d.time = timerange, - d.searchType = searchType + d.time = timerange, + d.searchType = searchType }, "dataSrc": function (rel) { hideLoading(); @@ -634,7 +631,7 @@ function Searchform() { $("#wait").show(); -/* console.log(selecterd_powerstationId);*/ + /* console.log(selecterd_powerstationId);*/ if (searchType == 0 || searchType == 1) { timerange = $('#DateGettext').val(); } diff --git a/SolarPower/Views/ExceptionRecord/Index.cshtml b/SolarPower/Views/ExceptionRecord/Index.cshtml index 372f23b..290238b 100644 --- a/SolarPower/Views/ExceptionRecord/Index.cshtml +++ b/SolarPower/Views/ExceptionRecord/Index.cshtml @@ -54,13 +54,15 @@
-
-
+
+
-
-
+
+
+
+
@@ -630,14 +632,14 @@ powerids = []; $.each(rel.data, function (index, val) { if ($.inArray(parseInt(val.cityId), ids) > -1) { - $('#CheckPowerStation').append("
"); + $('#CheckPowerStation').append("
"); $('#station_' + val.id).append(""); - $('#station_' + val.id).append(""); + $('#station_' + val.id).append(""); powerids.push(String(val.id)); } else { - $('#CheckPowerStation').append("
"); + $('#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 3c9d9f1..71cc93a 100644 --- a/SolarPower/Views/MapOverview/Index.cshtml +++ b/SolarPower/Views/MapOverview/Index.cshtml @@ -15,9 +15,10 @@
-
-
-
+@*
*@ +
+
+

發電量

kW h
@@ -33,7 +34,7 @@
-
+

日照度

W/m2
@@ -49,7 +50,7 @@
-
+

PR值

%
@@ -65,7 +66,7 @@
-
+

日均發電度數

hr
@@ -81,7 +82,7 @@
-
+

減碳量

kG
@@ -97,49 +98,90 @@
+ @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney")) + { +
+
+

自建躉售

+
NTD
+
+
+
+

今日發電金額

+

0.00

+
+
+
+
+
+

租建躉售

+
NTD
+
+
+
+

今日發電金額

+

0.00

+
+
+
+
+
+

自發自用

+
NTD
+
+
+
+

今日省電金額

+

0.00

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

自建躉售

-
NTD
-
-
-
-

今日發電金額

-

0.00

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

自建躉售

+
NTD
+
+
+
+

今日發電金額

+

0.00

+
-
-
-
-

租建躉售

-
NTD
-
-
-
-

今日發電金額

-

0.00

+
+
+

租建躉售

+
NTD
+
+
+
+

今日發電金額

+

0.00

+
-
-
-
-

自發自用

-
NTD
-
-
-
-

今日省電金額

-

0.00

+
+
+

自發自用

+
NTD
+
+
+
+

今日省電金額

+

0.00

+
-
- } + } +
*@ +
@@ -154,31 +196,32 @@
+
-
-
-
-
-

電站總數

-
-
-

0

-

廠

-
+
+ @*
*@ +
+
+

電站總數

+
+
+

0

+

廠

+ @*
*@ -
-
-
-

總裝置容量

-
-
-

0.00

-

MWp

-
+ @*
*@ +
+
+

總裝置容量

+
+
+

0.00

+

MWp

+ @*
*@
@@ -203,8 +246,8 @@
-
+
@@ -212,13 +255,13 @@
-@section Scripts{ + @section Scripts{ - @**@ - - + @**@ + + - -} + + } diff --git a/SolarPower/Views/NoticeSchedule/Index.cshtml b/SolarPower/Views/NoticeSchedule/Index.cshtml index 63604a4..847cf57 100644 --- a/SolarPower/Views/NoticeSchedule/Index.cshtml +++ b/SolarPower/Views/NoticeSchedule/Index.cshtml @@ -12,9 +12,8 @@
-
- -
+
+
@@ -187,7 +186,7 @@
-
+
@@ -209,10 +208,10 @@
- +
-
+
@@ -586,7 +585,6 @@ checkType : CheckType, powerstationIds: selecterd_station }; - showLoading(); NoticeDataTable = $("#NoticeTable").DataTable({ "pageLength": 10, "paging": true, @@ -644,15 +642,16 @@ d.info = info }, "dataSrc": function (rel) { - hideLoading(); if (rel.data.code == "9999") { toast_error(rel.data.msg); + $("#submitBtn").html('查詢').attr("disabled", false); return; } data = rel.data.data; if (data == null || data.length == 0) { this.data = []; } + $("#submitBtn").html('查詢').attr("disabled", false); return data; } }, @@ -665,7 +664,7 @@ function submit() { console.log(selecterd_station); - + $("#submitBtn").html('').attr("disabled", true); info = { timeType: searchType, diff --git a/SolarPower/Views/Operation/Index.cshtml b/SolarPower/Views/Operation/Index.cshtml index b6e407b..f3947a9 100644 --- a/SolarPower/Views/Operation/Index.cshtml +++ b/SolarPower/Views/Operation/Index.cshtml @@ -55,17 +55,18 @@
-
+
-
-
- +
+
+
+
-
+
-
-
- +
+
+
+
-
+
@@ -206,7 +205,7 @@
- +
@@ -527,7 +526,11 @@ function Search() { - showLoading(); + $("#searchBtn").html('').attr("disabled", true); + + $('#history-kWh-convas-div').hide(); + $('#totalbody').empty(); + $('#asbody').empty(); var url = "/PowerGeneration/GetGenerationList" var send_data = { PowerstationId: nowpowerstation, @@ -536,7 +539,7 @@ } $.post(url, send_data, function (rel) { if (rel.code != "0000") { - hideLoading(); + $("#searchBtn").html('查詢').attr("disabled", false); toast_error(rel.msg); return; } @@ -552,8 +555,6 @@ var listcba = new Array(0); var listactual = new Array(0); var listreal = new Array(0); - $('#totalbody').empty(); - $('#asbody').empty(); if (rel.data.length == 0) @@ -685,8 +686,8 @@ } }); - - hideLoading(); + $("#searchBtn").html('查詢').attr("disabled", false); + $('#history-kWh-convas-div').show(); }); } diff --git a/SolarPower/Views/PowerStation/Index.cshtml b/SolarPower/Views/PowerStation/Index.cshtml index 739c8fd..9a9f3b1 100644 --- a/SolarPower/Views/PowerStation/Index.cshtml +++ b/SolarPower/Views/PowerStation/Index.cshtml @@ -17,9 +17,8 @@
-
- -
+
+
@@ -114,57 +113,57 @@
- -
-
+
-
-
-
+
+
+
-
+
-
+
@@ -75,88 +75,88 @@
- -
-
-

發電量

-
kW h
-
-
-
-

今日發電量

-

0.00

+
+
+
+

發電量

+
kW h
-
-

累積發電量

-

0.00

+
+
+

今日發電量

+

0.00

+
+
+

累積發電量

+

0.00

+
+
+
+
+
+

日照度

+
W/㎡
+
+
+
+

今日日照量

+

0.00

+
+
+

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

+

0.00

+
+
+
+
+
+

PR值

+
%
+
+
+
+

今日 PR 值

+

0.00

+
+
+

平均 PR 值(30天)

+

0.00

+
+
+
+
+
+

日均發電度數

+
hr
+
+
+
+

日均發電度數(kwh/kwp)

+

0.00

+
+
+

日均發電度數(30天)

+

0.00

+
+
+
+
+
+

減碳量

+
kG
+
+
+
+

今日減碳量

+

0.00

+
+
+

累積減碳量

+

0.00

+
-
-
-

日照度

-
W/㎡
-
-
-
-

今日日照量

-

0.00

-
-
-

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

-

0.00

-
-
-
-
-
-

PR值

-
%
-
-
-
-

今日 PR 值

-

0.00

-
-
-

平均 PR 值(30天)

-

0.00

-
-
-
-
-
-

日均發電度數

-
hr
-
-
-
-

日均發電度數(kwh/kwp)

-

0.00

-
-
-

日均發電度數(30天)

-

0.00

-
-
-
-
-
-

減碳量

-
kG
-
-
-
-

今日減碳量

-

0.00

-
-
-

累積減碳量

-

0.00

-
-
-
-
diff --git a/SolarPower/Views/StationOverview/_Inverter.cshtml b/SolarPower/Views/StationOverview/_Inverter.cshtml index c89e0c7..935dbe3 100644 --- a/SolarPower/Views/StationOverview/_Inverter.cshtml +++ b/SolarPower/Views/StationOverview/_Inverter.cshtml @@ -1,28 +1,30 @@ @*
-
- -
-
-
- +
+
-
-
*@ -
-
+
+
+ +
+
+
*@ +
+
-
-
+
+
+
+
-
+
-
+
@@ -30,32 +32,32 @@
-
-
-
-
- - - - -
-
-
- - -
-
-
- -
-
-
- +
+
+ + + + +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
\ No newline at end of file diff --git a/SolarPower/Views/StationOverview/_InverterInfo.cshtml b/SolarPower/Views/StationOverview/_InverterInfo.cshtml index a1f5b9f..6829a92 100644 --- a/SolarPower/Views/StationOverview/_InverterInfo.cshtml +++ b/SolarPower/Views/StationOverview/_InverterInfo.cshtml @@ -2,8 +2,8 @@