From c611231a3ddea5b6bfc3da8372c14a34f002392d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 3 Dec 2020 10:21:07 +0800
Subject: [PATCH] Platform:1.1.0.7 IoTNode:1.1.0.3

Former-commit-id: 79d11e009a449e6acb807e155a92cbe8ea1455c0
Former-commit-id: 8469b4624af821a71379e1c064d0c6b3ac1ca56f
---
 projects/IoTNode/IoTNode.csproj               |  48 ++--
 .../Areas/IoTCenter/Views/Shared/_Menu.cshtml |   8 +-
 projects/Platform/Platform.csproj             |   2 +-
 .../Platform/Views/Shared/_TopMenu.cshtml     |   4 +-
 .../wwwroot/components/shared/layout.html     | 265 +++++++++---------
 projects/WebMVC/wwwroot/js/iot.js             |   2 +-
 .../wwwroot/routes/admin/command/detail.html  |   7 -
 .../wwwroot/routes/admin/command/index.html   |   7 -
 .../wwwroot/routes/admin/record/index.html    |   7 -
 .../wwwroot/routes/admin/setting/detail.html  |   7 -
 .../wwwroot/routes/admin/setting/index.html   |   7 -
 projects/WebMVC/wwwroot/routes/home.html      |   4 +-
 .../routes/iotcenter/command/detail.html      |   7 +
 .../{admin => iotcenter}/command/edit.html    |   2 +-
 .../routes/iotcenter/command/index.html       |   7 +
 .../routes/{iot => iotcenter}/device.html     |   4 +-
 .../routes/{admin => iotcenter}/index.html    |   8 +-
 .../routes/{iot => iotcenter}/node.html       |   6 +-
 .../routes/{iot => iotcenter}/nodes.html      |   2 +-
 .../routes/{iot => iotcenter}/organs.html     |   0
 .../routes/{iot => iotcenter}/product.html    |   4 +-
 .../{admin => iotcenter}/record/detail.html   |   6 +-
 .../{admin => iotcenter}/record/edit.html     |   0
 .../routes/iotcenter/record/index.html        |   7 +
 .../routes/{admin => iotcenter}/system.html   |   0
 .../routes/settings/setting/detail.html       |   7 +
 .../{admin => settings}/setting/edit.html     |   2 +-
 .../routes/settings/setting/index.html        |   7 +
 28 files changed, 219 insertions(+), 218 deletions(-)
 delete mode 100644 projects/WebMVC/wwwroot/routes/admin/command/detail.html
 delete mode 100644 projects/WebMVC/wwwroot/routes/admin/command/index.html
 delete mode 100644 projects/WebMVC/wwwroot/routes/admin/record/index.html
 delete mode 100644 projects/WebMVC/wwwroot/routes/admin/setting/detail.html
 delete mode 100644 projects/WebMVC/wwwroot/routes/admin/setting/index.html
 create mode 100644 projects/WebMVC/wwwroot/routes/iotcenter/command/detail.html
 rename projects/WebMVC/wwwroot/routes/{admin => iotcenter}/command/edit.html (99%)
 create mode 100644 projects/WebMVC/wwwroot/routes/iotcenter/command/index.html
 rename projects/WebMVC/wwwroot/routes/{iot => iotcenter}/device.html (98%)
 rename projects/WebMVC/wwwroot/routes/{admin => iotcenter}/index.html (91%)
 rename projects/WebMVC/wwwroot/routes/{iot => iotcenter}/node.html (98%)
 rename projects/WebMVC/wwwroot/routes/{iot => iotcenter}/nodes.html (95%)
 rename projects/WebMVC/wwwroot/routes/{iot => iotcenter}/organs.html (100%)
 rename projects/WebMVC/wwwroot/routes/{iot => iotcenter}/product.html (97%)
 rename projects/WebMVC/wwwroot/routes/{admin => iotcenter}/record/detail.html (74%)
 rename projects/WebMVC/wwwroot/routes/{admin => iotcenter}/record/edit.html (100%)
 create mode 100644 projects/WebMVC/wwwroot/routes/iotcenter/record/index.html
 rename projects/WebMVC/wwwroot/routes/{admin => iotcenter}/system.html (100%)
 create mode 100644 projects/WebMVC/wwwroot/routes/settings/setting/detail.html
 rename projects/WebMVC/wwwroot/routes/{admin => settings}/setting/edit.html (99%)
 create mode 100644 projects/WebMVC/wwwroot/routes/settings/setting/index.html

diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index 710f7b39..ba685e75 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -4,18 +4,18 @@
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>1.1.0.2</Version>
+		<Version>1.1.0.3</Version>
 	</PropertyGroup>
 	<ItemGroup>
