From 594b248ff1296ffb4c7039f0fc195bdefd348086 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Fri, 8 Oct 2021 09:55:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=81=8B=E7=B6=AD?= =?UTF-8?q?=E4=BA=BA=E5=93=A1=E7=84=A1=E6=8E=92=E9=99=A4=E4=BB=A5=E5=88=AA?= =?UTF-8?q?=E9=99=A4=E4=BA=BA=E5=93=A1=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Repository/Implement/OperationRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SolarPower/Repository/Implement/OperationRepository.cs b/SolarPower/Repository/Implement/OperationRepository.cs index 0e6435c..53add52 100644 --- a/SolarPower/Repository/Implement/OperationRepository.cs +++ b/SolarPower/Repository/Implement/OperationRepository.cs @@ -625,7 +625,7 @@ namespace SolarPower.Repository.Implement { try { - var sql = @$"SELECT us.* FROM power_station_operation_personnel ps LEFT JOIN user us ON ps.UserId = us.Id WHERE PowerStationId = {PowerStationId}"; + var sql = @$"SELECT us.* FROM power_station_operation_personnel ps LEFT JOIN user us ON ps.UserId = us.Id WHERE ps.PowerStationId = {PowerStationId} and ps.Deleted = 0"; result = (await conn.QueryAsync(sql)).ToList(); } catch (Exception exception) From e3441a76f7fc5b0420096b8f7f6c16a0d7ed9d72 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Fri, 8 Oct 2021 10:00:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=BE=A9bug-=E5=A6=82=E4=B8=8A?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Repository/Implement/OperationRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SolarPower/Repository/Implement/OperationRepository.cs b/SolarPower/Repository/Implement/OperationRepository.cs index 53add52..6ade5ac 100644 --- a/SolarPower/Repository/Implement/OperationRepository.cs +++ b/SolarPower/Repository/Implement/OperationRepository.cs @@ -625,7 +625,7 @@ namespace SolarPower.Repository.Implement { try { - var sql = @$"SELECT us.* FROM power_station_operation_personnel ps LEFT JOIN user us ON ps.UserId = us.Id WHERE ps.PowerStationId = {PowerStationId} and ps.Deleted = 0"; + var sql = @$"SELECT us.* FROM power_station_operation_personnel ps LEFT JOIN user us ON ps.UserId = us.Id WHERE ps.PowerStationId = {PowerStationId} and ps.Deleted = 0 AND us.Deleted = 0"; result = (await conn.QueryAsync(sql)).ToList(); } catch (Exception exception) From be00cb0bc9a0d1947b16affe83952570060602c2 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Wed, 13 Oct 2021 10:18:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=BE=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Controllers/OperationController.cs | 3 ++- .../Implement/ElectricitySoldRecordRepository.cs | 2 +- SolarPower/Views/PowerStation/_UploadImage.cshtml | 2 +- .../Views/StationOverview/StationOverviewInfo.cshtml | 10 +++++----- SolarPower/Views/StationOverview/_Exception.cshtml | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs index 33bc534..04caffd 100644 --- a/SolarPower/Controllers/OperationController.cs +++ b/SolarPower/Controllers/OperationController.cs @@ -643,7 +643,7 @@ namespace SolarPower.Controllers OperationRecordPersonnel operationRecordPersonnel = new OperationRecordPersonnel(); operationRecordPersonnel.OperationRecordId = id; operationRecordPersonnel.UserId = op; - + operationRecordPersonnel.CreatedBy = myUser.Id; insertOperationRecordPersonnels.Add(operationRecordPersonnel); } @@ -651,6 +651,7 @@ namespace SolarPower.Controllers { "OperationRecordId", "UserId", + "CreatedBy" }; await operationRepository.AddOperationRecordPersonnelAsync(insertOperationRecordPersonnels, operationRecordPersonnelProperties); diff --git a/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs b/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs index 5573c76..8865c1b 100644 --- a/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs +++ b/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs @@ -122,7 +122,7 @@ namespace SolarPower.Repository.Implement var sql = @$"SELECT aa.StartAt,aa.EndAt,aa.Kwh actualkwh,aa.Money actualMoney,SUM(pd.TODAYKWH) realKWH,SUM(pd.MONEY) realMoney,ps.Estimate_kwh CBAkwh,ps.EstimateEfficacy CBAeff ,ps.GeneratingCapacity capacity ,ps.PowerRate rate FROM power_station_history_day pd - LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 ) aa + LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 AND er.PowerstationId = {info.PowerstationId}) aa ON aa.PowerstationId = pd.PowerStationId LEFT JOIN power_station ps ON ps.Id = pd.PowerStationId WHERE pd.TIMESTAMP BETWEEN aa.StartAt AND aa.EndAt AND ps.Id = {info.PowerstationId} GROUP BY aa.Id"; diff --git a/SolarPower/Views/PowerStation/_UploadImage.cshtml b/SolarPower/Views/PowerStation/_UploadImage.cshtml index 7c6a288..dd89116 100644 --- a/SolarPower/Views/PowerStation/_UploadImage.cshtml +++ b/SolarPower/Views/PowerStation/_UploadImage.cshtml @@ -41,7 +41,7 @@
單線圖
- 上傳圖片 + 上傳檔案
diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index 3b96580..feba4a5 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -319,7 +319,7 @@ labels: chartToday.labels, datasets: [{ type: 'bar', - label: '輸出功率', + label: '發電量', yAxisID: 'A', backgroundColor: 'rgb(103, 180, 172)', order: 3, @@ -411,7 +411,7 @@ labels: chart7day.labels, datasets: [{ type: 'bar', - label: '輸出功率', + label: '發電量', yAxisID: 'A', backgroundColor: 'rgb(103, 180, 172)', order: 3, @@ -503,7 +503,7 @@ labels: chartMonth.labels, datasets: [{ type: 'bar', - label: '輸出功率', + label: '發電量', yAxisID: 'A', backgroundColor: 'rgb(103, 180, 172)', order: 3, @@ -595,7 +595,7 @@ labels: chartYear.labels, datasets: [{ type: 'bar', - label: '輸出功率', + label: '發電量', yAxisID: 'A', backgroundColor: 'rgb(103, 180, 172)', order: 2, @@ -2010,7 +2010,7 @@ }, title: { - text: '逆變器單日kWhkWp' + text: '各逆變器當日有效日照時數' }, xAxis: { categories: HeatMap.xAxis, diff --git a/SolarPower/Views/StationOverview/_Exception.cshtml b/SolarPower/Views/StationOverview/_Exception.cshtml index be88d72..6fb7943 100644 --- a/SolarPower/Views/StationOverview/_Exception.cshtml +++ b/SolarPower/Views/StationOverview/_Exception.cshtml @@ -131,7 +131,7 @@
- +
From 781bf9e6600f66b81004d9e50296260663238c3f Mon Sep 17 00:00:00 2001 From: b110212000 Date: Wed, 13 Oct 2021 14:07:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=96=AE=E7=B7=9A=E5=9C=96PDF=E4=B8=8A?= =?UTF-8?q?=E5=82=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PowerStation/PowerStationEdit.cshtml | 36 ++++++++++++++++-- SolarPower/wwwroot/img/pdf.png | Bin 0 -> 8183 bytes 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 SolarPower/wwwroot/img/pdf.png diff --git a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml index ea46e76..96f7376 100644 --- a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml +++ b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml @@ -812,7 +812,12 @@ powerStationSingleLineCard = $("#power-station-single-line-card > .row"); powerStationSingleLineCard.empty(); rel.data.forEach(function (value, index) { - CreatePowerStationSingleLineBox(powerStationSingleLineCard, value); + var split = value.image.split("."); + if (split[split.length - 1].toLowerCase() == "pdf") { + CreatePowerStationSingleLineBoxPDF(powerStationSingleLineCard, value); + } else { + CreatePowerStationSingleLineBox(powerStationSingleLineCard, value); + } }); @@ -2870,7 +2875,7 @@ //#region 單線圖 Dropzone var powerStationSingleLineDropzone = new Dropzone("#power-station-single-line-form", { url: "/PowerStation/SavePowerStationSingleLine", - acceptedFiles: "image/*", + acceptedFiles: "image/*,application/pdf", autoProcessQueue: false, parallelUploads: 5, maxFiles: 5, @@ -2914,7 +2919,14 @@ powerStationSingleLineCard = $("#power-station-single-line-card > .row"); powerStationSingleLineCard.empty(); rel.data.forEach(function (value, index) { - CreatePowerStationSingleLineBox(powerStationSingleLineCard, value); + var split = value.image.split("."); + if (split[split.length - 1].toLowerCase() == "pdf") { + CreatePowerStationSingleLineBoxPDF(powerStationSingleLineCard, value); + } else { + CreatePowerStationSingleLineBox(powerStationSingleLineCard, value); + } + + }); }); @@ -2937,6 +2949,24 @@ } //#endregion + //#region 創建單線圖PDFbox + function CreatePowerStationSingleLineBoxPDF(dom, value) { + var str = '
' + + '
' + + '' + + '...' + + ''+ + '' + + '' + + '' + + '
' + + '
'; + + dom.append(str); + } + //#endregion + + //#region 刪除單線圖 $('#power-station-single-line-card').on("click", "a.del-power-station-single-line-btn", function () { diff --git a/SolarPower/wwwroot/img/pdf.png b/SolarPower/wwwroot/img/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..5196ca4687953f37eacf7ccc2ab0aed13ed1ce13 GIT binary patch literal 8183 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

$W5 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 Date: Wed, 13 Oct 2021 16:34:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=B3=E6=99=82->?= =?UTF-8?q?=E4=BB=8A=E6=97=A5=20=20=E6=96=B0=E5=A2=9EEmail=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8B=BE=E9=81=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolarPower/Controllers/OperationController.cs | 239 +++++++++--------- SolarPower/Models/Operation.cs | 1 + SolarPower/Views/MapOverview/Index.cshtml | 6 +- .../Views/Operation/OperationRecord.cshtml | 154 ++++++----- SolarPower/Views/StationOverview/Index.cshtml | 2 +- .../StationOverviewInfo.cshtml | 162 ++++++++---- .../StationOverview/_OperationRecord.cshtml | 32 ++- 7 files changed, 344 insertions(+), 252 deletions(-) diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs index 04caffd..88ca4a2 100644 --- a/SolarPower/Controllers/OperationController.cs +++ b/SolarPower/Controllers/OperationController.cs @@ -659,82 +659,83 @@ namespace SolarPower.Controllers } - if (post.WorkPersonIds != null) + if(post.Emailcheck == 1) { - var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); - List noticeSchedules = new List(); - foreach (var person in post.WorkPersonIds) + if (post.WorkPersonIds != null) { - var fixtype = post.WorkType switch + var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); + List noticeSchedules = new List(); + foreach (var person in post.WorkPersonIds) + { + var fixtype = post.WorkType switch + { + 0 => "清洗", + 1 => "巡檢", + 2 => "維修", + _ => "" + }; + var user = await userRepository.GetOneAsync(person); + NoticeSchedule schedule = new NoticeSchedule() + { + EmailType = 3, + Type = 1, + UserId = person, + RecipientName = user.Name, + RecipientEmail = user.Email, + Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, + Content = "維修項目" + post.FixDo + "
注意事項 :" + post.Notice, + }; + noticeSchedules.Add(schedule); + } + properties = new List() + { + "UserId", + "EmailType", + "RecipientEmail", + "Subject", + "Content", + "RecipientName", + "Type", + "ExceptionId" + }; + await noticeScheduleRepository.AddAnyThing>(noticeSchedules, properties, "notice_schedule"); + } + + if (post.FixFirm != 0) + { + var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); + var fixtype = operationRecord.WorkType switch { 0 => "清洗", 1 => "巡檢", 2 => "維修", _ => "" }; - var user = await userRepository.GetOneAsync(person); + var powerstation = await powerStationRepository.GetOneAsync(post.PowerStationId); + var firm = await operationRepository.GetOneWithCustomDBNameAndTableAsync(post.FixFirm, powerstations.SiteDB, "operation_firm"); NoticeSchedule schedule = new NoticeSchedule() { EmailType = 3, Type = 1, - UserId = person, - RecipientName = user.Name, - RecipientEmail = user.Email, + RecipientName = firm.Name, + RecipientEmail = firm.Email, Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, Content = "維修項目" + post.FixDo + "
注意事項 :" + post.Notice, }; - noticeSchedules.Add(schedule); + properties = new List() + { + "UserId", + "EmailType", + "RecipientEmail", + "Subject", + "Content", + "RecipientName", + "Type", + "ExceptionId" + }; + await noticeScheduleRepository.AddAnyThing(schedule, properties, "notice_schedule"); } - properties = new List() - { - "UserId", - "EmailType", - "RecipientEmail", - "Subject", - "Content", - "RecipientName", - "Type", - "ExceptionId" - }; - await noticeScheduleRepository.AddAnyThing>(noticeSchedules, properties, "notice_schedule"); } - - if (post.FixFirm != 0) - { - var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); - var fixtype = operationRecord.WorkType switch - { - 0 => "清洗", - 1 => "巡檢", - 2 => "維修", - _ => "" - }; - var powerstation = await powerStationRepository.GetOneAsync(post.PowerStationId); - var firm = await operationRepository.GetOneWithCustomDBNameAndTableAsync(post.FixFirm, powerstations.SiteDB, "operation_firm"); - NoticeSchedule schedule = new NoticeSchedule() - { - EmailType = 3, - Type = 1, - RecipientName = firm.Name, - RecipientEmail = firm.Email, - Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, - Content = "維修項目" + post.FixDo + "
注意事項 :" + post.Notice, - }; - properties = new List() - { - "UserId", - "EmailType", - "RecipientEmail", - "Subject", - "Content", - "RecipientName", - "Type", - "ExceptionId" - }; - await noticeScheduleRepository.AddAnyThing(schedule, properties, "notice_schedule"); - } - - //using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Suppress)) //{ @@ -880,83 +881,89 @@ namespace SolarPower.Controllers } #endregion - - if (post.WorkPersonIds != null) + if (post.Emailcheck == 1) { - var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); - List noticeSchedules = new List(); - foreach (var person in post.WorkPersonIds) + if (post.WorkPersonIds != null) { - var fixtype = operationRecord.WorkType switch + var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); + List noticeSchedules = new List(); + foreach (var person in post.WorkPersonIds) + { + var fixtype = operationRecord.WorkType switch + { + 0 => "清洗", + 1 => "巡檢", + 2 => "維修", + _ => "" + }; + var user = await userRepository.GetOneAsync(person); + NoticeSchedule schedule = new NoticeSchedule() + { + EmailType = 3, + Type = 1, + UserId = person, + RecipientName = user.Name, + RecipientEmail = user.Email, + Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, + Content = "維修項目:" + post.FixDo + "
注意事項 :" + post.Notice, + }; + noticeSchedules.Add(schedule); + } + properties = new List() + { + "UserId", + "EmailType", + "RecipientEmail", + "Subject", + "Content", + "RecipientName", + "Type", + "ExceptionId" + }; + await noticeScheduleRepository.AddAnyThing>(noticeSchedules, properties, "notice_schedule"); + } + if (post.FixFirm != 0) + { + var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); + var fixtype = post.WorkType switch { 0 => "清洗", 1 => "巡檢", 2 => "維修", _ => "" }; - var user = await userRepository.GetOneAsync(person); + var powerstation = await powerStationRepository.GetOneAsync(post.PowerStationId); + var firm = await operationRepository.GetOneWithCustomDBNameAndTableAsync(post.FixFirm, powerstations.SiteDB, "operation_firm"); NoticeSchedule schedule = new NoticeSchedule() { EmailType = 3, Type = 1, - UserId = person, - RecipientName = user.Name, - RecipientEmail = user.Email, + RecipientName = firm.Name, + RecipientEmail = firm.Email, Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, Content = "維修項目:" + post.FixDo + "
注意事項 :" + post.Notice, }; - noticeSchedules.Add(schedule); + properties = new List() + { + "UserId", + "EmailType", + "RecipientEmail", + "Subject", + "Content", + "RecipientName", + "Type", + "ExceptionId" + }; + await noticeScheduleRepository.AddAnyThing(schedule, properties, "notice_schedule"); + + + } - properties = new List() - { - "UserId", - "EmailType", - "RecipientEmail", - "Subject", - "Content", - "RecipientName", - "Type", - "ExceptionId" - }; - await noticeScheduleRepository.AddAnyThing>(noticeSchedules, properties, "notice_schedule"); } - if (post.FixFirm != 0) - { - var powerstations = await powerStationRepository.GetOneAsync(post.PowerStationId); - var fixtype = post.WorkType switch - { - 0 => "清洗", - 1 => "巡檢", - 2 => "維修", - _ => "" - }; - var powerstation = await powerStationRepository.GetOneAsync(post.PowerStationId); - var firm = await operationRepository.GetOneWithCustomDBNameAndTableAsync(post.FixFirm, powerstations.SiteDB, "operation_firm"); - NoticeSchedule schedule = new NoticeSchedule() - { - EmailType = 3, - Type = 1, - RecipientName = firm.Name, - RecipientEmail = firm.Email, - Subject = powerstations.Name + "-" + fixtype + "-" + post.WorkTime, - Content = "維修項目:" + post.FixDo + "
注意事項 :" + post.Notice, - }; - properties = new List() - { - "UserId", - "EmailType", - "RecipientEmail", - "Subject", - "Content", - "RecipientName", - "Type", - "ExceptionId" - }; - await noticeScheduleRepository.AddAnyThing(schedule, properties, "notice_schedule"); - } + #endregion diff --git a/SolarPower/Models/Operation.cs b/SolarPower/Models/Operation.cs index f10b710..a251c26 100644 --- a/SolarPower/Models/Operation.cs +++ b/SolarPower/Models/Operation.cs @@ -293,6 +293,7 @@ namespace SolarPower.Models public string Notice { get; set; } public string Description { get; set; } public IFormFile[] RecordFiles { get; set; } + public byte Emailcheck { get; set; } } public class UpdateOperationRecord : Updated diff --git a/SolarPower/Views/MapOverview/Index.cshtml b/SolarPower/Views/MapOverview/Index.cshtml index a8f3d46..d592df2 100644 --- a/SolarPower/Views/MapOverview/Index.cshtml +++ b/SolarPower/Views/MapOverview/Index.cshtml @@ -20,7 +20,7 @@

-

即時總發電量

+

今日總發電量

0.00

@@ -36,7 +36,7 @@
-

即時日照度

+

今日日照度

0.00

@@ -279,7 +279,7 @@ '
' + '
' + '
今日發電量(kW h)：' + item.today_kWh.toFixed(2) + '
'+ - '
即時日照度(k W/m2)：' + item.today_irradiance + '
'+ + '
今日日照度(k W/m2)：' + item.today_irradiance + '
'+ '
有效日照時數(kwh/kwp)：' + item.today_kwhkwp.toFixed(2) + '
' + '
裝置容量(kWp)：' + item.generatingCapacity.toFixed(3) + '
' + '
掛錶日期：' + item.electricityMeterAt + '
' + diff --git a/SolarPower/Views/Operation/OperationRecord.cshtml b/SolarPower/Views/Operation/OperationRecord.cshtml index a19c193..dac2a90 100644 --- a/SolarPower/Views/Operation/OperationRecord.cshtml +++ b/SolarPower/Views/Operation/OperationRecord.cshtml @@ -211,8 +211,13 @@
+
+
+ + +
+
-
@@ -707,7 +712,7 @@ $("#work_time_modal-error").hide(); - + $("#EmailcheckBox").prop("checked", false); $("#record-form-modal").modal(); } //#endregion @@ -1038,7 +1043,7 @@ - + $("#EmailcheckBox").prop("checked", false); $("#record-form-modal").modal(); }, 'json'); }); @@ -1057,94 +1062,87 @@ //#region 儲存表單資料 function SaveRecord() { if ($('#work_person_select_modal').val().length > 0 && $("#work_time_modal").val() != "") { - Swal.fire( - { - title: "儲存", - text: "你確定是否儲存此筆資料?\r\n 儲存成功後將會發送Email至負責人員及廠商", - type: "warning", - icon: 'warning', - showCancelButton: true, - confirmButtonText: "是", - cancelButtonText: "否" - }).then(function (result) { - if (result.value) { - if ($("#record-form").valid()) { - var url = "/Operation/SaveOperationRecord"; + if ($("#record-form").valid()) + { + var url = "/Operation/SaveOperationRecord"; - var formData = new FormData(); + var formData = new FormData(); - @*var work_person_ids = $.map($("#work_person_select_modal").val(), function (item) { - return parseInt(item); - }) *@ + @*var work_person_ids = $.map($("#work_person_select_modal").val(), function (item) { + return parseInt(item); + }) *@ - formData.append("Id", selected_id); - formData.append("PowerStationId", $("#power_station_select_modal").val()); - formData.append("WorkType", selected_work_type); - formData.append("ErrorCode", $("#error_code_modal").val()); - formData.append("FixDo", $("#fix_do_modal").val()); - formData.append("FixFirm", $("#fix_firm_select_modal").val()); - formData.append("Status", $("input[name=status_modal]:checked").val()); - $("#work_person_select_modal").val().forEach(function (item) { - formData.append("WorkPersonIds", parseInt(item)); - }); - formData.append("WorkTime", $("#work_time_modal").val()); - formData.append("Notice", $("#notice_textarea_modal").val()); - formData.append("Description", $("#description_textarea_modal").val()); + formData.append("Id", selected_id); + formData.append("PowerStationId", $("#power_station_select_modal").val()); + formData.append("WorkType", selected_work_type); + formData.append("ErrorCode", $("#error_code_modal").val()); + formData.append("FixDo", $("#fix_do_modal").val()); + formData.append("FixFirm", $("#fix_firm_select_modal").val()); + formData.append("Status", $("input[name=status_modal]:checked").val()); + $("#work_person_select_modal").val().forEach(function (item) { + formData.append("WorkPersonIds", parseInt(item)); + }); + formData.append("WorkTime", $("#work_time_modal").val()); + formData.append("Notice", $("#notice_textarea_modal").val()); + formData.append("Description", $("#description_textarea_modal").val()); + if (document.querySelector('[id=EmailcheckBox]:checked')) { + formData.append("Emailcheck", 1); + } + else { + formData.append("Emailcheck", 0); + } + $.ajax({ + type: "POST", + url: url, + data: formData, + cache: false, + contentType: false, + processData: false, + success: function (rel) { + if (rel.code != "0000") { + toast_error(rel.msg); + return; + } - $.ajax({ - type: "POST", - url: url, - data: formData, - cache: false, - contentType: false, - processData: false, - success: function (rel) { - if (rel.code != "0000") { - toast_error(rel.msg); - return; - } + var myDropzone = Dropzone.forElement("#record-file-form"); - var myDropzone = Dropzone.forElement("#record-file-form"); + if (myDropzone.files.length > 0) { - if (myDropzone.files.length > 0) { + selected_id = rel.data; - selected_id = rel.data; + myDropzone.processQueue(); - myDropzone.processQueue(); - - myDropzone.on("successmultiple", function (file, rel) { - if (rel.code != "0000") { - toast_error(rel.msg); - return; - } - - toast_ok(rel.msg); - $('#record-form-modal').modal('hide'); - recordFileDropzone.removeAllFiles(); - if (status == 2) { - operationRecordTable.column(10).visible(true); - } - else { - operationRecordTable.column(10).visible(false); - } - operationRecordTable.ajax.reload(); - }); - } else { - $('#record-form-modal').modal('hide'); - myDropzone.removeAllFiles(); - if (status == 2) { - operationRecordTable.column(10).visible(true); - } - else { - operationRecordTable.column(10).visible(false); - } - operationRecordTable.ajax.reload(); - } + myDropzone.on("successmultiple", function (file, rel) { + if (rel.code != "0000") { + toast_error(rel.msg); + return; } + + toast_ok(rel.msg); + $('#record-form-modal').modal('hide'); + recordFileDropzone.removeAllFiles(); + if (status == 2) { + operationRecordTable.column(10).visible(true); + } + else { + operationRecordTable.column(10).visible(false); + } + operationRecordTable.ajax.reload(); }); + } else { + $('#record-form-modal').modal('hide'); + myDropzone.removeAllFiles(); + if (status == 2) { + operationRecordTable.column(10).visible(true); + } + else { + operationRecordTable.column(10).visible(false); + } + operationRecordTable.ajax.reload(); } } }); + } } else { diff --git a/SolarPower/Views/StationOverview/Index.cshtml b/SolarPower/Views/StationOverview/Index.cshtml index ede80d0..6f96a5e 100644 --- a/SolarPower/Views/StationOverview/Index.cshtml +++ b/SolarPower/Views/StationOverview/Index.cshtml @@ -94,7 +94,7 @@
-

即時日照度

+

今日日照度

0.00

diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml index feba4a5..a8000df 100644 --- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml +++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml @@ -951,6 +951,32 @@ $("#work_person_select_modal").val(record.workPersonId); } } + + $("#work_person_select_modal").select2({ dropdownParent: $('#record-form-modal') }); + }); + + //查詢該電站的廠商 + var url_power_station_firm = "/PowerStation/GetFirmSelectOptionList"; + + $.post(url_power_station_firm, send_data, function (rel) { + if (rel.code != "0000") { + toast_error(rel.msg); + return; + } + + $("#fix_firm_select_modal").empty(); + if (rel.data.length > 0) { + + $.each(rel.data, function (index, val) { + $("#fix_firm_select_modal").append($("