From 6619ec231efeaa8e13f4e4e27b730a8290cde670 Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Thu, 13 Jan 2022 15:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B6=9C=E5=90=88=E5=A0=B1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Controllers/PowerStationController.cs |  2 +-
 SolarPower/Views/StationReport/Index.cshtml      | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/SolarPower/Controllers/PowerStationController.cs b/SolarPower/Controllers/PowerStationController.cs
index 0fdab4a..fe3c000 100644
--- a/SolarPower/Controllers/PowerStationController.cs
+++ b/SolarPower/Controllers/PowerStationController.cs
@@ -3256,7 +3256,7 @@ namespace SolarPower.Controllers
                     var sitecheck = await powerStationRepository.Check4table(powerStation.Code, powerStation.SiteDB);
                     if(powerStation.Code != sitecheck.Avg && sitecheck.Avg != null)
                     {
-                        status.Add($"s{powerStation.Code}01_avg SITEID錯誤");
+                        status.Add($"s{powerStation.Code}01_sensoravg SITEID錯誤");
                     }
                     if (powerStation.Code != sitecheck.Inv_site && sitecheck.Inv_site != null)
                     {
diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml
index 44aba35..63b73e8 100644
--- a/SolarPower/Views/StationReport/Index.cshtml
+++ b/SolarPower/Views/StationReport/Index.cshtml
@@ -1285,11 +1285,11 @@
                 PowerStation: selecterd_invert
             }
             var url = "/StationReport/GetMaxForm";
-            var StrInfoBody;
+            var StrInfoBody = "";
             var CityArray = [];
-            var CityInfoBody;
-            var TotalHead;
-            var TotalBody;
+            var CityInfoBody = "";
+            var TotalHead = "";
+            var TotalBody = "";
             var kwhkwp = 0;
             var kwp = 0;
             $.post(url, send_data, function (rel) {
@@ -1365,7 +1365,8 @@
                     StrInfoBody += "<td>" + data.avgIrradiance.toFixed(2) + "</td>";
                     StrInfoBody += "<td>" + data.avgPR.toFixed(2) + "</td>";
                     if (showmoney == 1) {
-                        StrInfoBody += "<td>" + toThousands(main_system_guid) + "</td>";
+                        
+                        StrInfoBody += "<td>" + toThousands(Math.round(data.todayMoney)) + "</td>";
 
                         StrInfoBody += "<td>" + toThousands(Math.round(data.todayMoney * hirerate * 0.01))+ "</td>";
 
@@ -1426,6 +1427,7 @@
                 $('#detailtable').show();
                
                 nowform = 2;
+                $('#all').show();
             })
         }