From 0cceff37f6e94f15dd98a7ee12e27a2194985150 Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Tue, 24 Aug 2021 18:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9A=B5=E4=BB=94=E9=BA=B5=E7=B7=9A8/24?=
 =?UTF-8?q?=E7=BF=94=E5=93=A5(=E6=94=B9=E6=8A=98=E7=B7=9A=E5=9C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Controllers/PowerGenerationController.cs | 10 +++++-----
 SolarPower/Views/Operation/OperationRecord.cshtml   |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/SolarPower/Controllers/PowerGenerationController.cs b/SolarPower/Controllers/PowerGenerationController.cs
index 91b3500..4260536 100644
--- a/SolarPower/Controllers/PowerGenerationController.cs
+++ b/SolarPower/Controllers/PowerGenerationController.cs
@@ -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);
                     
                 }
                 
diff --git a/SolarPower/Views/Operation/OperationRecord.cshtml b/SolarPower/Views/Operation/OperationRecord.cshtml
index 4f4d5cd..088e38c 100644
--- a/SolarPower/Views/Operation/OperationRecord.cshtml
+++ b/SolarPower/Views/Operation/OperationRecord.cshtml
@@ -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) {