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

Merge branch 'Willy'

Browse Source
This commit is contained in:
b110212000 2021-07-20 10:12:19 +08:00
commit 858e00e1f9
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SolarPower/Controllers/StationOverviewController.cs
View File

@ -360,7 +360,10 @@ namespace SolarPower.Controllers
{ {
if (string.IsNullOrEmpty(a.FormId)) if (string.IsNullOrEmpty(a.FormId))
{ {
a.Function = @$"<a href='javascript:;' class='btn btn-success waves-effect waves-themed mb-3 mr-2 add-btn'>填寫表單</a>"; if(a.Err_status == 1)
{
a.Function = @$"<a href='javascript:;' class='btn btn-success waves-effect waves-themed mb-3 mr-2 add-btn'>填寫表單</a>";
}
} }
else else
{ {

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

@ -27,7 +27,7 @@ namespace SolarPower.Repository.Implement
{ {
try try
{ {
string sql = @"SELECT "; string sql = @"SELECT AVG(KWHKWP),TOTALMONEY,TOTALKWH,TOTALCARBON,PR";
a = await conn.QueryFirstOrDefaultAsync<AnalysisStationCombine>(sql); a = await conn.QueryFirstOrDefaultAsync<AnalysisStationCombine>(sql);

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

@ -2167,11 +2167,11 @@
if (val.length != 0) { if (val.length != 0) {
$('#HistoryDetailTable').append('<tr>' + $('#HistoryDetailTable').append('<tr>' +
'<td>' + val.timestamp + '</td>' + '<td>' + val.timestamp + '</td>' +
'<td>' + val.kwh + '</td>' + '<td>' + val.kwh.toFixed(2) + '</td>' +
'<td>' + val.diffSOLARHOUR + '</td>' + '<td>' + val.diffSOLARHOUR.toFixed(2) + '</td>' +
'<td>' + val.irradiance + '</td>' + '<td>' + val.irradiance.toFixed(2) + '</td>' +
'<td>' + val.pr + '</td>' + '<td>' + val.pr.toFixed(2) + '</td>' +
'<td>' + val.temp + '</td>' + '<td>' + val.temp.toFixed(2) + '</td>' +
'</tr>'); '</tr>');
listmonth.push(val.timestamp); listmonth.push(val.timestamp);
listkwh.push(val.kwh); listkwh.push(val.kwh);
@ -2193,15 +2193,15 @@
datasets: [{ datasets: [{
type: 'line', type: 'line',
label: '日照度(kWh/㎡)', label: '日照度(kWh/㎡)',
borderColor: listcolor, borderColor: 'rgba(190, 45, 45,1)',
pointRadius: 4, pointRadius: 4,
yAxisID: 'B', yAxisID: 'B',
fill: false, fill: false,
data: listirradiance data: listirradiance
}, { }, {
type: 'bar', type: 'bar',
borderColor: listcolor2, borderColor: 'rgba(103, 180, 172, 1)',
backgroundColor: listcolor2, backgroundColor: 'rgba(103, 180, 172, 0.2)',
borderWidth: 1, borderWidth: 1,
label: '發電量(kWh)', label: '發電量(kWh)',
yAxisID: 'A', yAxisID: 'A',
@ -2255,11 +2255,11 @@
{ {
$('#HistoryTotalTable').append('<tr>' + $('#HistoryTotalTable').append('<tr>' +
'<td>' + TimestampALL + '</td>' + '<td>' + TimestampALL + '</td>' +
'<td>' + kwhALL + '</td>' + '<td>' + kwhALL.toFixed(2) + '</td>' +
'<td>' + diffSOLARHOURALL + '</td>' + '<td>' + diffSOLARHOURALL.toFixed(2) + '</td>' +
'<td>' + irradianceALL + '</td>' + '<td>' + irradianceALL.toFixed(2) + '</td>' +
'<td>' + prALL + '</td>' + '<td>' + prALL.toFixed(2) + '</td>' +
'<td>' + tempALL + '</td>' + '<td>' + tempALL.toFixed(2) + '</td>' +
'</tr>'); '</tr>');
} }
}) })