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-08-25 18:01:09 +08:00
commit f9c79b7a8e
9 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SolarPower/Controllers/AnalysisStationInfoController.cs
View File

@ -276,8 +276,8 @@ namespace SolarPower.Controllers
analysisDevice.Series.Add(PR);
DeviceHistoryInfo modelTemperature = new DeviceHistoryInfo();
modelTemperature.Name = string.Format("{0}:{1}", powerStation.Name, analysisDevice.MultipleYaxes["ModelTemperature"]);
modelTemperature.YaxesKey = "ModelTemperature";
modelTemperature.Name = string.Format("{0}:{1}", powerStation.Name, analysisDevice.MultipleYaxes["Temperature"]);
modelTemperature.YaxesKey = "Temperature";
modelTemperature.Values = new List<double>();
foreach (var history in temp_item)
{

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

@ -10,7 +10,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
@ -214,10 +214,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>

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

@ -126,7 +126,7 @@
{ key: "Irradiance", title: "日照度", default: true },
{ key: "KWHKWP", title: "發電小時", default: false },
{ key: "PR", title: "PR %", default: false },
{ key: "ModelTemperature", title: "模組溫度", default: false },
{ key: "Temperature", title: "模組溫度", default: false },
{ key: "SolarHour", title: "日照小時", default: false }
]
var PWR_compare_col = [

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

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

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

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

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

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">

24
SolarPower/Views/StationOverview/_UpToDate.cshtml
View File

@ -8,11 +8,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日發電量</p>
<p><span class="color-info-700" id="today_kwh">126,161.72</span></p>
<p><span class="color-info-700" id="today_kwh">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積發電量</p>
<p><span class="color-info-700" id="total_kwh">4,069.73</span></p>
<p><span class="color-info-700" id="total_kwh">0.00</span></p>
</div>
</div>
</div>
@ -24,11 +24,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p id="money-card-subtitle-total">總發金額</p>
<p><span class="color-info-700" id="total_money">126,161.72</span></p>
<p><span class="color-info-700" id="total_money">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p id="money-card-subtitle-avg">平均發電金額</p>
<p><span class="color-info-700" id="today_money">4,069.73</span></p>
<p><span class="color-info-700" id="today_money">0.00</span></p>
</div>
</div>
</div>
@ -40,11 +40,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均日照度</p>
<p><span class="color-info-700" id="today_irradiance">126,161.72</span></p>
<p><span class="color-info-700" id="today_irradiance">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均日照度(30天)</p>
<p><span class="color-info-700" id="avg_irradiance">4,069.73</span></p>
<p><span class="color-info-700" id="avg_irradiance">0.00</span></p>
</div>
</div>
</div>
@ -56,11 +56,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均 PR 值</p>
<p><span class="color-info-700" id="today_PR">119.04</span></p>
<p><span class="color-info-700" id="today_PR">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均 PR 值(30天)</p>
<p><span class="color-info-700" id="avg_PR">3.84</span></p>
<p><span class="color-info-700" id="avg_PR">0.00</span></p>
</div>
</div>
</div>
@ -72,11 +72,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>即時平均有效日照時數</p>
<p><span class="color-info-700" id="today_kwhkwp">140.39</span></p>
<p><span class="color-info-700" id="today_kwhkwp">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>平均有效日照時數(30天)</p>
<p><span class="color-info-700" id="avg_kwhkwp">4.53</span></p>
<p><span class="color-info-700" id="avg_kwhkwp">0.00</span></p>
</div>
</div>
</div>
@ -88,11 +88,11 @@
<div class="card-body">
<div class="d-flex justify-content-between">
<p>今日減碳量</p>
<p><span class="color-info-700" id="today_carbon">6,091.78</span></p>
<p><span class="color-info-700" id="today_carbon">0.00</span></p>
</div>
<div class="d-flex justify-content-between">
<p>累積減碳量</p>
<p><span class="color-info-700" id="total_carbon">985.98</span></p>
<p><span class="color-info-700" id="total_carbon">0.00</span></p>
</div>
</div>
</div>

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

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row flex-nowrap wrapper">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100">
<div class="col-md-2 col-1 pl-0 pr-0 collapse width border-right sidebar vh-100 overflow-auto">
<div class="list-group border-0 card text-center text-md-left" id="sidebar">
@ -229,7 +229,7 @@
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 overflow-auto">
<div class="card p-3 w-100" id="overviewtable">
<table class="table m-0">
<thead id="tothead">
</thead>
@ -241,7 +241,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 " id="hiretable">
<div class="card p-3 w-100" id="hiretable" style="overflow-x:auto">
<table class="table m-0">
<thead id="HireTableHead">
<tr>
@ -259,7 +259,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 " id="maxtable">
<div class="card p-3 w-100 " id="maxtable" style="overflow-x:auto">
<table class="table m-0">
<thead>
<tr>
@ -276,7 +276,7 @@
</div>
<div class="row mb-5">
<div class="col-xl-12">
<div class="card p-3 w-100 overflow-auto">
<div class="card p-3 w-100" id="detailtable" style="overflow-x:auto">
<table class="table m-0">
<thead id="TableHead">
</thead>
@ -305,11 +305,11 @@
$(function () {
//#region 預設初始值
var a = $('#collapse').trigger("click");
//document.getElementById("collapse").click();
$('.overflow-auto').hide();
$('#collapse').trigger("click");
$('#overviewtable').hide();
$('#maxtable').hide();
$('#hiretable').hide();
$('#detailtable').hide();
$('#DateGet').val(new Date().toISOString().substring(0, 10));
document.getElementById("DateGettextdiv").style.display = "none";//隱藏
$('#DateGet').attr('style', 'width:205px');
@ -938,7 +938,9 @@
haveinvertName = [];
}
$('.overflow-auto').show();
$('#overviewtable').show();
$('#detailtable').show();
nowform = form;
}, 'json');
}
@ -1079,7 +1081,9 @@
$('#maxtableBody').append(CityInfoBody);
$('#maxtable').show();
$('.overflow-auto').show();
$('#overviewtable').show();
$('#detailtable').show();
nowform = 2;
})
}