From cf623bf0afd2772d1652cd99b076676283c37a90 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 29 Apr 2020 10:48:50 +0800
Subject: [PATCH] 1.0.0.429

Former-commit-id: f67c573532257978ae37ae4c7085347e26c59563
---
 .../IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml  |  2 +-
 projects/IoTCenter/Views/Home/Nodes.cshtml           | 12 ++++++++++--
 projects/Version.cs                                  |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml b/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
index 760c57ba..9619ca44 100644
--- a/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
+++ b/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
@@ -1,6 +1,6 @@
 <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="nav-icon false">
     <li class="nav-item"><a class="nav-link @GetClass("Home")" href="@Url.Action("Index","Home")"><i class="nav-icon fas fa-tachometer-alt"></i><p>首页</p></a></li>
-    <li class="nav-item"><a class="nav-link @GetClass("Configuration")" href="@Url.Action("Index","Setting")"><i class="nav-icon ion ion-md-hammer"></i><p>设置</p></a></li>
+    <li class="nav-item"><a class="nav-link @GetClass("Setting")" href="@Url.Action("Index","Setting")"><i class="nav-icon ion ion-md-hammer"></i><p>设置</p></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("User")" href="@Url.Action("Index","User")"><i class=" nav-icon far fa-user"></i><p>用户管理</p></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("Role")" href="@Url.Action("Index","Role")"><i class="nav-icon ion ion-md-glasses"></i><p>角色管理</p></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("Permission")" href="@Url.Action("Index","Permission")"><i class="nav-icon fas fa-key"></i><p>权限管理</p></a></li>
diff --git a/projects/IoTCenter/Views/Home/Nodes.cshtml b/projects/IoTCenter/Views/Home/Nodes.cshtml
index 5d444b2a..778da2bb 100644
--- a/projects/IoTCenter/Views/Home/Nodes.cshtml
+++ b/projects/IoTCenter/Views/Home/Nodes.cshtml
@@ -23,12 +23,20 @@
             <div class="card-header">
                 <h3 class="card-title">
                     <label style="font-weight:normal;"><input type="checkbox" name="numbers[]" class="item" :value="item.number" v-on:change="SelectNode($event)">{{item.name}}</label>
+                    <span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span>
                 </h3>
-                <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
+                <div class="card-tools">
+                    <span class="float-right text-success" v-if="item.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                </div>
             </div>
             <a class="card-body" :href="'@Url.Content("~")/Home/Node/?number='+item.number" style="display:block;text-align:center;">
                 <img :alt="item.name" :src="'@Url.Content("~")'+item.image" style="margin:0 auto;width:64px;" />
             </a>
+            <div class="card-footer text-center">
+                <button class="btn btn-success" v-on:click="nodePower(item.number,'On')">开</button>
+                <button class="btn btn-success" v-on:click="nodePower(item.number,'Off')">关</button>
+            </div>
         </div>
     </div>
 </div>
@@ -89,7 +97,7 @@
                 method === 'NodeEntityDeleted' ||
                 method === 'DeviceEntityInserted' ||
                 method === 'DeviceEntityDeleted') {
-                loadData();
+                app.load();
             }
         }
     </script>
diff --git a/projects/Version.cs b/projects/Version.cs
index 1e14b877..fdfff190 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0.428.3")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.429")]
\ No newline at end of file