-	  <Compile Remove="Application\Models\**" />
-	  <Content Remove="Application\Models\**" />
-	  <EmbeddedResource Remove="Application\Models\**" />
-	  <None Remove="Application\Models\**" />
+		<Compile Remove="Application\Models\**" />
+		<Content Remove="Application\Models\**" />
+		<EmbeddedResource Remove="Application\Models\**" />
+		<None Remove="Application\Models\**" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Include="Application\Models\EditPermissionModel.cs" />
-	  <Compile Include="Application\Models\EditRoleModel.cs" />
-	  <Compile Include="Application\Models\EditUserModel.cs" />
+		<Compile Include="Application\Models\EditPermissionModel.cs" />
+		<Compile Include="Application\Models\EditRoleModel.cs" />
+		<Compile Include="Application\Models\EditUserModel.cs" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Hangfire.Core" Version="1.7.18" />
@@ -32,36 +32,36 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Content Update="Views\Account\ChangePassword.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\ForgotPassword.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\Index.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\Login.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\Register.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\ResetPassword.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\_Menu.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="Views\Account\_Script.cshtml">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
 		</Content>
 		<Content Update="wwwroot/ffmpeg-linux-x64" CopyToPublishDirectory="Never" />
 		<Content Update="wwwroot/ffmpeg-windows-x64" CopyToPublishDirectory="Never" />
diff --git a/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml b/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml
index 0be90f42..ad3ae356 100644
--- a/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml
+++ b/projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml
@@ -28,14 +28,14 @@
     {
     <li class="nav-item"><a class="@GetLinkClass("Data")" href="@Url.Action("Index","Data")"><i class="far fa-circle nav-icon"></i><span>数据管理</span></a></li>
     }
-    @if (HasPermission("Read-LiveRecord"))
-    {
-    <li class="nav-item"><a class="@GetLinkClass("LiveRecord")" href="@Url.Action("Index","LiveRecord")"><i class="far fa-circle nav-icon"></i><span>回放管理</span></a></li>
-    }
     @if (HasPermission("Read-Command"))
     {
     <li class="nav-item"><a class="@GetLinkClass("Command")" href="@Url.Action("Index","Command")"><i class="far fa-circle nav-icon"></i><span>命令管理</span></a></li>
     }
