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

update

Browse Source 
Former-commit-id: 84343327723ebe81f7e77308a2a84f43be183f53
Former-commit-id: 46da775b754849beacb19bcd804c9110a96256be
1.0
wanggang 5 years ago
parent be6a1895ee
commit 5d9c447289
10 changed files with 221 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
projects/IoTNode/DeviceServices/LiChuang/LCDAUE800DService.cs
Unescape View File

@ -491,7 +491,7 @@ namespace IoTNode.DeviceServices.LiChuang
var unit = this.GetUnit(name)?.ToString();
var key2 = $"{equipidex}-{key}";
var name2 = $"{equipidex}-{name}";
this.UpdateData(deviceRepo, device, device.CreateData(key, value, IoTDataType.Float, name2,unit, timestamp: timestamp));
this.UpdateData(deviceRepo, device, device.CreateData($"device-{key}", value, IoTDataType.Float, name2,unit, timestamp: timestamp));
}
}

13
projects/Platform/Views/Home/Building.cshtml
Unescape View File

@ -5,7 +5,7 @@
<br />
<div class="row">
<div class="col-2">
<div class="card" style="min-height:100%;">
<div class="card" style="height:calc(100% - 16px);">
<div class="card-header">
组织机构
</div>
@ -90,7 +90,7 @@
<div class="col-sm-1">
<div class="card bg-light p-2">
<a class="card-body text-center" href="#" style="padding:0;">
<img class="card-img-top" src="@Url.Content2(item.Image)" alt="@item.Name">
<img class="card-img-top" src="@Url.Content2(item.Image)" alt="@item.Name" style="width:48px;height:48px;">
<div>@item.Name</div>
</a>
</div>
@ -110,11 +110,12 @@
<div class="col-sm-2">
<div class="card bg-gray">
<div class="card-body bg-gray text-center">
<img class="card-img-top" src="@Url.Content2(item.Image)" alt="@item.Name">
<img class="card-img-top" src="@Url.Content2(item.Image)" alt="@item.Name" style="width:64px;height:64px;margin:0 auto;">
@*<div class="row">
<div class="col-sm-3"></div>
</div>*@
<a href="@Url.Action(null,null,new { buildingId = item.Id})">@item.Name</a>
<br />
<a class="btn btn-block btn-primary btn-sm" href="@Url.Action(null,null,new { buildingId = item.Id})">@item.Name</a>
</div>
</div>
</div>
@ -136,7 +137,7 @@
{
<div class="card-body">
<div class="row">
@foreach (var item in Model.Deviceses)
@foreach (var item in Model.Deviceses.OrderBy(o => o.ProductId))
{
try
{
@ -144,7 +145,7 @@
}
catch (Exception ex)
{
@Html.Raw(ex.Message)
@await Html.PartialAsync($"/Views/Shared/Device/default.cshtml", item)
}
}
</div>

24
projects/Platform/Views/Shared/Device/collector.cshtml
Unescape View File

@ -0,0 +1,24 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var hardware = Model.Data.FirstOrDefault(o=>o.Key=="hardware")?.Value;
var list = Model.Data.Where(o => o.Key.StartsWith("device-")).ToList();
}
<div class="col-sm-@(list.Count*2)">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools">@hardware</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row h48 text-center">
@foreach (var item in list)
{
<div class="col"><p class="h48">@item.Name @item.Value @item.Unit </p></div>
}
</div>
</div>
</div>
</div>

24
projects/Platform/Views/Shared/Device/curtain.cshtml
Unescape View File

@ -0,0 +1,24 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var state = Model.Data.FirstOrDefault(o => o.Key == "State")?.Value;
}
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools">@state</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row">
<div style="margin:0 auto;">
<img class="pointer" onclick="execApi(device.number,'/Socket/On')" src="@Url.Content2("/images/left.svg")" />
<img class="pointer" onclick="execApi(device.number,'/Socket/Stop')" src="@Url.Content2("/images/stop.svg")" />
<img class="pointer" onclick="execApi(device.number,'/Socket/Off')" src="@Url.Content2("/images/right.svg")" />
</div>
</div>
</div>
</div>
</div>

22
projects/Platform/Views/Shared/Device/default.cshtml
Unescape View File

@ -0,0 +1,22 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools">@Model.Icon</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row h48 text-center">
<p class="h48 margin0auto">
@foreach (var item in Model.Data)
{
<p>
@item.Key:@item.Value
</p>}
</div>
</div>
</div>
</div>

22
projects/Platform/Views/Shared/Device/gateway.cshtml
Unescape View File

