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

Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

Browse Source
This commit is contained in:
b110212000 2021-09-27 09:18:31 +08:00
commit bcb2669957
3 changed files with 187 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SolarPower/Quartz/Jobs/CalcAvgPowerStationJob.cs
View File

@ -8,6 +8,7 @@ using SolarPower.Models.PowerStation;
using SolarPower.Repository.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
@ -870,9 +871,17 @@ namespace SolarPower.Quartz.Jobs
#region 寄送日月報
var users = userRepository.GetAllAsync();
var ttt = new List<string>() {
"s506488@gmail.com",
"cesarliuc@gmail.com"
};
foreach (var user in users.Result)
{
try
{
logger.LogInformation("【CalcAvgPowerStationJob】【開始產生使用者[{0}({1})]的日月報】", user.Account, user.Name);
List<OperationPersonnel> powerstations = new List<OperationPersonnel>();
powerstations = await noticeScheduleRepository.GetPowerStationOperationPersonnel(user.Id);
if (powerstations.Count == 0)
@ -1032,6 +1041,21 @@ namespace SolarPower.Quartz.Jobs
}
}
logger.LogInformation("【CalcAvgPowerStationJob】【產生完成使用者[{0}({1})]的日月報】", user.Account, user.Name);
}
catch (Exception exception)
{
logger.LogError("【CalcAvgPowerStationJob】【產生失敗使用者[{0}({1})]的日月報】", user.Account, user.Name);
logger.LogError("【CalcAvgPowerStationJob】[Exception] - {0}", exception.Message);
if (exception.InnerException != null)
{
logger.LogError("【CalcAvgPowerStationJob】[InnerException] - {0}", exception.InnerException.Message);
}
var line = new StackTrace(exception, true).GetFrame(0).GetFileLineNumber();
logger.LogError("【CalcAvgPowerStationJob】[錯誤行數] - {0}", line);
}
}
#endregion

16
SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
View File

@ -2744,9 +2744,15 @@
return;
}
$("#Invertercard-Name").html(rel.data.name);
$("#Invertercard-kwh").html(rel.data.kwh);
$("#Invertercard-kwh").html(rel.data.kwh.toFixed(2));
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
{
<text>
$("#Invertercard-money").html(rel.data.today_Money.toFixed());
$("#Invertercard-pr").html(rel.data.today_PR);
</text>
}
$("#Invertercard-Capacity").html(rel.data.generatingCapacity.toFixed(3));
$("#Invertercard-pr").html(rel.data.today_PR.toFixed(2));
var str = "<div class='progress progress-sm ' id='prbar'>" +
"<div class='progress-bar bg-info' role = 'progressbar' style = 'width: " + rel.data.today_PR + "%;' aria - valuenow='" + rel.data.today_PR + "' aria - valuemin='0' aria - valuemax='100' ></div > </div >"
$('#prbar').remove();
@ -2764,9 +2770,9 @@
break;
}
$("#Invertercard-type").html(TypeName);
var time = new Date(rel.data.createdAt);
$("#Invertercard-date").html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes());
@*var time = new Date(rel.data.createdAt);
$("#Invertercard-date").html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes());*@
$("#Invertercard-date").html(rel.data.electricityMeterAt);
var urlPath = "../upload/power_station/" + rel.data.id + "/" + rel.data.mainDisplay;
var xmlhttp;

37
SolarPower/Views/StationOverview/_InverterInfo.cshtml
View File

@ -6,25 +6,43 @@
<div class="card border m-auto m-lg-0" id="Invertercard">
<div> <img src="img/card-backgrounds/cover-3-lg.png" class="card-img-top" alt="..."> </div>
<div class="card-body d-flex justify-content-between pb-0 px-2">
<h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name"> <a href="javascript:void(0);" class="btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed"> <i class="fal fa-check"></i> </a> 新竹巨城站</h4>
<p class="card-text"><i class="fal fa-cloud-sun-rain fa-2x" id="Invertercard-weathericon"></i></p>
<h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name">新竹巨城站</h4>
<div class="d-flex">
<p id="Temp" class="mr-2">27°C</p><i class="fal fa-cloud-sun-rain fa-2x" id="weathericon"></i>
</div>
</div>
<div class="list-group list-group-flush">
<div class="list-group-item px-2">
<div class=" d-flex justify-content-between">
<div class="d-flex justify-content-between" style="width:60%">
<p>發電量</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-kwh">185</span> kWh</p>
<p id="Invertercard-Temp">27°C</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-kwh">0.00</span> kWh</p>
</div>
@if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
{
<div class="d-flex justify-content-end" style="width:40%">
@*<p>發電金額</p>*@
<p><span class="color-info-700 font-weight-bold" id="Invertercard-money">0</span> NT</p>
</div>
}
</div>
<div class=" d-flex justify-content-between">
<p>發電金額</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-money">2,5840</span> NT</p>
<p class="color-info-700 font-weight-bold" id="Invertercard-type">自建躉售</p>
<div class="d-flex justify-content-between" style="width:60%">
<p>裝置容量</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-Capacity">0.00</span> kWp</p>
</div>
<div class="d-flex justify-content-end" style="width:40%">
<p><span class="color-info-700 font-weight-bold" id="Invertercard-type">自建躉售</span></p>
</div>
</div>
<div class=" d-flex justify-content-between">
<div class="d-flex justify-content-between" style="width:60%">
<p>PR值</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-pr">90</span> %</p>
<p class="small" id="Invertercard-date">17:50:36</p>
<p><span class="color-info-700 font-weight-bold" id="Invertercard-pr">0</span> %</p>
</div>
<div class="d-flex justify-content-end" style="width:40%">
<p class="small" id="Invertercard-date">06-30 17:50</p>
</div>
</div>
</div>
</div>
@ -32,7 +50,6 @@
</div>
</div>
<ul id="ullist">
</ul>
</li>
</ul>