+    @if (HasPermission("Read-LiveRecord"))
+    {
+    <li class="nav-item"><a class="@GetLinkClass("LiveRecord")" href="@Url.Action("Index","LiveRecord")"><i class="far fa-circle nav-icon"></i><span>回放管理</span></a></li>
+    }
     @if (HasPermission("Read-Scene", "Read-SceneCommand", "Read-SceneTimer", "Read-SceneTigger"))
     {
     <li class="@GetGroupClass("Scene","SceneCommand","SceneTimer","SceneTigger")">
diff --git a/projects/Platform/Platform.csproj b/projects/Platform/Platform.csproj
index 7b5ed6e7..efcb213b 100644
--- a/projects/Platform/Platform.csproj
+++ b/projects/Platform/Platform.csproj
@@ -4,7 +4,7 @@
 		<SatelliteResourceLanguages>Zh-CN</SatelliteResourceLanguages>
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>1.1.0.6</Version>
+		<Version>1.1.0.7</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.7.18" />
diff --git a/projects/Platform/Views/Shared/_TopMenu.cshtml b/projects/Platform/Views/Shared/_TopMenu.cshtml
index 75b773c0..b7f1cb05 100644
--- a/projects/Platform/Views/Shared/_TopMenu.cshtml
+++ b/projects/Platform/Views/Shared/_TopMenu.cshtml
@@ -6,12 +6,12 @@
         <a href="@Url.Action("Index","Home",new { area=""})" class="@GetLinkClass(area:"")">首页</a>
     </li>
     <li class="nav-item d-none d-sm-inline-block">
-        <a href="@Url.Action("Index","Setting",new { area="Settings"})" class="@GetLinkClass(area:"Settings")">配置中心</a>
+        <a href="@Url.Action("Index","Setting",new { area="Settings"})" class="@GetLinkClass(area:"Settings")">配置</a>
     </li>    
     <li class="nav-item d-none d-sm-inline-block">
         <a href="@Url.Action("Index","Organ",new { area="UserCenter"})" class="@GetLinkClass(area:"UserCenter")">组织机构</a>
     </li>
     <li class="nav-item d-none d-sm-inline-block">
-        <a href="@Url.Action("Index","Home",new { area="IoTCenter"})" class="@GetLinkClass(area:"IoTCenter")">物联网</a>
+        <a href="@Url.Action("Index","Home",new { area="IoTCenter"})" class="@GetLinkClass(area:"IoTCenter")">设备管控</a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/components/shared/layout.html b/projects/WebMVC/wwwroot/components/shared/layout.html
index f1fe02c1..9e8942d6 100644
--- a/projects/WebMVC/wwwroot/components/shared/layout.html
+++ b/projects/WebMVC/wwwroot/components/shared/layout.html
@@ -9,7 +9,13 @@
                     <router-link to="/" :class="'nav-link'+(area==='default'?' active':'')">首页</router-link>
                 </li>
                 <li class="nav-item d-none d-sm-inline-block">
-                    <router-link to="/routes/admin/index.html?area=admin" :class="'nav-link'+(area==='admin'?' active':'')">管理</router-link>
+                    <router-link to="/routes/shared/index.html?area=settings&entity=Setting" :class="'nav-link'+(area==='settings'?' active':'')">配置</router-link>
+                </li>
+                <li class="nav-item d-none d-sm-inline-block">
+                    <router-link to="/routes/shared/index.html?area=usercenter&entity=Organ" :class="'nav-link'+(area==='usercenter'?' active':'')">组织机构</router-link>
+                </li>
+                <li class="nav-item d-none d-sm-inline-block">
+                    <router-link to="/routes/iotcenter/index.html?area=iotcenter" :class="'nav-link'+(area==='iotcenter'?' active':'')">设备管控</router-link>
                 </li>
             </ul>
             <ul class="navbar-nav ml-auto" v-if="data.username">
@@ -38,7 +44,7 @@
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='default'">
                         <li class="nav-item">
-                            <router-link to="/" :class="getPageClass('/','/routes/iot/product.html','/routes/iot/device.html')">
+                            <router-link to="/" :class="getPageClass('/','/routes/iotcenter/product.html','/routes/iotcenter/device.html')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     首页
@@ -46,7 +52,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <router-link to="/routes/iot/nodes.html" :class="getPageClass('/routes/iot/nodes.html','/routes/iot/node.html')">
+                            <router-link to="/routes/iotcenter/nodes.html" :class="getPageClass('/routes/iotcenter/nodes.html','/routes/iotcenter/node.html')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     节点
@@ -54,91 +60,102 @@
                             </router-link>
                         </li>
                     </ul>
-                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='admin'">
-                        <li class="nav-item">
-                            <router-link :key="$route.fullPath" to="/routes/admin/index.html?area=admin" :class="getPageClass('/routes/admin/index.html')">
+                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='settings'">
+                        <li class="nav-item" v-if="hasPermission('Read-Setting')">
+                            <router-link :key="$route.fullPath" to="/routes/settings/index.html?area=settings&entity=Setting" :class="getLinkClass('Setting')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
-                                    首页
+                                    配置管理
                                 </p>
                             </router-link>
                         </li>
-                        <li class="nav-item" v-if="hasPermission('Read-Setting')">
-                            <router-link :key="$route.fullPath" to="/routes/admin/setting/index.html?area=admin&entity=Setting" :class="getLinkClass('Setting')">
+                        <li class="nav-item" v-if="hasPermission('Read-Site')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=settings&entity=Site" :class="getLinkClass('Site')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
-                                    配置管理
+                                    应用管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Area')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=settings&entity=Area" :class="getLinkClass('Area')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    区域管理
+                                </p>
+                            </router-link>
+                        </li>
+                    </ul>
+                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='usercenter'">
+                        <li class="nav-item" v-if="hasPermission('Read-Organ')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=usercenter&entity=Organ" :class="getLinkClass('Organ')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    机构管理
                                 </p>
                             </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-User')">
-                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=User" :class="getLinkClass('User')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=usercenter&entity=User" :class="getLinkClass('User')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     用户管理
                                 </p>
                             </router-link>
                         </li>
-                        <!--角色权限-->
-                        <li :class="getGroupLiClass('Role','Permission')" v-if="hasPermission('Read-Role')||hasPermission('Read-Permission')">
-                            <a href="javascript:;" :class="getGroupLinkClass('Role','Permission')" @click.stop="toggle($event)">
-                                <i class="fa fa-folder nav-icon"></i>
-                                <p>角色权限<i class="right fas fa-angle-left"></i></p>
-                            </a>
-                            <ul class="nav nav-treeview">
-                                <li class="nav-item" v-if="hasPermission('Read-Role')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Role" :class="getLinkClass('Role')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            角色管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Permission')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Permission" :class="getLinkClass('Permission')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            权限管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                            </ul>
+                        <li class="nav-item" v-if="hasPermission('Read-Role')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=usercenter&entity=Role" :class="getLinkClass('Role')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    角色管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Permission')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=usercenter&entity=Permission" :class="getLinkClass('Permission')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    权限管理
+                                </p>
+                            </router-link>
+                        </li>
+                    </ul>
+                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false" v-if="area==='iotcenter'">
+                        <li class="nav-item">
+                            <router-link :key="$route.fullPath" to="/routes/iotcenter/index.html?area=iotcenter" :class="getPageClass('/routes/iotcenter/index.html')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    首页
+                                </p>
+                            </router-link>
                         </li>
                         <!--产品-->
-                        <li :class="getGroupLiClass('Product','Api','Parameter')" v-if="hasPermission('Read-Product')||hasPermission('Read-Api')||hasPermission('Read-Parameter')">
-                            <a href="javascript:;" :class="getGroupLinkClass('Product','Api','Parameter')" @click.stop="toggle($event)">
-                                <i class="fa fa-folder nav-icon"></i>
-                                <p>产品管理<i class="right fas fa-angle-left"></i></p>
-                            </a>
-                            <ul class="nav nav-treeview">
-                                <li class="nav-item" v-if="hasPermission('Read-Product')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Product" :class="getLinkClass('Product')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            产品管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Api')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Api" :class="getLinkClass('Api')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            接口管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Parameter')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Parameter" :class="getLinkClass('Parameter')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            参数管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                            </ul>
+                        <li class="nav-item" v-if="hasPermission('Read-Product')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Product" :class="getLinkClass('Product')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    产品管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Api')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Api" :class="getLinkClass('Api')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    接口管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Parameter')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Parameter" :class="getLinkClass('Parameter')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    参数管理
+                                </p>
+                            </router-link>
                         </li>
                         <li class="nav-item" v-if="hasPermission('Read-NodeCategory')">
-                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=NodeCategory" :class="getLinkClass('NodeCategory')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=NodeCategory" :class="getLinkClass('NodeCategory')">
                                 <i class="far fa-circle nav-icon"></i>
                                 <p>
                                     节点分类
@@ -146,45 +163,45 @@
                             </router-link>
                         </li>
                         <!--节点-->
-                        <li :class="getGroupLiClass('Node','Device','Data','Command')" v-if="hasPermission('Read-Node')||hasPermission('Read-Device')||hasPermission('Read-Data')||hasPermission('Read-Command')">
-                            <a href="javascript:;" :class="getGroupLinkClass('Node','Device','Data','Command')" @click.stop="toggle($event)">
-                                <i class="fa fa-folder nav-icon"></i>
-                                <p>节点管理<i class="right fas fa-angle-left"></i></p>
-                            </a>
-                            <ul class="nav nav-treeview">
-                                <li class="nav-item" v-if="hasPermission('Read-Node')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Node" :class="getLinkClass('Node')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            节点管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Device')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Device" :class="getLinkClass('Device')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            设备管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Data')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Data" :class="getLinkClass('Data')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            数据管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                                <li class="nav-item" v-if="hasPermission('Read-Command')">
-                                    <router-link :key="$route.fullPath" to="/routes/admin/command/index.html?area=admin&entity=Command" :class="getLinkClass('Command')">
-                                        <i class="far fa-circle nav-icon"></i>
-                                        <p>
-                                            命令管理
-                                        </p>
-                                    </router-link>
-                                </li>
-                            </ul>
+                        <li class="nav-item" v-if="hasPermission('Read-Node')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Node" :class="getLinkClass('Node')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    节点管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Device')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Device" :class="getLinkClass('Device')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    设备管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Data')">
+                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Data" :class="getLinkClass('Data')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    数据管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-Command')">
+                            <router-link :key="$route.fullPath" to="/routes/iotcenter/command/index.html?area=iotcenter&entity=Command" :class="getLinkClass('Command')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    命令管理
+                                </p>
+                            </router-link>
+                        </li>
+                        <li class="nav-item" v-if="hasPermission('Read-LiveRecord')">
+                            <router-link :key="$route.fullPath" to="/routes/iotcenter/record/index.html?area=iotcenter&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
+                                <i class="far fa-circle nav-icon"></i>
+                                <p>
+                                    回放管理
+                                </p>
+                            </router-link>
                         </li>
                         <!--节点场景-->
                         <li :class="getGroupLiClass('Scene','SceneCommand','SceneTimer','SceneTigger')" v-if="hasPermission('Read-Scene')||hasPermission('Read-SceneCommand')||hasPermission('Read-SceneTimer')||hasPermission('Read-SceneTigger')">
@@ -194,7 +211,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-Scene')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Scene" :class="getLinkClass('Scene')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=Scene" :class="getLinkClass('Scene')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景管理
@@ -202,7 +219,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneCommand')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneCommand" :class="getLinkClass('SceneCommand')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=SceneCommand" :class="getLinkClass('SceneCommand')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景命令管理
@@ -210,7 +227,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTimer')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTimer" :class="getLinkClass('SceneTimer')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=SceneTimer" :class="getLinkClass('SceneTimer')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             定时器管理
@@ -218,7 +235,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTigger')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=SceneTigger" :class="getLinkClass('SceneTigger')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=SceneTigger" :class="getLinkClass('SceneTigger')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             触发器管理
@@ -227,14 +244,6 @@
                                 </li>
                             </ul>
                         </li>
-                        <li class="nav-item" v-if="hasPermission('Read-Organ')">
-                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=Organ" :class="getLinkClass('Organ')">
-                                <i class="far fa-circle nav-icon"></i>
-                                <p>
-                                    机构管理
-                                </p>
-                            </router-link>
-                        </li>
                         <!--机构场景-->
                         <li :class="getGroupLiClass('OrganScene','OrganSceneCommand','OrganSceneTimer','OrganSceneTigger')" v-if="hasPermission('Read-OrganScene')||hasPermission('Read-OrganSceneCommand')||hasPermission('Read-OrganSceneTimer')||hasPermission('Read-OrganSceneTigger')">
                             <a href="javascript:;" :class="getGroupLinkClass('OrganScene','OrganSceneCommand','OrganSceneTimer','OrganSceneTigger')" @click.stop="toggle($event)">
@@ -243,7 +252,7 @@
                             </a>
                             <ul class="nav nav-treeview">
                                 <li class="nav-item" v-if="hasPermission('Read-OrganScene')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=OrganScene" :class="getLinkClass('OrganScene')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=OrganScene" :class="getLinkClass('OrganScene')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景管理
@@ -251,7 +260,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneCommand')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=OrganSceneCommand" :class="getLinkClass('OrganSceneCommand')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=OrganSceneCommand" :class="getLinkClass('OrganSceneCommand')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             场景命令管理
@@ -259,7 +268,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTimer')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=OrganSceneTimer" :class="getLinkClass('OrganSceneTimer')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=OrganSceneTimer" :class="getLinkClass('OrganSceneTimer')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             定时器管理
@@ -267,7 +276,7 @@
                                     </router-link>
                                 </li>
                                 <li class="nav-item" v-if="hasPermission('Read-SceneTigger')">
-                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=OrganSceneTigger" :class="getLinkClass('OrganSceneTigger')">
+                                    <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=iotcenter&entity=OrganSceneTigger" :class="getLinkClass('OrganSceneTigger')">
                                         <i class="far fa-circle nav-icon"></i>
                                         <p>
                                             触发器管理
@@ -276,18 +285,10 @@
                                 </li>
                             </ul>
                         </li>
-                        <li class="nav-item" v-if="hasPermission('Read-LiveRecord')">
-                            <router-link :key="$route.fullPath" to="/routes/admin/record/index.html?area=admin&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
-                                <i class="far fa-circle nav-icon"></i>
-                                <p>
-                                    回放管理
-                                </p>
-                            </router-link>
-                        </li>
                         <template v-if="data.roles.indexOf('超级管理员')===0">
                             <li class="nav-header">运维</li>
                             <li class="nav-item">
-                                <router-link :key="$route.fullPath" to="/routes/admin/system.html?area=admin" :class="getLinkClass('LiveRecord')">
+                                <router-link :key="$route.fullPath" to="/routes/iotcenter/system.html?area=iotcenter" :class="getLinkClass('LiveRecord')">
                                     <i class="far fa-circle nav-icon"></i>
                                     <p>
                                         运维
@@ -464,4 +465,4 @@
                 return window.location.protocol + "//" + window.location.hostname + ":" + port;
             }
         }
