From 69ebee1e4db80185fc16a075c7b5bd59c567eb6c Mon Sep 17 00:00:00 2001 From: "wanling040@gmail.com" Date: Mon, 25 Jul 2022 01:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B6=E7=AB=AF=E8=A6=81=E6=B1=82-?= =?UTF-8?q?=E5=85=A8=E7=B3=BB=E7=B5=B1=20=E5=87=BA=E7=8F=BE=E8=BC=89?= =?UTF-8?q?=E5=85=A5=E9=A1=AF=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AnalysisInverter/Index.cshtml | 30 ++- .../Views/AnalysisStationCombine/Index.cshtml | 35 +++- .../Views/AnalysisStationInfo/Index.cshtml | 37 +++- SolarPower/Views/Company/Index.cshtml | 50 ++++- .../Views/ElectricitySoldRecord/Index.cshtml | 39 +++- SolarPower/Views/ExceptionRecord/Index.cshtml | 44 ++++- SolarPower/Views/Login/Index.cshtml | 75 +++++--- SolarPower/Views/MapOverview/Index.cshtml | 24 +++ SolarPower/Views/NoticeSchedule/Index.cshtml | 30 ++- SolarPower/Views/Operation/Index.cshtml | 45 ++++- .../Views/Operation/OperationRecord.cshtml | 57 +++++- SolarPower/Views/PowerGeneration/Index.cshtml | 31 ++- SolarPower/Views/PowerStation/Index.cshtml | 43 ++++- .../PowerStation/PowerStationEdit.cshtml | 177 +++++++++++++++--- SolarPower/Views/SensorType/Index.cshtml | 60 +++++- SolarPower/Views/StationOverview/Index.cshtml | 32 +++- .../StationOverviewInfo.cshtml | 154 ++++++++++++--- SolarPower/Views/StationReport/Index.cshtml | 45 ++++- SolarPower/Views/User/Index.cshtml | 110 +++++++++-- SolarPower/wwwroot/css/loading.css | 86 +++++++++ 20 files changed, 1071 insertions(+), 133 deletions(-) create mode 100644 SolarPower/wwwroot/css/loading.css diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml index 5f96a2f..01c7669 100644 --- a/SolarPower/Views/AnalysisInverter/Index.cshtml +++ b/SolarPower/Views/AnalysisInverter/Index.cshtml @@ -4,6 +4,18 @@ ViewData["Title"] = "逆變器交叉分析"; } + +
+ + + + + + + + +
+
@@ -201,6 +213,16 @@ { key: "RA5", title: "RA5 (%)", default: false } ] + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { $('#collapse').trigger("click"); @@ -425,6 +447,7 @@ }); function GetPowerStationCollapse(filter) { + showLoading(); var url = "/AnalysisInverter/GetInverterCollapse" var send_data = { @@ -433,6 +456,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -505,7 +529,7 @@ }); $("#js_list_accordion .collapse").collapse('show'); - + hideLoading(); }, 'json'); } @@ -552,7 +576,7 @@ } function GetAnalysisInverter() { - + showLoading(); var date; if (searchType != 1) { date = $('#DateGet').val(); @@ -577,6 +601,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); $("#btn-analysis-inverter").html('查詢').attr("disabled", false); return; @@ -592,6 +617,7 @@ ReloadHighCharts(); $("#btn-analysis-inverter").html('查詢').attr("disabled", false); + hideLoading(); }, 'json'); } diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml index eaca5c6..72009f1 100644 --- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml +++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml @@ -6,7 +6,17 @@ @using SolarPower.Models.Role @model RoleLayerEnum - + +
+ + + + + + + + +
@@ -223,6 +233,17 @@ var searchType = 0;//搜尋條件(日,日區間,月,年) var datepicker; var timerange;//選取時間 + + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { $('#collapse').trigger("click"); @@ -418,10 +439,11 @@ timerange: timerange, seacrhType: searchType } - + showLoading(); var Nurl = "/AnalysisStationCombine/GetStationsCard"; $.post(Nurl, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -440,6 +462,7 @@ $('#today_carbon').html(toThousands(rel.data.now_Carbon.toFixed(2))); $('#today_irradiance').html(toThousands(rel.data.now_irradiance.toFixed(2))); chart(); + hideLoading(); }) } @@ -447,6 +470,7 @@ //#region 圖片輪播 function photoshow() { + showLoading(); var url_image = "/PowerStation/GetAllPowerStationsALLImage"; var send_data = { powerStationId: powerids @@ -454,6 +478,7 @@ $.post(url_image, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -467,7 +492,7 @@ carouselExampleIndicators.find(".carousel-indicators > li").first().addClass("active"); carouselExampleIndicators.find(".carousel-inner > .carousel-item").first().addClass("active"); - + hideLoading(); }, 'json'); } function CreatePowerStationImagecarousel(dom, value, index) { @@ -624,6 +649,7 @@ function GetPowerStationCollapse(filter) { + showLoading(); @*var url = "/StationReport/GetPowerStationNameList"*@ var url = "/AnalysisStationCombine/GetPowerStationCollapse" @@ -633,6 +659,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -692,7 +719,7 @@ } }); $("#js_list_accordion .collapse").collapse('show'); - + hideLoading(); }, 'json'); } //#endregion diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml index b0eaa0d..6a75a14 100644 --- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml +++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml @@ -4,6 +4,18 @@ ViewData["Title"] = "電站交叉分析"; } + +
+ + + + + + + + +
+
@@ -157,6 +169,16 @@ //Dictionary sensor_type_detail_dictionary { get; set; }; var sensor_type_detail_dictionary; + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { $('#collapse').trigger("click"); @@ -457,6 +479,7 @@ }); function GetPowerStationCollapse(filter) { + showLoading(); var url = "/AnalysisStationInfo/GetDeviceCollapse" var send_data = { @@ -465,6 +488,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -536,7 +560,7 @@ }*@ switch (device.sensorTypeDetailId) { - + } @@ -574,7 +598,7 @@ }); $("#js_list_accordion .collapse").collapse('show'); - + hideLoading(); }, 'json'); } @@ -582,7 +606,7 @@ //在剛開始就在 sensor_type_detail 資料表中 取得ItemName //#region function GetItemInfo(itemId) { - + showLoading(); //sensor_type_detail_dictionary = {''} //my_dict = { 'first_name': 'eddie', 'last_name': 'kao', 'age': 30 } @@ -594,16 +618,19 @@ $.post(url, send_data, function (rel) { if (rel.code == "9999") { + hideLoading(); toast_error(rel.msg); return; } else if (rel.code == "9998") { + hideLoading(); toast_error(rel.msg); return; } var nowCompare_col = [{ key: rel.data.itemEName, title: rel.data.itemName, default: true }]; PushSpecifyCurrentCompareCol(nowCompare_col); ChangeCompareSelectOption(); + hideLoading(); }, 'json'); } //#endregion @@ -666,6 +693,7 @@ } function GetAnalysisStationInfo() { + showLoading(); var date; if (searchType != 1) { date = $('#DateGet').val(); @@ -690,6 +718,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -706,7 +735,7 @@ ReloadHighCharts() $("#btn-analysis-stationinfo").html('查詢').attr("disabled", false); - + hideLoading(); }, 'json'); } diff --git a/SolarPower/Views/Company/Index.cshtml b/SolarPower/Views/Company/Index.cshtml index 3aee15d..57bd79b 100644 --- a/SolarPower/Views/Company/Index.cshtml +++ b/SolarPower/Views/Company/Index.cshtml @@ -18,6 +18,19 @@
+ + +
+ + + + + + + + +
+
@@ -190,11 +203,23 @@ var companyTable; var companyAuthTable; var selected_id = 0; + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { //#region 預先載入公司下拉式選單select_option + showLoading(); var url_company_select_option = "/Company/GetCompanySelectOptionList"; $.get(url_company_select_option, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -208,6 +233,7 @@ //預設查詢第一個 $("#company_select").val($("#company_select option:first").val()).trigger('change'); + hideLoading(); }); //#endregion @@ -250,9 +276,9 @@ 'render': function (data, type, full, meta) { return ''; } - },{ - 'targets': 8, - 'visible': false + }, { + 'targets': 8, + 'visible': false }], "language": { "emptyTable": "查無資料", @@ -439,7 +465,7 @@ $("#company-modal .modal-title").html("公司基本資料 - 編輯"); selected_id = $(this).parents('tr').attr('data-id'); - + showLoading(); //取得單一公司基本資料 var url = "/Company/GetOneCompany/"; @@ -449,6 +475,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -460,6 +487,7 @@ $("#company_registerUpperLimit_modal").val(rel.data.registerUpperLimit); $("#company-modal").modal(); + hideLoading(); }, 'json'); }); @@ -483,6 +511,7 @@ function SaveComapny() { if ($("#company-form").valid()) { + showLoading(); var url = "/Company/SaveCompany"; var formData = new FormData(); @@ -507,10 +536,11 @@ processData: false, success: function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } - + hideLoading(); toast_ok(rel.msg); $('#company-modal').modal('hide'); @@ -536,6 +566,7 @@ cancelButtonText: "否" }).then(function (result) { if (result.value) { + showLoading(); //取得單一系統管理員 var url = "/Company/DeleteOneCompany/"; var send_data = { @@ -543,14 +574,16 @@ } $.post(url, send_data, function (rel) { if (rel.code == "9999") { + hideLoading(); toast_error(rel.msg); return; } else if (rel.code == "9998") { + hideLoading(); toast_error(rel.msg); return; } - + hideLoading(); toast_ok(rel.msg); companyTable.ajax.reload(); }, 'json'); @@ -581,6 +614,7 @@ return $(this).val(); }).get(); + showLoading(); var url = "/Company/SaveCompanyAuth"; var send_data = { @@ -590,6 +624,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -598,8 +633,9 @@ $("#company-auth-modal").modal('hide'); companyAuthTable.ajax.reload(); + hideLoading(); }, 'json'); } - //#endregion + //#endregion } \ No newline at end of file diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml index eb2c99e..99c00b0 100644 --- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml +++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml @@ -6,6 +6,18 @@ @using SolarPower.Models.Role @model RoleLayerEnum + +
+ + + + + + + + +
+
@@ -272,6 +284,17 @@ $(this).trigger('change'); }); //#endregion + + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { //#region 預設初始值 var a = $('#collapse').trigger("click"); @@ -349,6 +372,7 @@ function GetPowerStationCollapse(filter) { + showLoading(); var url = "/ElectricitySoldRecord/GetPowerStationCollapse" var send_data = { @@ -357,6 +381,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.data.msg); return; } @@ -437,7 +462,7 @@ } }); $("#js_list_accordion .collapse").collapse('show'); - + hideLoading(); }, 'json'); } @@ -497,6 +522,7 @@ function SaveSoldMoney() { if ($("#Record-form").valid()) { + showLoading(); var url = "/ElectricitySoldRecord/SaveSoldMoney"; var send_data = { Id: selected_id, @@ -510,6 +536,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -517,6 +544,7 @@ toast_ok(rel.msg); $('#Record-modal').modal('hide'); RecordTable.ajax.reload(); + hideLoading(); return; } @@ -525,6 +553,7 @@ } function DataTable() { + showLoading(); RecordTable = $("#RecordTable").DataTable({ "paging": true, "lengthChange": false, @@ -589,6 +618,7 @@ d.searchType = searchType }, "dataSrc": function (rel) { + hideLoading(); if (rel.data.code == "9999") { toast_error(rel.data.msg); return; @@ -604,6 +634,7 @@ } }, "error": function (xhr, error, thrown) { + hideLoading(); console.log(xhr); } }); @@ -630,12 +661,14 @@ selected_id = $(this).parents('tr').attr('data-id'); var powerstationName = $(this).parents('tr').attr('powerstation-Name'); //取得單一售電紀錄基本資料 + showLoading(); var url = "/ElectricitySoldRecord/GetOnePowerStation/"; var send_data = { Id: selected_id } $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -648,6 +681,7 @@ $("#Money_modal").val(rel.data.money); $("#Month_modal").val(rel.data.month); $("#Record-modal").modal(); + hideLoading(); }, 'json'); }); @@ -671,6 +705,7 @@ cancelButtonText: "否" }).then(function (result) { if (result.value) { + showLoading(); var url = "/ElectricitySoldRecord/DeleteRecord/"; var send_data = { @@ -679,11 +714,13 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } toast_ok(rel.msg); RecordTable.ajax.reload(); + hideLoading(); }, 'json'); } }); diff --git a/SolarPower/Views/ExceptionRecord/Index.cshtml b/SolarPower/Views/ExceptionRecord/Index.cshtml index 84d553a..921b772 100644 --- a/SolarPower/Views/ExceptionRecord/Index.cshtml +++ b/SolarPower/Views/ExceptionRecord/Index.cshtml @@ -12,6 +12,18 @@
    • + +
    + + + + + + + + +
    +
    @@ -232,6 +244,16 @@ var AllpoweridsType = true; var AllidsType = true; + function showLoading() { + var i = document.getElementById("loading"); + i.style.display = "block"; + } + + function hideLoading() { + var i = document.getElementById("loading"); + i.style.display = "none"; + } + $(function () { //#region Date-Picker @@ -264,10 +286,12 @@ //#endregion + showLoading(); //#region 預設載入該使用者可以選擇的電站 var city_url = "/Operation/GetMyCities"; $.post(city_url, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -283,6 +307,7 @@ } getPowerStationCheckBox(); + hideLoading(); }, 'json'); @@ -325,6 +350,7 @@ //#endregion //#region DataTable + showLoading(); ExceptionTable = $("#Exception_Table").DataTable({ "pageLength": 20, "paging": true, @@ -389,6 +415,7 @@ d.range = $('#date-range').val() }, "dataSrc": function (rel) { + hideLoading(); if (rel.data.code == "9999") { toast_error(rel.data.msg); return; @@ -402,6 +429,7 @@ } }, "error": function (xhr, error, thrown) { + hideLoading(); console.log(xhr); } }); @@ -598,10 +626,11 @@ var send_data = { cityIds: ids } - + showLoading(); var Nurl = "/ExceptionRecord/GetPowerStationByFilter"; $.post(Nurl, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -626,6 +655,7 @@ }); ExceptionTable.ajax.reload(); + hideLoading(); }) } @@ -644,12 +674,14 @@ $("#error_code_modal_exc").attr("disabled", true); psids = selected_id = $(this).parents('tr').attr('data-psid'); //#region 維修單運維人員(異常紀錄) + showLoading(); var url_power_station_operation_personnel = "/PowerStation/GetOperationPersonnelSelectOptionList"; send_data = { PowerStationId: parseInt(psids) } $.post(url_power_station_operation_personnel, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -666,6 +698,7 @@ } } $("#exception-form-modal").modal(); + hideLoading(); }); //#endregion @@ -681,6 +714,7 @@ powerStationData_name = $(this).parents('tr').attr('data-name'); errortoID = $(this).parents('tr').attr('data-error'); //取得單一記錄表單 + showLoading(); var url = "/Operation/GetOneOperationRecord/"; var send_data = { @@ -689,6 +723,7 @@ $.post(url, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -731,6 +766,7 @@ } $.post(url_power_station_operation_personnel, send_data, function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } @@ -749,7 +785,7 @@ $("#exception-form-modal").modal(); }); //#endregion - + hideLoading(); }, 'json'); }); //#endregion @@ -758,6 +794,7 @@ function SaveException() { if ($("#record-form-exc").valid()) { + showLoading(); var url = "/Operation/SaveOperationRecord"; var formData = new FormData(); @@ -782,10 +819,11 @@ processData: false, success: function (rel) { if (rel.code != "0000") { + hideLoading(); toast_error(rel.msg); return; } - + hideLoading(); var myDropzone = Dropzone.forElement("#record-file-form_exc"); if (myDropzone.files.length > 0) { diff --git a/SolarPower/Views/Login/Index.cshtml b/SolarPower/Views/Login/Index.cshtml index 5441554..2ea9727 100644 --- a/SolarPower/Views/Login/Index.cshtml +++ b/SolarPower/Views/Login/Index.cshtml @@ -25,8 +25,21 @@ + + +
    + + + + + + + + +
    +