From 1d242f17e963fb71dbaf30e17b92914bd44763d3 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 22 Dec 2020 16:17:06 +0800
Subject: [PATCH] update

Former-commit-id: a2e501e300c545885f828c420366ae5a735c478a
Former-commit-id: ee61a3468461107857c8e5f6ee37e67e4a002afa
---
 projects/Platform/Controllers/HomeController.cs | 5 +++++
 projects/Platform/Views/Home/Alarm.cshtml       | 1 +
 projects/Platform/Views/Home/Building.cshtml    | 6 ++++--
 projects/Platform/Views/Home/Index.cshtml       | 4 +++-
 projects/Platform/Views/Shared/_Menu.cshtml     | 8 +++-----
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 projects/Platform/Views/Home/Alarm.cshtml

diff --git a/projects/Platform/Controllers/HomeController.cs b/projects/Platform/Controllers/HomeController.cs
index c82acb00..f8d5c724 100644
--- a/projects/Platform/Controllers/HomeController.cs
+++ b/projects/Platform/Controllers/HomeController.cs
@@ -103,6 +103,11 @@ namespace Platform.Controllers
             return View(model);
         }
 
+        public IActionResult Alarm()
+        {
+            return View();
+        }
+
         public IActionResult Product()
         {
             return View();
diff --git a/projects/Platform/Views/Home/Alarm.cshtml b/projects/Platform/Views/Home/Alarm.cshtml
new file mode 100644
index 00000000..85fe33ce
--- /dev/null
+++ b/projects/Platform/Views/Home/Alarm.cshtml
@@ -0,0 +1 @@
+<h1>告警中心：按照控件显示警告信息</h1>
\ No newline at end of file
diff --git a/projects/Platform/Views/Home/Building.cshtml b/projects/Platform/Views/Home/Building.cshtml
index be65661c..0b597642 100644
--- a/projects/Platform/Views/Home/Building.cshtml
+++ b/projects/Platform/Views/Home/Building.cshtml
@@ -30,10 +30,12 @@
                 }
             </div>
             <div class="card-body">
+                <div>此处显示当前设备里温湿度和光照等环境传感器的最大最小值</div>
+                <div>此处显示当前建筑里的场景列表</div>
                 @if (Model.Buildings.Any())
                 {
                     <div>
-                        <h2>下级建筑</h2>
+                        <h2>此处显示下级建筑列表，带温湿度平均值、带批量开关用电器按钮</h2>
                         @foreach (var item in Model.Buildings)
                         {
                             <div>
@@ -45,7 +47,7 @@
                 @if (Model.Deviceses.Any())
                 {
                     <div>
-                        <h2>包含设备</h2>
+                        <h2>此处分页显示设备，设备带快捷操作</h2>
                         @foreach (var item in Model.Deviceses)
                         {
                             <div>
diff --git a/projects/Platform/Views/Home/Index.cshtml b/projects/Platform/Views/Home/Index.cshtml
index 01d078c0..e2b6cb04 100644
--- a/projects/Platform/Views/Home/Index.cshtml
+++ b/projects/Platform/Views/Home/Index.cshtml
@@ -64,7 +64,9 @@
         </div>
     </div>
 </div>
-
+<div>
+    <h1>此处显示设备种类、数量的统计信息，显示定时器和触发器的统计信息，考虑按机构显示</h1>
+</div>
 @section scripts{
     <script>
         var baseUrl = '@Url.Content("~")';
diff --git a/projects/Platform/Views/Shared/_Menu.cshtml b/projects/Platform/Views/Shared/_Menu.cshtml
index f92d4369..fec0a6d7 100644
--- a/projects/Platform/Views/Shared/_Menu.cshtml
+++ b/projects/Platform/Views/Shared/_Menu.cshtml
@@ -1,7 +1,5 @@
 <ul class="nav nav-pills nav-sidebar flex-column nav-flat" data-widget="treeview" role="menu" data-accordion="false">
-    <li class="nav-item"><a href="@Url.Action("Index","Home")" class="@GetLinkClass("Home")"><i class="far fa-circle nav-icon"></i><p>首页</p></a></li>
-    <li class="nav-item"><a href="@Url.Action("Index","Organ")" class="@GetLinkClass("Organ")"><i class="far fa-circle nav-icon"></i><p>机构</p></a></li>
-    <li class="nav-item"><a href="@Url.Action("Building","Home")" class="@GetLinkClass("Home","Building")"><i class="far fa-circle nav-icon"></i><p>实时监控</p></a></li>
-    <li class="nav-item"><a href="@Url.Action("Index3","Home")" class="@GetLinkClass("Home","Index3")"><i class="far fa-circle nav-icon"></i><p>设备控制</p></a></li>
-    <li class="nav-item"><a href="@Url.Action("Index4","Home")" class="@GetLinkClass("Home","Index4")"><i class="far fa-circle nav-icon"></i><p>告警中心</p></a></li>
+    <li class="nav-item"><a href="@Url.Action("Index","Home")" class="@GetLinkClass("Home","Index")"><i class="far fa-circle nav-icon"></i><p>首页</p></a></li>
+    <li class="nav-item"><a href="@Url.Action("Building","Home")" class="@GetLinkClass("Home","Building")"><i class="far fa-circle nav-icon"></i><p>设备中心</p></a></li>
+    <li class="nav-item"><a href="@Url.Action("Alarm","Home")" class="@GetLinkClass("Home","Alarm")"><i class="far fa-circle nav-icon"></i><p>告警中心</p></a></li>
 </ul>