From fc06f498c601f3ac78e55b363f01150ae638146e Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Wed, 27 Oct 2021 18:39:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=9B=BB=E7=AB=99?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A0=86=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Views/Shared/_Layout.cshtml | 75 +++++++++++++-------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/SolarPower/Views/Shared/_Layout.cshtml b/SolarPower/Views/Shared/_Layout.cshtml
index 7d43486..3f3945f 100644
--- a/SolarPower/Views/Shared/_Layout.cshtml
+++ b/SolarPower/Views/Shared/_Layout.cshtml
@@ -177,13 +177,13 @@
                                         </li>
                                     }
                                     @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                                             || ViewBag.auths.Contains("StationOverview_UpToDate")
-                                             || ViewBag.auths.Contains("StationOverview_Info")
-                                             || ViewBag.auths.Contains("StationOverview_InverterInfo")
-                                             || ViewBag.auths.Contains("StationOverview_Inverter")
-                                             || ViewBag.auths.Contains("StationOverview_History")
-                                             || ViewBag.auths.Contains("StationOverview_Exception")
-                                             || ViewBag.auths.Contains("StationOverview_OperationRecord"))
+                                            || ViewBag.auths.Contains("StationOverview_UpToDate")
+                                            || ViewBag.auths.Contains("StationOverview_Info")
+                                            || ViewBag.auths.Contains("StationOverview_InverterInfo")
+                                            || ViewBag.auths.Contains("StationOverview_Inverter")
+                                            || ViewBag.auths.Contains("StationOverview_History")
+                                            || ViewBag.auths.Contains("StationOverview_Exception")
+                                            || ViewBag.auths.Contains("StationOverview_OperationRecord"))
                                     {
                                         <li class="@(ViewData["MainNum"] == "1" && ViewData["SubNum"] == "2" ? "active" : "")">
                                             <a asp-controller="StationOverview" asp-action="Index" title="電站總覽" data-filter-tags="utilities disabled item">
@@ -196,13 +196,13 @@
                         }
                         <!-- Example of open and active states -->
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("StationOverview_UpToDate")
-                         || ViewBag.auths.Contains("StationOverview_Info")
-                         || ViewBag.auths.Contains("StationOverview_InverterInfo")
-                         || ViewBag.auths.Contains("StationOverview_Inverter")
-                         || ViewBag.auths.Contains("StationOverview_History")
-                         || ViewBag.auths.Contains("StationOverview_Exception")
-                         || ViewBag.auths.Contains("StationOverview_OperationRecord"))
+                        || ViewBag.auths.Contains("StationOverview_UpToDate")
+                        || ViewBag.auths.Contains("StationOverview_Info")
+                        || ViewBag.auths.Contains("StationOverview_InverterInfo")
+                        || ViewBag.auths.Contains("StationOverview_Inverter")
+                        || ViewBag.auths.Contains("StationOverview_History")
+                        || ViewBag.auths.Contains("StationOverview_Exception")
+                        || ViewBag.auths.Contains("StationOverview_OperationRecord"))
                         {
                             <li class="@(ViewData["MainNum"] == "2" ? "active open" : "")">
                                 <a href="javascript:void(0);" title="電站資訊" data-filter-tags="category">
@@ -244,9 +244,9 @@
                             </li>
                         }
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("AnalysisStationCombine")
-                         || ViewBag.auths.Contains("AnalysisStationInfo")
-                         || ViewBag.auths.Contains("AnalysisInverter"))
+                        || ViewBag.auths.Contains("AnalysisStationCombine")
+                        || ViewBag.auths.Contains("AnalysisStationInfo")
+                        || ViewBag.auths.Contains("AnalysisInverter"))
                         {
                             <li class="@(ViewData["MainNum"] == "3" ? "active open" : "")">
                                 <a href="#" title="交叉分析" data-filter-tags="category">
@@ -282,10 +282,10 @@
                             </li>
                         }
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("StationReport")
-                         || ViewBag.auths.Contains("ElectricitySoldRecord")
-                         || ViewBag.auths.Contains("PowerGeneration")
-                         || ViewBag.auths.Contains("NoticeSchedule"))
+                        || ViewBag.auths.Contains("StationReport")
+                        || ViewBag.auths.Contains("ElectricitySoldRecord")
+                        || ViewBag.auths.Contains("PowerGeneration")
+                        || ViewBag.auths.Contains("NoticeSchedule"))
                         {
                             <li class="@(ViewData["MainNum"] == "4" ? "active open" : "")">
                                 <a href="#" title="報表查詢" data-filter-tags="category">
@@ -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修改定時任務權限*@
                         {