hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 交叉分析 上下箭頭 留間隙

Browse Source 
2. 電站總覽 電站名稱 留間隙
3. 修改密碼
This commit is contained in:
Kai 2021-08-20 14:37:52 +08:00
parent 8f76245a13
commit 6207c31826
12 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SolarPower/Quartz/Jobs/CalcPowerStationJob.cs
View File

@ -216,7 +216,7 @@ namespace SolarPower.Quartz.Jobs
}
#endregion
#region step2-2. 取得該電站的當前這小時的日照度歷史資料
#region step2-2. 取得該電站的當前這小時的設備歷史資料
//1. 找出該電站所有日照計設備(包含共享
logger.LogInformation("【CalcPowerStationJob】【開始取得電站[{0}]在{1}的日照計設備資訊】", powerStation.Code, dateTime);
var deviceInfos = await powerStationRepository.GetListPyrheliometerByPowerStationId(powerStation.Id, powerStation.SiteDB);

2
SolarPower/Repository/Implement/PowerStationRepository.cs
View File

@ -4050,7 +4050,7 @@ namespace SolarPower.Repository.Implement
{
try
{
var sql = $"SELECT * FROM {tableName} ps";
var sql = $"SELECT ps.* FROM {tableName} ps";
if (myUser.Role.Layer == 2)
{

6
SolarPower/Views/AnalysisInverter/Index.cshtml
View File

@ -474,9 +474,9 @@
'<div class="p-0">' +
'<ul class="list-group list-group-flush">';
$.each(inverterCollapse[key][powerStationkey], function (index, inverter) {
str += '<li class="list-group-item pr-0 d-flex justify-content-between">' +
'<a href="#"><i class="fal fa-server"></i>&nbsp;' + inverter.inverterName + '</a>' +
'<div class=""><input type="checkbox" class="" name="selectedInverterId[]" data-power-station-id="' + inverter.powerStationId + '" value="' + inverter.inverterId + '">' + '</div>'
str += '<li class="list-group-item pr-0 d-flex justify-content-start">' +
'<div class=""><input type="checkbox" class="mr-2" name="selectedInverterId[]" data-power-station-id="' + inverter.powerStationId + '" value="' + inverter.inverterId + '">' + '</div>' +
'<a href="javascript:void(0)"><i class="fal fa-server"></i>&nbsp;' + inverter.inverterName + '</a>' +
'</li>';
});
str += '</ul>';

6
SolarPower/Views/AnalysisStationCombine/Index.cshtml
View File

@ -664,11 +664,11 @@
'<ul class="list-group list-group-flush">';
$.each(powerStationCollapse[key], function (index, powerStation) {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + powerStation.powerStationName + '</h4>' +
'<div class="d-flex justify-content-start">' +
'<div class="">' +
'<input type="checkbox" class="" name="selectedPowerStationLayer2[]" value="' + powerStation.powerStationId + '" valueName ="' + powerStation.powerStationName + '">' +
'<input type="checkbox" class="mr-2" name="selectedPowerStationLayer2[]" value="' + powerStation.powerStationId + '" valueName ="' + powerStation.powerStationName + '">' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + powerStation.powerStationName + '</h4>' +
'</div>' +
'</li>';
});

4
SolarPower/Views/AnalysisStationInfo/Index.cshtml
View File

@ -481,8 +481,8 @@
'<input type="checkbox" class="" name="selectedDeviceLayer2[]" >' +
'</div>' +
'<a href="javascript:;" class="" data-toggle="collapse" data-target="#cp-' + index1 + '-' + index2 + ' > .card-body" aria-expanded="true">' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl"></i></h5></span>' +
'<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
'<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
'</a>' +
'</div>' +
'<div class="card-body p-0">' +

12
SolarPower/Views/ElectricitySoldRecord/Index.cshtml
View File

@ -394,21 +394,21 @@
});
if (on == true) {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}
else {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}

12
SolarPower/Views/NoticeSchedule/Index.cshtml
View File

@ -498,21 +498,21 @@
});
if (on == true) {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}
else {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}

12
SolarPower/Views/PowerGeneration/Index.cshtml
View File

@ -406,21 +406,21 @@
});
if (on == true) {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}
else {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}

6
SolarPower/Views/StationOverview/Index.cshtml
View File

@ -381,9 +381,9 @@
$('#templateCard').find('.col-xl-3').clone().attr('id', 'card_' + val.id).appendTo($('#areaCard'));
var statusicon;
switch (val.healthStatus) {
case 1: statusicon = "<i class='btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check'></i>"; break;
case 2: statusicon = "<i class='btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation'></i>"; break;
case 3: statusicon = "<i class='btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule'></i>"; break;
case 1: statusicon = "<i class='btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check mr-2'></i>"; break;
case 2: statusicon = "<i class='btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation mr-2'></i>"; break;
case 3: statusicon = "<i class='btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule mr-2'></i>"; break;
default:
statusicon = 'NULL'; break;
}

12
SolarPower/Views/StationReport/Index.cshtml
View File

@ -610,21 +610,21 @@
});
if (on == true) {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}
else {
str += '<li class="list-group-item">' +
'<div class="d-flex justify-content-between">' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'<div class="">' +
'<div class="d-flex justify-content-start">' +
'<div class="mr-2">' +
'<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
'</div>' +
'<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
'</div>' +
'</li>';
}

4
SolarPower/appsettings.Development.json
View File

@ -23,10 +23,10 @@
//},
"BackgroundServiceCron": {
"CalcPowerStationJob": "0 5 * * * ?",
"CalcAvgPowerStationJob": "0/10 * * * * ?",
"CalcAvgPowerStationJob": "0 0 2 * * ?",
"OperationScheduleJob": "0 0 2 * * ?",
"CalcInverter15minJob": "0 2/15 * * * ?",
"SendEmailJob": "0/10 * * * * ?",
"SendEmailJob": "0 0/5 * * * ?",
"ExceptionSchedule": "0 0/5 * * * ?"
},
"SMTPConfig": {

6
SolarPower/wwwroot/js/site.js
View File

@ -77,7 +77,7 @@ function SavePersonalInfo() {
//#region 變更密碼表單驗證
$(function () {
jQuery.validator.addMethod("pwcheck", function (value, element) {
var xxx = /^[A-Za-z0-9\d=!@#$%^&+=]*$/.test(value);
var xxx = /^[A-Za-z0-9\d!@#$%^&*()_=|]*$/.test(value);
return xxx;// consists of only these
//&& /[a-z]/.test(value) // has a lowercase letter
//&& /\d/.test(value) // has a digit
@ -103,10 +103,10 @@ $(function () {
},
messages: {
new_password_modal: {
pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號【!@#$%^&+=】"
pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號"
},
again_password_modal: {
pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號【!@#$%^&+=】",
pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號",
equalTo: "兩次密碼輸入不同"
}
}