From 169498051e4ecbb904f79daed09451b438126da1 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Thu, 8 Jul 2021 11:09:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9B=BB=E7=AB=99=E7=B8=BD=E8=A6=BD-?= =?UTF-8?q?=E5=89=8D=E9=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Models/Overview.cs | 2 + .../Implement/OverviewRepository.cs | 28 ++- SolarPower/Views/StationOverview/Index.cshtml | 238 +++++++++++++----- 3 files changed, 206 insertions(+), 62 deletions(-) diff --git a/SolarPower/Models/Overview.cs b/SolarPower/Models/Overview.cs index 481a73f..86efdb1 100644 --- a/SolarPower/Models/Overview.cs +++ b/SolarPower/Models/Overview.cs @@ -40,6 +40,8 @@ namespace SolarPower.Models { public List Cityid { get; set; } //都市 public List Status { get; set; } //狀態 + public int KwhOrder { get; set; } + public int PrOrder { get; set; } } public class StationIds diff --git a/SolarPower/Repository/Implement/OverviewRepository.cs b/SolarPower/Repository/Implement/OverviewRepository.cs index 03fb6aa..b88070a 100644 --- a/SolarPower/Repository/Implement/OverviewRepository.cs +++ b/SolarPower/Repository/Implement/OverviewRepository.cs @@ -128,6 +128,28 @@ namespace SolarPower.Repository.Implement try { var ids = ""; + var KWH = ""; + var PR = ""; + if(post.KwhOrder == 0) + { + KWH = " ORDER BY Today_kwh DESC"; + } + else + { + KWH = " ORDER BY Today_kwh"; + } + + if (post.PrOrder == 0) + { + PR = ",today_PR DESC"; + } + else + { + PR = ",today_PR"; + } + + + foreach (var id in post.Cityid) { ids = ids + id + ","; @@ -138,19 +160,19 @@ namespace SolarPower.Repository.Implement } if (User.Role.Layer == 0 || User.Role.Layer == 1) { - var sql = "SELECT * FROM power_station WHERE CityId IN @IDs AND HealthStatus IN @Status"; + var sql = "SELECT * FROM power_station WHERE CityId IN @IDs AND HealthStatus IN @Status"+ KWH + PR; powerstation = (await conn.QueryAsync(sql, new { IDs = post.Cityid, Status = post.Status})).ToList(); trans.Commit(); } else if (User.Role.Layer == 2) { - var sql = "SELECT * FROM power_station WHERE CityId IN @IDs AND CompanyId=@CompanyId AND HealthStatus IN @Status"; + var sql = "SELECT * FROM power_station WHERE CityId IN @IDs AND CompanyId=@CompanyId AND HealthStatus IN @Status" + KWH + PR; powerstation = (await conn.QueryAsync(sql, new { IDs = post.Cityid, CompanyId = User.CompanyId , Status = post.Status })).ToList(); trans.Commit(); } else { - var sql = "SELECT power_station.* FROM power_station LEFT JOIN power_station_operation_personnel ON power_station.Id = power_station_operation_personnel.PowerStationId WHERE CityId IN @IDs AND Userid = @UserId AND HealthStatus IN @Status"; + var sql = "SELECT power_station.* FROM power_station LEFT JOIN power_station_operation_personnel ON power_station.Id = power_station_operation_personnel.PowerStationId WHERE CityId IN @IDs AND Userid = @UserId AND HealthStatus IN @Status" + KWH + PR; powerstation = (await conn.QueryAsync(sql, new { IDs = post.Cityid, UserId = User.Id , Status = post.Status })).ToList(); trans.Commit(); } diff --git a/SolarPower/Views/StationOverview/Index.cshtml b/SolarPower/Views/StationOverview/Index.cshtml index 1edc79b..6fb26cf 100644 --- a/SolarPower/Views/StationOverview/Index.cshtml +++ b/SolarPower/Views/StationOverview/Index.cshtml @@ -34,21 +34,21 @@
- +
-
+
- - + +
- - + +
- - + +
@@ -58,16 +58,16 @@
-
-
-
- @@ -210,9 +210,15 @@ 編號 電站名稱 裝置容量(kWp) - 逆變器數量 - 台電掛表日 - + 累積發電量 + 今日發電量 + 發電小時 + PR + 日照 + 平均日照 + 今日收入 + 狀況 + 功能 @@ -244,9 +250,15 @@ 編號 電站名稱 裝置容量(kWp) - 逆變器數量 - 台電掛表日 - + 累積發電量 + 今日發電量 + 發電小時 + PR + 日照 + 平均日照 + 今日收入 + 狀況 + 功能 @@ -264,7 +276,7 @@ var ids = new Array(0);//當前選擇縣市 var powerids = new Array(0);//當前選擇電站 var Allids = new Array(0);//全部縣市 - var Allpowerids = new Array(0);//全部電站 + var status123 = new Array(0);//狀態 //#region Array.Remove Array.prototype.remove = function (val) { var index = this.indexOf(val); @@ -275,6 +287,8 @@ //#endregion $(function () { + status123 = []; + var Nurl = "/PowerStation/GetSolarCitySummary"; $.post(Nurl, function (rel) { if (rel.code != "0000") { @@ -290,6 +304,9 @@ ids.push(rel.data[i].cityId); Allids.push(rel.data[i].cityId); } + status123.push(1); + status123.push(2); + status123.push(3); getStation(ids); }, 'json'); @@ -299,11 +316,7 @@ $('#citytest').on("click", "button", function () { var clickid = $(this).attr('id'); var classid = clickid.split("_"); - var Newpowerids = new Array(0); var value = document.getElementById(clickid).className; - ids.sort(function (a, b) { - return a - b; - }); if (value == 'btn btn-outline-success waves-effect waves-themed ml-2') { //選擇 document.getElementById(clickid).setAttribute("class", 'btn btn-success waves-effect waves-themed ml-2'); ids.push(Number(classid[1])); @@ -317,47 +330,109 @@ function getStation(ids) { - var status = [1,2,3]; + var kwh = $('#kwh_order').val(); + var pr = $('#pr_order').val(); var send_data = { cityid: ids, - status: status, + status: status123, + kwhOrder: kwh, + prOrder: pr }; - //ids.sort(function (a, b) { - // return a - b; - //}); - //ids.sort(); - var Nurl = "/StationOverview/GetSolarByCity"; - $.post(Nurl, send_data, function (rel) { - if (rel.code != "0000") { - toast_error(rel.msg); - return; - } + ids.sort(function (a, b) { + return a - b; + }); + ids.sort(); + if (ids.length == 0 || status123.length == 0) { $('#areaCard').empty(); - $.each(rel.data, function (index, val) { - $('#templateCard').find('.col-xl-3').clone().attr('id', 'card_' + val.id).appendTo($('#areaCard')); - $('#card_' + val.id).find('#solarName').html(val.name); - $('#card_' + val.id).find('#Temp').html(val.todayWeatherTemp); - var type = ""; - switch (val.solarType) { - case 0: type = "自建躉售"; break; - case 1: type = "租建躉售"; break; - case 2: type = "自建自用"; break; - default: - console.log(`Sorry, we are out of ${val.solarType}.`); + $('#solarTable').find('tbody').empty(); + $("#today_kwh").html(0); + $("#total_kwh").html(0); + $("#today_irradiance").html(0); + $("#avg_irradiance").html(0); + $("#today_PR").html(0); + $("#avg_PR").html(0); + $("#today_kwhkwp").html(0); + $("#avg_kwhkwp").html(0); + $("#today_carbon").html(0); + $("#total_power_station_count").html(0); + $("#total_capacity").html(0); + $("#update_at").html(0); + } + else + { + var Nurl = "/StationOverview/GetSolarByCity"; + $.post(Nurl, send_data, function (rel) { + if (rel.code != "0000") { + toast_error(rel.msg); + return; } - $('#card_' + val.id).find('#stationtype').html(type); - var time = new Date(val.createdAt); - $('#card_' + val.id).find('#editSolarUrl').attr('href', localurl + '/Info?stationId=' + val.id); - $('#card_' + val.id).find('#date').html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes()); - $('#card_' + val.id).find('#Capacity').html(val.generatingCapacity); - $('#card_' + val.id).find('#PowerRate').html(val.generatingCapacity * val.powerRate); - $('#card_' + val.id).find('#PR').html(val.pr); - $('#card_' + val.id).find('#aria').attr('aria-valuenow', val.pr); - $('#card_' + val.id).find('#aria').attr('style', "width:" + val.pr + "%;"); - powerids.push(val.id); - }); - GetStationCard(); - }, 'json'); + $('#areaCard').empty(); + $('#solarTable').find('tbody').empty(); + powerids = []; + $.each(rel.data, function (index, val) { + $('#templateCard').find('.col-xl-3').clone().attr('id', 'card_' + val.id).appendTo($('#areaCard')); + var statusicon; + switch (val.healthStatus) { + case 1: statusicon = ""; break; + case 2: statusicon = ""; break; + case 3: statusicon = ""; break; + default: + statusicon = 'NULL'; break; + } + $('#card_' + val.id).find('#solarName').html(statusicon + val.name); + $('#card_' + val.id).find('#Temp').html(val.todayWeatherTemp); + var type = ""; + switch (val.solarType) { + case 0: type = "自建躉售"; break; + case 1: type = "租建躉售"; break; + case 2: type = "自建自用"; break; + default: + console.log(`Sorry, we are out of ${val.solarType}.`); + } + $('#card_' + val.id).find('#stationtype').html(type); + var time = new Date(val.createdAt); + $('#card_' + val.id).find('#editSolarUrl').attr('href', localurl + '/Info?stationId=' + val.id); + $('#card_' + val.id).find('#date').html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes()); + $('#card_' + val.id).find('#Capacity').html(val.today_kWh); + $('#card_' + val.id).find('#PowerRate').html(val.today_kWh * val.powerRate); + $('#card_' + val.id).find('#PR').html(val.today_PR); + $('#card_' + val.id).find('#aria').attr('aria-valuenow', val.today_PR); + $('#card_' + val.id).find('#aria').attr('style', "width:" + val.today_PR + "%;"); + powerids.push(val.id); + var statusName; + switch (val.healthStatus) { + case 1: + statusName = "設備正常"; + break; + case 2: + statusName = "設備斷線"; + break; + case 3: + statusName = "設備異常"; + break; + default: + statusName = "NULL"; + } + $('#solarTable').find('tbody').append('' + + '' + val.code + '' + + '' + val.name + '' + + '' + val.generatingCapacity + '' + + '' + val.total_kWh + '' + + '' + val.today_kWh + '' + + '' + val.solarHour + '' + + '' + val.today_PR + '' + + '' + val.today_irradiance + '' + + '' + val.avg_irradiance + '' + + '' + val.today_Monery + '' + + '' + statusName + '' + + '' + + + ''); + }); + GetStationCard(); + }, 'json'); + } + } function GetStationCard() { @@ -386,7 +461,52 @@ }); } + //#region 選擇狀態checkbox + $('#CheckStatus').on("click", "input", function () { + var clickid = $(this).attr('id'); + var classid = clickid.split("_"); + var job = document.getElementById(clickid); + if (job.checked == true) { + status123.push(Number(classid[1])); + } + else { + status123.remove(Number(classid[1])); + } + getStation(ids); + }) + //#endregion + $('#kwh_order').change(function () { + getStation(ids); + }) + + $('#pr_order').change(function () { + getStation(ids); + }) + + //#region 縣市全選 + function Allcity() { + ids = []; + $.each(Allids, function (index, val) { + var cityid = 'cityID_' + val; + document.getElementById(cityid).setAttribute("class", 'btn btn-success waves-effect waves-themed ml-2'); + ids.push(val); + }); + getStation(ids); + } + //#endregion + + //#region 狀態全選 + function AllStatus() { + status123 = []; + for (var i = 1; i <= 3; i++) + { + $('#Status_' + i).prop("checked", true); + status123.push(i); + } + getStation(ids); + } + //#endregion function CardDisplay() { From 6eff014e1567acbc9eec44b0a167ee50e7315eb5 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Thu, 8 Jul 2021 17:24:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=97=E7=AB=99=E7=B8=BD=E8=A6=BD-?= =?UTF-8?q?=E9=81=8B=E7=B6=AD=E7=B4=80=E9=8C=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Controllers/OperationController.cs | 7 +- .../StationOverviewInfo.cshtml | 450 +++++++++++++++++- .../StationOverview/_OperationRecord.cshtml | 186 +++++++- .../8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png | Bin 0 -> 7326 bytes 4 files changed, 640 insertions(+), 3 deletions(-) create mode 100644 SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs index 3450c6c..799c34a 100644 --- a/SolarPower/Controllers/OperationController.cs +++ b/SolarPower/Controllers/OperationController.cs @@ -544,6 +544,7 @@ namespace SolarPower.Controllers FixDo = post.FixDo, Status = post.Status, FinishTime = !string.IsNullOrEmpty(finishTime) ? finishTime : null, + WorkPersonId = post.WorkPersonId, WorkTime = post.WorkTime, Notice = post.Notice, Description = post.Description, @@ -562,6 +563,7 @@ namespace SolarPower.Controllers "WorkTime", "Notice", "Description", + "WorkPersonId", "UpdatedBy", }; @@ -753,7 +755,10 @@ namespace SolarPower.Controllers foreach (var file in recode.RecodeFiles) { var hyperLink = "" + file.FileName + ""; - + if(recode.HyperLinks == null) + { + recode.HyperLinks = new List(); + } recode.HyperLinks.Add(hyperLink); } } diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index 9bfbba6..462d3fc 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -97,8 +97,12 @@ @section Scripts{ } \ No newline at end of file diff --git a/SolarPower/Views/StationOverview/_OperationRecord.cshtml b/SolarPower/Views/StationOverview/_OperationRecord.cshtml index 94571ea..9243033 100644 --- a/SolarPower/Views/StationOverview/_OperationRecord.cshtml +++ b/SolarPower/Views/StationOverview/_OperationRecord.cshtml @@ -1 +1,185 @@ -

5

\ No newline at end of file +
+
+
+ + + + +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + +
電廠表單號項目類型狀態處理人員本次作業預計照片完成時間
+ + + + + + + + + + + + + + + + + +
+
+ + + \ No newline at end of file diff --git a/SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png b/SolarPower/wwwroot/upload/operation_recode/17/8f6f1382-0aaa-46e6-9d50-3016de4dfe4b.png new file mode 100644 index 0000000000000000000000000000000000000000..7024b48e3e7ea6eb92d8d003f34d5352cbb4dcab GIT binary patch literal 7326 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 Ef;wMAkpKVy literal 0 HcmV?d00001 From ac0056ba316071932c2858329360f83d2e65f18d Mon Sep 17 00:00:00 2001 From: b110212000 Date: Thu, 8 Jul 2021 18:19:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Views/Operation/OperationRecord.cshtml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SolarPower/Views/Operation/OperationRecord.cshtml b/SolarPower/Views/Operation/OperationRecord.cshtml index e0d4791..9a3f839 100644 --- a/SolarPower/Views/Operation/OperationRecord.cshtml +++ b/SolarPower/Views/Operation/OperationRecord.cshtml @@ -79,7 +79,7 @@ 狀態 執行人員 本次作業預計 - 照片 + 檔案 完成時間 @*功能*@ @@ -98,7 +98,7 @@ 狀態 執行人員 本次作業預計 - @*照片*@ + 檔案 完成時間 @@ -907,9 +907,10 @@ str += ""; if (value.finishTime != undefined || value.finishTime != null || value.finishTime != "") { - value.hyperLinks.forEach(function (value3, index) { - str += value3; - }); + //value.hyperLinks.forEach(function (value3, index) { + // str += value3; + //}); + str += value.finishTime ; } str += "";