From afa81d62c595520937b6a5888ce93b9d93a00da0 Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Thu, 13 Jan 2022 15:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=B7=E5=8F=B2=E8=B3=87=E6=96=99(=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StationOverviewInfo.cshtml                |  2 +
 .../Views/StationOverview/_History.cshtml     | 81 ++++++++++---------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index 5adf90d..ed4c5c2 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -2426,6 +2426,7 @@
 
         function getTable()
         {
+            $('#all').hide();
             if (historyRange == "")
             {
                 var today = new Date();
@@ -2793,6 +2794,7 @@
                         '<td>' + tempALL.toFixed(2) + '</td>' +
                         '</tr>');
                 }
+                $('#all').show();
             })
         }
 
diff --git a/SolarPower/Views/StationOverview/_History.cshtml b/SolarPower/Views/StationOverview/_History.cshtml
index 727039e..4010d53 100644
--- a/SolarPower/Views/StationOverview/_History.cshtml
+++ b/SolarPower/Views/StationOverview/_History.cshtml
@@ -50,48 +50,49 @@
 
 </div>
 
+<div id="all">
+    <div class="row mb-5">
+        <div class="card p-3 w-100">
+            <h5 class="font-weight-bold mb-3 pl-5 pb-3">總結</h5>
+            <table class="table m-0">
+                <thead>
+                    <tr>
+                        <th>時間</th>
+                        <th>發電量(kWh)</th>
+                        <th>有效日照時數</th>
+                        <th>日照度(kWh/m2)</th>
+                        <th>PR(%)</th>
+                        <th>溫度(℃)</th>
+                    </tr>
+                </thead>
+                <tbody id="HistoryTotalTable">
+                </tbody>
+            </table>
+        </div>
+    </div>
 
+    <div id="history-kWh-convas-div">
+        <canvas id="history-kWh"></canvas>
+    </div>
 
-<div class="row mb-5">
-    <div class="card p-3 w-100">
-        <h5 class="font-weight-bold mb-3 pl-5 pb-3">總結</h5>
-        <table class="table m-0">
-            <thead>
-                <tr>
-                    <th>時間</th>
-                    <th>發電量(kWh)</th>
-                    <th>有效日照時數</th>
-                    <th>日照度(kWh/m2)</th>
-                    <th>PR(%)</th>
-                    <th>溫度(℃)</th>
-                </tr>
-            </thead>
-            <tbody id="HistoryTotalTable">
-            </tbody>
-        </table>
+    <div class="row mb-5">
+        <div class="card p-3 w-100">
+            <h5 class="font-weight-bold mb-3 pl-5 pb-3">詳細資訊</h5>
+            <table class="table m-0">
+                <thead>
+                    <tr>
+                        <th>時間</th>
+                        <th>發電量(kWh)</th>
+                        <th>有效發電小時</th>
+                        <th>日照度(W/m2)</th>
+                        <th>PR(%)</th>
+                        <th>溫度(℃)</th>
+                    </tr>
+                </thead>
+                <tbody id="HistoryDetailTable">
+                </tbody>
+            </table>
+        </div>
     </div>
 </div>
 
-<div id="history-kWh-convas-div">
-    <canvas id="history-kWh"></canvas>
-</div>
-
-<div class="row mb-5">
-    <div class="card p-3 w-100">
-        <h5 class="font-weight-bold mb-3 pl-5 pb-3">詳細資訊</h5>
-        <table class="table m-0">
-            <thead>
-                <tr>
-                    <th>時間</th>
-                    <th>發電量(kWh)</th>
-                    <th>有效日照時數</th>
-                    <th>日照度(W/m2)</th>
-                    <th>PR(%)</th>
-                    <th>溫度(℃)</th>
-                </tr>
-            </thead>
-            <tbody id="HistoryDetailTable">
-            </tbody>
-        </table>
-    </div>
-</div>
\ No newline at end of file