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

蚵仔麵線8/24翔哥(改折線圖)

Browse Source
This commit is contained in:
b110212000 2021-08-24 18:09:52 +08:00
parent 92fffab4c6
commit 0cceff37f6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SolarPower/Controllers/PowerGenerationController.cs
View File

@ -461,14 +461,14 @@ namespace SolarPower.Controllers
IChartDataSource<double> ys2 = DataSources.FromNumericCellRange(sheet, new CellRangeAddress(4, result.Result.Data.Count + 3, 6, 6));
IChartDataSource<double> ys3 = DataSources.FromNumericCellRange(sheet, new CellRangeAddress(4, result.Result.Data.Count + 3, 8, 8));
var Cba = data2.AddSeries(xs, ys1);
var Cba = data.AddSeries(xs, ys1);
Cba.SetTitle("CBA預估總發電量(度數)");
var Real = data2.AddSeries(xs, ys2);
var Real = data.AddSeries(xs, ys2);
Real.SetTitle("監控系統總發電量(度數)");
var Act = data2.AddSeries(xs, ys3);
var Act = data.AddSeries(xs, ys3);
Act.SetTitle("台電售電量(度數)");
chart.Plot(data2, bottomAxis, leftAxis);
//chart.Plot(data, bottomAxis, leftAxis);
//chart.Plot(data2, bottomAxis, leftAxis);
chart.Plot(data, bottomAxis, leftAxis);
}

7
SolarPower/Views/Operation/OperationRecord.cshtml
View File

@ -22,6 +22,12 @@
<div class="panel-container show">
<div class="panel-content">
<div class="row mb-3 d-flex justify-content-start px-3">
<div class="pr-3">
<div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed" onclick="CheckStatus(0)" id="button0">完成</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed" onclick="CheckStatus(1)" id="button1">未完成</button>
</div>
</div>
<div class="pr-3">
<div class="btn-group btn-group-md">
<button type="button" class="btn btn-success waves-effect waves-themed" onclick="ChangeType(0)" id="button0">全部</button>
@ -251,6 +257,7 @@
var datepicker;
var AllpoweridsType = true;
var AllidsType = true;
var status = true;
//#region Array.Remove
Array.prototype.remove = function (val) {