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

SolarPower/DBSchema/solar_power_schema.sql

@@ -2215,6 +2215,9 @@ ALTER TABLE `power_station_exception`
 -- 新增太陽能電站網址
 INSERT INTO `solar_power_test`.`variable` (`Name`, `Value`, `Remark`) VALUES ('WebSiteUrl', 'http://green.fic.com.tw/', '太陽能電站管理系統網址');
 
+-- 修改[減碳量計算公式]參數值
+UPDATE `solar_master`.`variable` SET `Value`='0.509' WHERE  `Id`=2;
+
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

SolarPower/Views/AnalysisInverter/Index.cshtml

@@ -470,7 +470,7 @@
                                 '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
                                 '</a>' +
                                 '</div>' +
-                                '<div class="card-body p-0">' +
+                                '<div class="card-body p-0 collapse show">' +
                                 '<div class="p-0">' +
                                 '<ul class="list-group list-group-flush">';
                         $.each(inverterCollapse[key][powerStationkey], function (index, inverter) {

SolarPower/Views/AnalysisStationInfo/Index.cshtml

@@ -485,7 +485,7 @@
                                             '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
                                         '</a>' +
                                     '</div>' +
-                                    '<div class="card-body p-0">' +
+                                    '<div class="card-body p-0 collapse show">' +
                                         '<div class="p-0">' +
                                             '<ul class="list-group list-group-flush">';
                         $.each(deviceCollapse[key][powerStationkey], function (index, device) {

SolarPower/Views/Shared/_Layout.cshtml

@@ -348,22 +348,7 @@
                                 </ul>
                             </li>
                         }
-                        @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">
-                                    <i class="fal fa-cogs"></i>
-                                    <span class="nav-link-text" data-i18n="nav.category">電站管理</span>
-                                </a>
-                                <ul>
-                                    <li class="@(ViewData["MainNum"] == "8" && ViewData["SubNum"].ToString() == "1" ? "active" : "")">
-                                        <a asp-controller="PowerStation" asp-action="Index" title="電站管理" data-filter-tags="utilities disabled item">
-                                            <span class="nav-link-text" data-i18n="nav.utilities_disabled_item">電站管理</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                            </li>
-                        }
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("Operation") || ViewBag.auths.Contains("OperationRecord"))
                         {
                             <li class="@(ViewData["MainNum"] == "6" ? "active open" : "")">
@@ -392,6 +377,22 @@
                                 </ul>
                             </li>
                         }
+                        @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">
+                                    <i class="fal fa-cogs"></i>
+                                    <span class="nav-link-text" data-i18n="nav.category">電站管理</span>
+                                </a>
+                                <ul>
+                                    <li class="@(ViewData["MainNum"] == "8" && ViewData["SubNum"].ToString() == "1" ? "active" : "")">
+                                        <a asp-controller="PowerStation" asp-action="Index" title="電站管理" data-filter-tags="utilities disabled item">
+                                            <span class="nav-link-text" data-i18n="nav.utilities_disabled_item">電站管理</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li>
+                        }
 
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("Company") || ViewBag.auths.Contains("User") || ViewBag.auths.Contains("Role") || ViewBag.auths.Contains("User"))@*TODO修改定時任務權限*@
                         {