wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Platform:1.1.0.7

Browse Source 
IoTNode:1.1.0.3

Former-commit-id: 79d11e009a449e6acb807e155a92cbe8ea1455c0
Former-commit-id: 8469b4624af821a71379e1c064d0c6b3ac1ca56f
1.0
wanggang 5 years ago
parent 9bb50af4f3
commit c611231a3d
28 changed files with 219 additions and 218 deletions
Show Stats Download Patch File Download Diff File

48
projects/IoTNode/IoTNode.csproj
Unescape View File

@ -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" />

8
projects/Platform/Areas/IoTCenter/Views/Shared/_Menu.cshtml
Unescape View File

@ -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")">

2
projects/Platform/Platform.csproj
Unescape View File

@ -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" />

4
projects/Platform/Views/Shared/_TopMenu.cshtml
Unescape View File

@ -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>

265
projects/WebMVC/wwwroot/components/shared/layout.html
Unescape View File

@ -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>
}</script>

2
projects/WebMVC/wwwroot/js/iot.js
Unescape View File

@ -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>');

7
projects/WebMVC/wwwroot/routes/admin/command/detail.html
Unescape View File

@ -1,7 +0,0 @@
<template>
<display service="IoTCenter" area="admin" entity="Command" model="Command" :id="this.$route.query.id" />
</template>
<script>
export default {
}
</script>

7
projects/WebMVC/wwwroot/routes/admin/command/index.html
Unescape View File

@ -1,7 +0,0 @@
<template>
<list service="IoTCenter" area="admin" entity="Command" model="Command" />
</template>
<script>
export default {
}
</script>

7
projects/WebMVC/wwwroot/routes/admin/record/index.html
Unescape View File

@ -1,7 +0,0 @@
<template>
<list service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" />
</template>
<script>
export default {
}
</script>

7
projects/WebMVC/wwwroot/routes/admin/setting/detail.html
Unescape View File

@ -1,7 +0,0 @@
<template>
<display service="IoTCenter" area="admin" entity="Setting" model="Setting" :id="this.$route.query.id" />
</template>
<script>
export default {
}
</script>

7
projects/WebMVC/wwwroot/routes/admin/setting/index.html
Unescape View File

@ -1,7 +0,0 @@
<template>
<list service="IoTCenter" area="admin" entity="Setting" model="Setting" />
</template>
<script>
export default {
}
</script>

4
projects/WebMVC/wwwroot/routes/home.html
Unescape View File

@ -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>
</script>

7
projects/WebMVC/wwwroot/routes/iotcenter/command/detail.html
Unescape View File

@ -0,0 +1,7 @@
<template>
<display service="IoTCenter" area="iotcenter" entity="Command" model="Command" :id="this.$route.query.id" />
</template>
<script>
export default {
}
</script>

2
projects/WebMVC/wwwroot/routes/admin/command/edit.html → projects/WebMVC/wwwroot/routes/iotcenter/command/edit.html
Unescape View File

@ -172,7 +172,7 @@
data: function () {
return {
service: 'IoTCenter',
area: "admin",
area: "iotcenter",
entity: 'Command',
model: 'Command',
mode: this.$route.query.mode,

7
projects/WebMVC/wwwroot/routes/iotcenter/command/index.html
Unescape View File

@ -0,0 +1,7 @@
<template>
<list service="IoTCenter" area="iotcenter" entity="Command" model="Command" />
</template>
<script>
export default {
}
</script>

4
projects/WebMVC/wwwroot/routes/iot/device.html → projects/WebMVC/wwwroot/routes/iotcenter/device.html
Unescape View File

@ -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>
</script>

8
projects/WebMVC/wwwroot/routes/admin/index.html → projects/WebMVC/wwwroot/routes/iotcenter/index.html
Unescape View File

@ -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>
</script>

6
projects/WebMVC/wwwroot/routes/iot/node.html → projects/WebMVC/wwwroot/routes/iotcenter/node.html
Unescape View File

@ -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>
</script>

2
projects/WebMVC/wwwroot/routes/iot/nodes.html → projects/WebMVC/wwwroot/routes/iotcenter/nodes.html
Unescape View File

@ -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">

0
projects/WebMVC/wwwroot/routes/iot/organs.html → projects/WebMVC/wwwroot/routes/iotcenter/organs.html
Unescape View File

4
projects/WebMVC/wwwroot/routes/iot/product.html → projects/WebMVC/wwwroot/routes/iotcenter/product.html
Unescape View File

@ -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>
</script>

6
projects/WebMVC/wwwroot/routes/admin/record/detail.html → projects/WebMVC/wwwroot/routes/iotcenter/record/detail.html
Unescape View File

@ -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>
</script>

0
projects/WebMVC/wwwroot/routes/admin/record/edit.html → projects/WebMVC/wwwroot/routes/iotcenter/record/edit.html
Unescape View File

7
projects/WebMVC/wwwroot/routes/iotcenter/record/index.html
Unescape View File

@ -0,0 +1,7 @@
<template>
<list service="IoTCenter" area="iotcenter" entity="LiveRecord" model="LiveRecord" />
</template>
<script>
export default {
}
</script>

0
projects/WebMVC/wwwroot/routes/admin/system.html → projects/WebMVC/wwwroot/routes/iotcenter/system.html
Unescape View File

7
projects/WebMVC/wwwroot/routes/settings/setting/detail.html
Unescape View File

@ -0,0 +1,7 @@
<template>
<display service="IoTCenter" area="iotcenter" entity="Setting" model="Setting" :id="this.$route.query.id" />
</template>
<script>
export default {
}
</script>

2
projects/WebMVC/wwwroot/routes/admin/setting/edit.html → projects/WebMVC/wwwroot/routes/settings/setting/edit.html
Unescape View File

@ -76,7 +76,7 @@
data: function () {
return {
service: 'IoTCenter',
area: "admin",
area: "iotcenter",
entity: 'Setting',
model: 'Setting',
mode: this.$route.query.mode,

7
projects/WebMVC/wwwroot/routes/settings/setting/index.html
Unescape View File

@ -0,0 +1,7 @@
<template>
<list service="IoTCenter" area="iotcenter" entity="Setting" model="Setting" />
</template>
<script>
export default {
}
</script>
Write Preview
Loading…
Cancel
Save