Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

SolarPower/Quartz/Jobs/CalcInverter15minJob.cs

@@ -162,7 +162,7 @@ namespace SolarPower.Quartz.Jobs
                         await powerStationRepository.UpdateInvStatus(update_invStatusErr.Key, null, update_invStatusErr.Select(x => x.InverterId).ToList(), 2);
                     }
 
-                    logger.LogError("【CalcInverter15minJob】檢測完成逆變器狀態");
+                    logger.LogInformation("【CalcInverter15minJob】檢測完成逆變器狀態");
                 }
                 catch(Exception exception)
                 {

SolarPower/Views/MapOverview/Index.cshtml

@@ -278,7 +278,7 @@
                     '<div id="bodyContent">' +
                     '<div class="row">' +
                     '<div class="col-12">' +
-                    '<div>今日發電量(kW h)：' + item.today_kWh + '</div>'+
+                    '<div>今日發電量(kW h)：' + item.today_kWh.toFixed(2) + '</div>'+
                     '<div>即時日照度(k W/m<sup>2</sup>)：' + item.today_irradiance + '</div>'+
                     '<div>有效日照時數(kwh/kwp)：' + item.today_kwhkwp.toFixed(2) + '</div>' +
                     '<div>裝置容量(kWp)：' + item.generatingCapacity.toFixed(3) + '</div>' +

SolarPower/Views/Shared/_Layout.cshtml

@@ -348,7 +348,7 @@
                                 </ul>
                             </li>
                         }
-                        @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("PowerStation"))
+                        @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("PowerStationManager"))
                         {
                             <li class="@(ViewData["MainNum"] == "8" ? "active open" : "")">
                                 <a href="#" title="電站管理" data-filter-tags="category">

SolarPower/Views/StationOverview/StationOverviewInfo.cshtml

@@ -19,7 +19,7 @@
             <div class="panel-container show">
                 <div class="panel-content">
                     <div class="row subheader d-flex justify-content-between">
-                        <div class="col-xl-2">
+                        <div class="col-xl-4">
                             <h1 class="subheader-title">
                                 <span id="power-station-healthStatus"></span>
                                 <span id="power-station-title">電站名稱</span>