From f114901a2ccd0eae0eb9ede1aa1e5c4e432589a8 Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Thu, 2 Sep 2021 16:23:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=20bug=20fix=202.=20css=20=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/AnalysisStationCombine/Index.cshtml | 24 +++++++-------
 SolarPower/Views/StationOverview/Index.cshtml | 32 +++++++++----------
 .../Views/StationOverview/_UpToDate.cshtml    | 24 +++++++-------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml
index dc3444e..60ad5a9 100644
--- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml
+++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml
@@ -84,11 +84,11 @@
                                                 <div class="card-body">
                                                     <div class="d-flex justify-content-between">
                                                         <p>今日發電量</p>
-                                                        <p><span class="color-info-700" id="today_kwh">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p>
                                                     </div>
                                                 </div>
                                             </div>
@@ -102,14 +102,14 @@
                                                     <div class="card-body">
                                                         <div class="d-flex justify-content-between">
                                                             <p id="money-card-subtitle-avg">今日發電金額</p>
-                                                            <p><span class="color-info-700" id="today_money">0.00</span></p>
+                                                            <p><span class="color-info-700 fs-xl font-weight-bold" id="today_money">0.00</span></p>
                                                         </div>
                                                         <div class="d-flex justify-content-between">
                                                             <p id="money-card-subtitle-total">總發金額</p>
-                                                            <p><span class="color-info-700" id="total_money">0.00</span></p>
+                                                            <p><span class="color-info-700 fs-xl font-weight-bold" id="total_money">0.00</span></p>
                                                         </div>
                                                     </div>
-                                                </div>  
+                                                </div>
                                             }
                                             <div class="card">
                                                 <div class="card-header bg-fusion-25 pr-3 d-flex align-items-center flex-wrap">
@@ -119,11 +119,11 @@
                                                 <div class="card-body">
                                                     <div class="d-flex justify-content-between">
                                                         <p>今日有效日照時數 </p>
-                                                        <p><span class="color-info-700" id="today_kwhkwp">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="today_kwhkwp">0.00</span></p>
                                                     </div>
                                                     <div class="d-flex justify-content-between">
                                                         <p>平均有效日照時數</p>
-                                                        <p><span class="color-info-700" id="total_kwhkwp">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwhkwp">0.00</span></p>
                                                     </div>
                                                 </div>
                                             </div>
@@ -135,11 +135,11 @@
                                                 <div class="card-body">
                                                     <div class="d-flex justify-content-between">
                                                         <p>今日PR值</p>
-                                                        <p><span class="color-info-700" id="today_PR">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="today_PR">0.00</span></p>
                                                     </div>
                                                     <div class="d-flex justify-content-between">
                                                         <p>平均 PR 值</p>
-                                                        <p><span class="color-info-700" id="total_PR">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="total_PR">0.00</span></p>
                                                     </div>
                                                 </div>
                                             </div>
@@ -152,11 +152,11 @@
                                                 <div class="card-body">
                                                     <div class="d-flex justify-content-between">
                                                         <p>今日減碳量</p>
-                                                        <p><span class="color-info-700" id="today_carbon">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                                        <p><span class="color-info-700 fs-xl font-weight-bold" id="total_carbon">0.00</span></p>
                                                     </div>
                                                 </div>
                                             </div>
@@ -398,6 +398,7 @@
                 $('#total_kwhkwp').html(rel.data.all_KWH_KWP.toFixed(2));
                 $('#total_PR').html(rel.data.all_PR.toFixed(2));
                 $('#total_carbon').html(rel.data.all_Carbon.toFixed(2));
+                $('#total_irradiance').html(rel.data.all_Carbon.toFixed(2));
 
 
                 $('#today_kwh').html(rel.data.now_kwh.toFixed(2));
@@ -405,6 +406,7 @@
                 $('#today_kwhkwp').html(rel.data.now_KWH_KWP.toFixed(2));
                 $('#today_PR').html(rel.data.now_PR.toFixed(2));
                 $('#today_carbon').html(rel.data.now_Carbon.toFixed(2));
+                $('#today_irradiance').html(rel.data.now_Carbon.toFixed(2));
                 chart();
             })
 