@ -0,0 +1,22 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var version = Model.Data.FirstOrDefault(o => o.Key == "Version");
var count = Model.Data.FirstOrDefault(o => o.Key == "DeviceCount");
}
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools"></div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row h48 text-center">
<div class="h24">@version?.Name : @version?.Value @version?.Unit @version?.Description </div>
<div class="h24">@count?.Name : @count?.Value @count?.Unit @count?.Description </div>
</div>
</div>
</div>
</div>

22
projects/Platform/Views/Shared/Device/humiture.cshtml
Unescape View File

@ -0,0 +1,22 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var temperature = Model.Data.FirstOrDefault(o => o.Key == "Temperature");
var humiture = Model.Data.FirstOrDefault(o => o.Key == "Humidity");
}
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools"></div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row h48 text-center">
<div class="h24">@temperature?.Name : @temperature?.Value @temperature?.Unit @temperature?.Description </div>
<div class="h24">@humiture?.Name : @humiture?.Value @humiture?.Unit @humiture?.Description </div>
</div>
</div>
</div>
</div>

23
projects/Platform/Views/Shared/Device/smoke.cshtml
Unescape View File

@ -0,0 +1,23 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var data = Model.Data.FirstOrDefault(o => o.Key == "Warning");
var value = data?.Value;
var unit = data?.Unit;
var desc = data?.Description;
}
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools">@desc</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row h48 text-center">
<p class="h48 margin0auto">@value @unit </p>
</div>
</div>
</div>
</div>

61
projects/Platform/Views/Shared/Device/socket.cshtml
Unescape View File

@ -2,6 +2,8 @@
@{
var state = Model.Data.FirstOrDefault(o => o.Key == "State")?.Value;
var isOpend = Model.Data.Any(o => o.Key == "State" && o.Value == "开");
var electricity = Model.Data.FirstOrDefault(o => o.Key == "Electricity");
var power = Model.Data.FirstOrDefault(o => o.Key == "Power");
}
<div class="col-sm-2">
<div class="card bg-light">
@ -10,19 +12,52 @@
<div class="card-tools">@state</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row">
@if (isOpend)
{
<img class="pointer" onclick="execApi(device.number,'/Socket/Off')" src="@Url.Content2("/images/off.svg")" />
}
else
{
<img class="pointer" onclick="execApi(device.number,'/Socket/On')" src="@Url.Content2("/images/on.svg")" />
}
</div>
@if (electricity == null && power == null)
{
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row">
@if (isOpend)
{
<img class="pointer" onclick="execApi(device.number,'/Socket/Off')" src="@Url.Content2("/images/off.svg")" />
}
else
{
<img class="pointer" onclick="execApi(device.number,'/Socket/On')" src="@Url.Content2("/images/on.svg")" />
}
</div>
}
else
{
<div class="row">
<div class="col">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row">
@if (isOpend)
{
<img class="pointer" onclick="execApi(device.number,'/Socket/Off')" src="@Url.Content2("/images/off.svg")" />
}
else
{
<img class="pointer" onclick="execApi(device.number,'/Socket/On')" src="@Url.Content2("/images/on.svg")" />
}
</div>
</div>
<div class="col" style="padding-top:24px;">
@if (electricity != null)
{
<div class="h24">@electricity.Name:@electricity.Value @electricity.Unit</div>
}
@if (power != null)
{
<div class="h24">@power.Name:@power.Value @power.Unit</div>
}
</div>
</div>
}
</div>
</div>
</div>

28
projects/Platform/Views/Shared/Device/switch1.cshtml
Unescape View File

@ -0,0 +1,28 @@
@model IoT.Shared.Application.Domain.Entities.IoTDevice
@{
var state = Model.Data.FirstOrDefault(o => o.Key == "State")?.Value;
var isOpend = Model.Data.Any(o => o.Key == "State" && o.Value == "开");
}
<div class="col-sm-2">
<div class="card bg-light">
<div class="card-header">
<h5 class="card-title">@(Model.DisplayName??Model.Name)</h5>
<div class="card-tools">@state</div>
</div>
<div class="card-body device">
<div class="row">
<img class="icon" src="@Url.Content2(Model.Product.Image)" />
</div>
<div class="row">
@if (isOpend)
{
<img class="pointer" onclick="execApi(device.number,'/Socket/Off')" src="@Url.Content2("/images/off.svg")" />
}
else
{
<img class="pointer" onclick="execApi(device.number,'/Socket/On')" src="@Url.Content2("/images/on.svg")" />
}
</div>
</div>
</div>
</div>
Write Preview
Loading…
Cancel
Save