-    }</script>
\ No newline at end of file
+    }</script>
diff --git a/projects/WebMVC/wwwroot/js/iot.js b/projects/WebMVC/wwwroot/js/iot.js
index 705d3bcf..67b274e2 100644
--- a/projects/WebMVC/wwwroot/js/iot.js
+++ b/projects/WebMVC/wwwroot/js/iot.js
@@ -114,7 +114,7 @@ function updateSelect(action, id, value) {
         select.find("option[value!='']").remove();
         select[0].dispatchEvent(new Event('change'));
         if (value) {
-            var url = config.baseUrl + '/IoTCenter/Admin/Ajax/' + action + '?parentId=' + value;
+            var url = config.baseUrl + '/IoTCenter/IoTCenter/Ajax/' + action + '?parentId=' + value;
             $.getJSON(url, function (data) {
                 $.each(data, function (i, v) {
                     select.append('<option value="' + v.value + '">' + v.text + '</option>');
diff --git a/projects/WebMVC/wwwroot/routes/admin/command/detail.html b/projects/WebMVC/wwwroot/routes/admin/command/detail.html
deleted file mode 100644
index f5789d80..00000000
--- a/projects/WebMVC/wwwroot/routes/admin/command/detail.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <display service="IoTCenter" area="admin" entity="Command" model="Command" :id="this.$route.query.id" />
-</template>
-<script>
-    export default {
-    }
-</script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/routes/admin/command/index.html b/projects/WebMVC/wwwroot/routes/admin/command/index.html
deleted file mode 100644
index 88395f79..00000000
--- a/projects/WebMVC/wwwroot/routes/admin/command/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <list service="IoTCenter" area="admin" entity="Command" model="Command" />
-</template>
-<script>
-    export default {
-    }
-</script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/routes/admin/record/index.html b/projects/WebMVC/wwwroot/routes/admin/record/index.html
deleted file mode 100644
index 23e7a3b5..00000000
--- a/projects/WebMVC/wwwroot/routes/admin/record/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <list service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" />
-</template>
-<script>
-    export default {
-    }
-</script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/routes/admin/setting/detail.html b/projects/WebMVC/wwwroot/routes/admin/setting/detail.html
deleted file mode 100644
index 3d688645..00000000
--- a/projects/WebMVC/wwwroot/routes/admin/setting/detail.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <display service="IoTCenter" area="admin" entity="Setting" model="Setting" :id="this.$route.query.id" />
-</template>
-<script>
-    export default {
-    }
-</script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/routes/admin/setting/index.html b/projects/WebMVC/wwwroot/routes/admin/setting/index.html
deleted file mode 100644
index d04d3916..00000000
--- a/projects/WebMVC/wwwroot/routes/admin/setting/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-    <list service="IoTCenter" area="admin" entity="Setting" model="Setting" />
-</template>
-<script>
-    export default {
-    }
-</script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/routes/home.html b/projects/WebMVC/wwwroot/routes/home.html
index f200a615..3e08fede 100644
--- a/projects/WebMVC/wwwroot/routes/home.html
+++ b/projects/WebMVC/wwwroot/routes/home.html
@@ -8,7 +8,7 @@
                         <h3 class="card-title">{{item.name}}</h3>
                         <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
                     </div>
-                    <router-link :to="{path:'/routes/iot/product.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/iotcenter/product.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+item.image" style="margin: 0px auto; width: 64px;">
                     </router-link>
                 </div>
@@ -72,4 +72,4 @@
             unsubscribe();
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/iotcenter/command/detail.html b/projects/WebMVC/wwwroot/routes/iotcenter/command/detail.html
new file mode 100644
index 00000000..e7f221b0
--- /dev/null
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/command/detail.html
@@ -0,0 +1,7 @@
+<template>
+    <display service="IoTCenter" area="iotcenter" entity="Command" model="Command" :id="this.$route.query.id" />
+</template>
+<script>
+    export default {
+    }
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/command/edit.html b/projects/WebMVC/wwwroot/routes/iotcenter/command/edit.html
similarity index 99%
rename from projects/WebMVC/wwwroot/routes/admin/command/edit.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/command/edit.html
index fe3ec22b..6822265c 100644
--- a/projects/WebMVC/wwwroot/routes/admin/command/edit.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/command/edit.html
@@ -172,7 +172,7 @@
         data: function () {
             return {
                 service: 'IoTCenter',
-                area: "admin",
+                area: "iotcenter",
                 entity: 'Command',
                 model: 'Command',
                 mode: this.$route.query.mode,
diff --git a/projects/WebMVC/wwwroot/routes/iotcenter/command/index.html b/projects/WebMVC/wwwroot/routes/iotcenter/command/index.html
new file mode 100644
index 00000000..17c2a2ab
--- /dev/null
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/command/index.html
@@ -0,0 +1,7 @@
+<template>
+    <list service="IoTCenter" area="iotcenter" entity="Command" model="Command" />
+</template>
+<script>
+    export default {
+    }
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/iot/device.html b/projects/WebMVC/wwwroot/routes/iotcenter/device.html
similarity index 98%
rename from projects/WebMVC/wwwroot/routes/iot/device.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/device.html
index b33f8ce2..b5d42df4 100644
--- a/projects/WebMVC/wwwroot/routes/iot/device.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/device.html
@@ -8,7 +8,7 @@
                 <div class="col-sm-6">
                     <ol class="breadcrumb float-sm-right">
                         <li class="breadcrumb-item"><router-link to="/">首页</router-link></li>
-                        <li class="breadcrumb-item"><router-link :to="{path:'/routes/iot/product.html',query:{number:device.product.number}}">{{device.product.name}}</router-link></li>
+                        <li class="breadcrumb-item"><router-link :to="{path:'/routes/iotcenter/product.html',query:{number:device.product.number}}">{{device.product.name}}</router-link></li>
                         <li class="breadcrumb-item active">{{device.displayName}}</li>
                     </ol>
                 </div>
@@ -175,4 +175,4 @@
             this.unsubscribe();
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/index.html b/projects/WebMVC/wwwroot/routes/iotcenter/index.html
similarity index 91%
rename from projects/WebMVC/wwwroot/routes/admin/index.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/index.html
index 046bfc4a..fb24c250 100644
--- a/projects/WebMVC/wwwroot/routes/admin/index.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/index.html
@@ -9,7 +9,7 @@
                             <h3 class="card-title">{{item.name}}</h3>
                             <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.deviceCount}}</span></div>
                         </div>
-                        <router-link :to="'/routes/shared/index.html?area=admin&entity=Device&query.productId='+item.id" class="card-body" style="display:block;text-align:center;">
+                        <router-link :to="'/routes/shared/index.html?area=iotcenter&entity=Device&query.productId='+item.id" class="card-body" style="display:block;text-align:center;">
                             <img alt="@item.Name" :src="item.image" style="margin:0 auto;height:64px;" />
                         </router-link>
                     </div>
@@ -23,7 +23,7 @@
                             <h3 class="card-title">{{item.name}}</h3>
                             <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.deviceCount}}</span></div>
                         </div>
-                        <router-link :to="'/routes/shared/index.html?area=admin&entity=Device&query.nodeId='+item.id" class="card-body" style="display:block;text-align:center;">
+                        <router-link :to="'/routes/shared/index.html?area=iotcenter&entity=Device&query.nodeId='+item.id" class="card-body" style="display:block;text-align:center;">
                             <img alt="@item.Name" :src="item.image" style="margin:0 auto;height:64px;" />
                         </router-link>
                         <div class="card-footer text-center">
@@ -45,7 +45,7 @@
         },
         mounted: function () {
             var vm = this;
-            var url = this.baseUrl + '/IoTCenter/Admin/Home/Index';
+            var url = this.baseUrl + '/IoTCenter/IoTCenter/Home/Index';
             axios.get(url).then(function (response) {
                 vm.model = response.data.model;
             });
@@ -71,4 +71,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/iot/node.html b/projects/WebMVC/wwwroot/routes/iotcenter/node.html
similarity index 98%
rename from projects/WebMVC/wwwroot/routes/iot/node.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/node.html
index a97096dd..a3149250 100644
--- a/projects/WebMVC/wwwroot/routes/iot/node.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/node.html
@@ -7,7 +7,7 @@
             <div class="col-sm-6">
                 <ol class="breadcrumb float-sm-right">
                     <li class="breadcrumb-item"><router-link to="/">首页</router-link></li>
-                    <li class="breadcrumb-item"><router-link to="/routes/iot/nodes.html">节点列表</router-link></li>
+                    <li class="breadcrumb-item"><router-link to="/routes/iotcenter/nodes.html">节点列表</router-link></li>
                     <li class="breadcrumb-item active">{{node.name}}</li>
                 </ol>
             </div>
@@ -170,7 +170,7 @@
                         if (vm.node.id === item.id) {
                             if (method.indexOf('Deleted') >= 0) {
                                 console.log('node has deleted');
-                                router.push('/routes/iot/nodes.html');
+                                router.push('/routes/iotcenter/nodes.html');
                             }
                             else {
                                 vm.load();
@@ -214,4 +214,4 @@
             }
         }
     };
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/iot/nodes.html b/projects/WebMVC/wwwroot/routes/iotcenter/nodes.html
similarity index 95%
rename from projects/WebMVC/wwwroot/routes/iot/nodes.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/nodes.html
index 88b59f14..25218639 100644
--- a/projects/WebMVC/wwwroot/routes/iot/nodes.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/nodes.html
@@ -26,7 +26,7 @@
                         </h3>
                         <div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
                     </div>
-                    <router-link :to="{path:'/routes/iot/node.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/iotcenter/node.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+item.image" style="margin: 0px auto; height: 64px;">
                     </router-link>
                     <div class="card-footer text-center">
diff --git a/projects/WebMVC/wwwroot/routes/iot/organs.html b/projects/WebMVC/wwwroot/routes/iotcenter/organs.html
similarity index 100%
rename from projects/WebMVC/wwwroot/routes/iot/organs.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/organs.html
diff --git a/projects/WebMVC/wwwroot/routes/iot/product.html b/projects/WebMVC/wwwroot/routes/iotcenter/product.html
similarity index 97%
rename from projects/WebMVC/wwwroot/routes/iot/product.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/product.html
index 43082101..cecc5f19 100644
--- a/projects/WebMVC/wwwroot/routes/iot/product.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/product.html
@@ -40,7 +40,7 @@
                             </template>
                         </div>
                     </div>
-                    <router-link :to="{path:'/routes/iot/device.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
+                    <router-link :to="{path:'/routes/iotcenter/device.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
                         <img :src="baseUrl+product.image" style="margin: 0px auto; width: 64px;">
                         <div>
                             <template v-if="item.name==='光强检测器'">
@@ -177,4 +177,4 @@
             this.unsubscribe();
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/record/detail.html b/projects/WebMVC/wwwroot/routes/iotcenter/record/detail.html
similarity index 74%
rename from projects/WebMVC/wwwroot/routes/admin/record/detail.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/record/detail.html
index f086ceda..2ae037f2 100644
--- a/projects/WebMVC/wwwroot/routes/admin/record/detail.html
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/record/detail.html
@@ -1,5 +1,5 @@
-<template>
-    <display class="child" service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" :id="this.$route.query.id" @load="load">
+<template>
+    <display class="child" service="IoTCenter" area="iotcenter" entity="LiveRecord" model="LiveRecord" :id="this.$route.query.id" @load="load">
         <div style="text-align:center;background-color:#333;height:240px;">
             <video controls muted autoplay :src="src" style="margin:0 auto;height:100%;"></video>
         </div>
@@ -18,4 +18,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/record/edit.html b/projects/WebMVC/wwwroot/routes/iotcenter/record/edit.html
similarity index 100%
rename from projects/WebMVC/wwwroot/routes/admin/record/edit.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/record/edit.html
diff --git a/projects/WebMVC/wwwroot/routes/iotcenter/record/index.html b/projects/WebMVC/wwwroot/routes/iotcenter/record/index.html
new file mode 100644
index 00000000..ac4e091e
--- /dev/null
+++ b/projects/WebMVC/wwwroot/routes/iotcenter/record/index.html
@@ -0,0 +1,7 @@
+<template>
+    <list service="IoTCenter" area="iotcenter" entity="LiveRecord" model="LiveRecord" />
+</template>
+<script>
+    export default {
+    }
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/system.html b/projects/WebMVC/wwwroot/routes/iotcenter/system.html
similarity index 100%
rename from projects/WebMVC/wwwroot/routes/admin/system.html
rename to projects/WebMVC/wwwroot/routes/iotcenter/system.html
diff --git a/projects/WebMVC/wwwroot/routes/settings/setting/detail.html b/projects/WebMVC/wwwroot/routes/settings/setting/detail.html
new file mode 100644
index 00000000..82813d6c
--- /dev/null
+++ b/projects/WebMVC/wwwroot/routes/settings/setting/detail.html
@@ -0,0 +1,7 @@
+<template>
+    <display service="IoTCenter" area="iotcenter" entity="Setting" model="Setting" :id="this.$route.query.id" />
+</template>
+<script>
+    export default {
+    }
+</script>
diff --git a/projects/WebMVC/wwwroot/routes/admin/setting/edit.html b/projects/WebMVC/wwwroot/routes/settings/setting/edit.html
similarity index 99%
rename from projects/WebMVC/wwwroot/routes/admin/setting/edit.html
rename to projects/WebMVC/wwwroot/routes/settings/setting/edit.html
index 8b0e8731..763ff166 100644
--- a/projects/WebMVC/wwwroot/routes/admin/setting/edit.html
+++ b/projects/WebMVC/wwwroot/routes/settings/setting/edit.html
@@ -76,7 +76,7 @@
         data: function () {
             return {
                 service: 'IoTCenter',
-                area: "admin",
+                area: "iotcenter",
                 entity: 'Setting',
                 model: 'Setting',
                 mode: this.$route.query.mode,
diff --git a/projects/WebMVC/wwwroot/routes/settings/setting/index.html b/projects/WebMVC/wwwroot/routes/settings/setting/index.html
new file mode 100644
index 00000000..0b54d1b3
--- /dev/null
+++ b/projects/WebMVC/wwwroot/routes/settings/setting/index.html
@@ -0,0 +1,7 @@
+<template>
+    <list service="IoTCenter" area="iotcenter" entity="Setting" model="Setting" />
+</template>
+<script>
+    export default {
+    }
+</script>