diff --git a/SolarPower/Views/StationOverview/Index.cshtml b/SolarPower/Views/StationOverview/Index.cshtml
index 091756c..26babc6 100644
--- a/SolarPower/Views/StationOverview/Index.cshtml
+++ b/SolarPower/Views/StationOverview/Index.cshtml
@@ -71,7 +71,7 @@
                     </div>
                     <div class="row mb-5 px-3">
 
-                        <div class="col card px-0 mx-1">
+                        <div class="col card px-0 mx-2">
                             <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
                                 <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 發電量</h4>
                                 <div class="ml-auto">kW h</div>
@@ -79,15 +79,15 @@
                             <div class="card-body">
                                 <div class="d-flex justify-content-between">
                                     <p>今日發電量</p>
-                                    <p><span class="color-info-700" id="today_kwh">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col card px-0 mx-1">
+                        <div class="col card px-0 mx-2">
                             <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
                                 <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span> 日照度</h4>
                                 <div class="ml-auto">k W/㎡</div>
@@ -95,15 +95,15 @@
                             <div class="card-body">
                                 <div class="d-flex justify-content-between">
                                     <p>即時平均日照度</p>
-                                    <p><span class="color-info-700" id="today_irradiance">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" id="avg_irradiance">0.00</span></p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col card px-0 mx-1">
+                        <div class="col card px-0 mx-2">
                             <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
                                 <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> PR值</h4>
                                 <div class="ml-auto">%</div>
@@ -111,15 +111,15 @@
                             <div class="card-body">
                                 <div class="d-flex justify-content-between">
                                     <p>即時平均 PR 值</p>
-                                    <p><span class="color-info-700" id="today_PR">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" id="avg_PR">0.00</span></p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col card px-0 mx-1">
+                        <div class="col card px-0 mx-2">
                             <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
                                 <h4 class="mb-0 font-weight-bold"><span class="fal fa-sun mr-1"></span>有效日照時數</h4>
                                 <div class="ml-auto">hr</div>
@@ -127,15 +127,15 @@
                             <div class="card-body">
                                 <div class="d-flex justify-content-between">
                                     <p>即時平均有效日照時數</p>
-                                    <p><span class="color-info-700" id="today_kwhkwp">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" id="avg_kwhkwp">0.00</span></p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col card px-0 mx-1">
+                        <div class="col card px-0 mx-2">
                             <div class="card-header bg-fusion-25 py-2 pr-3 d-flex align-items-center flex-wrap">
                                 <h4 class="mb-0 font-weight-bold"><span class="fal fa-bolt mr-1"></span> 減碳量</h4>
                                 <div class="ml-auto">kG</div>
@@ -143,11 +143,11 @@
                             <div class="card-body">
                                 <div class="d-flex justify-content-between">
                                     <p>今日減碳量</p>
-                                    <p><span class="color-info-700" id="today_carbon">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                                    <p><span class="color-info-700 fs-xl font-weight-bold" id="total_carbon">0.00</span></p>
                                 </div>
                             </div>
                         </div>
@@ -185,7 +185,7 @@
                                                 {
                                                     <div class="d-flex justify-content-end" style="width:40%">
                                                         @*<p>發電金額</p>*@
-                                                        <p><span class="color-primary-400" id="PowerRate">2,5840</span> NT</p>
+                                                        <p><span class="color-primary-400" id="PowerRate">0</span> NT</p>
                                                     </div>
                                                 }
                                             </div>
diff --git a/SolarPower/Views/StationOverview/_UpToDate.cshtml b/SolarPower/Views/StationOverview/_UpToDate.cshtml
index ae82fa9..41976de 100644
--- a/SolarPower/Views/StationOverview/_UpToDate.cshtml
+++ b/SolarPower/Views/StationOverview/_UpToDate.cshtml
@@ -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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" id="total_kwh">0.00</span></p>
                 </div>
             </div>
         </div>
@@ -23,12 +23,12 @@
             </div>
             <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">0.00</span></p>
+                    <p id="money-card-subtitle-avg">發電金額</p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" id="today_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">0.00</span></p>
+                    <p id="money-card-subtitle-total">總發電金額</p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" id="total_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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" 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">0.00</span></p>
+                    <p><span class="color-info-700 fs-xl font-weight-bold" id="avg_kwhkwp">0.00</span></p>
                 </div>
             </div>
         </div>