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

update

Browse Source 
Former-commit-id: e3b3bd29bc0038d40466a11895bb7435f5bee481
TangShanKaiPing
wanggang 6 years ago
parent a280e9f9a0
commit a8d40bbf7c
10 changed files with 121 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
projects/ApiGateway/Program.cs
Unescape View File

@ -14,7 +14,7 @@ namespace ApiGateway
{
o.Port = 80;
o.LogToConsole = true;
o.LogLevel = BeetleX.EventArgs.LogType.Error;
o.LogLevel = BeetleX.EventArgs.LogType.All;
});
Console.WriteLine("http://localhost/__system/bumblebee/routes.html");
gateway.Open();

5
projects/WebApp/Startup.cs
Unescape View File

@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;

16
projects/WebApp/wwwroot/css/app.css
Unescape View File

@ -719,8 +719,16 @@ ul {
right: 0;
border-radius: unset;
}
/*bootstrap4+mintuui*/
label,h1{
margin-top:auto;
margin-bottom:auto;
/*bootstrap4+weui*/
[class^="weui"]{
box-sizing:initial;
}
p[class^="weui"]{
margin-bottom: 0;
}
a:hover{
text-decoration:none;
}
label,h1{
margin-bottom:initial;
}

32
projects/WebApp/wwwroot/pages/home.html
Unescape View File

@ -4,23 +4,21 @@
<h2>消息</h2>
</div>
<div class="weui-tab__content">
<div class="weui-panel__hd">物联网</div>
<div class="weui-panel__bd">
<div class="col-md-12">
<div class="row">
<router-link to="/pages/iot/products" class="col-lg-3 col-md-4 col-sm-6 p-5">
<div class="weui-grid__icon">
<i class="ion ion-md-laptop weui-tabbar__icon"></i>
</div>
<p class="weui-grid__label">设备</p>
</router-link>
<router-link to="/pages/iot/nodes" class="col-lg-3 col-md-4 col-sm-6 p-5">
<div class="weui-grid__icon">
<i class="ion ion-md-share weui-tabbar__icon"></i>
</div>
<p class="weui-grid__label">智慧教室</p>
</router-link>
</div>
<div class="col-md-12 my-2">物联网</div>
<div class="col-md-12">
<div class="row">
<router-link to="/pages/iot/products" class="col-md-2 col-sm-3 col-4 p-1">
<div class="weui-grid__icon">
<i class="ion ion-md-laptop weui-tabbar__icon"></i>
</div>
<p class="weui-grid__label">设备</p>
</router-link>
<router-link to="/pages/iot/nodes" class="col-md-2 col-sm-3 col-4 p-1">
<div class="weui-grid__icon">
<i class="ion ion-md-share weui-tabbar__icon"></i>
</div>
<p class="weui-grid__label">智慧教室</p>
</router-link>
</div>
</div>
</div>

91
projects/WebApp/wwwroot/pages/iot/node.html
Unescape View File

@ -15,11 +15,11 @@
</div>
</div>
</div>
<div class="col-md-12 py-2">环境</div>
<!--环境-->
<div class="col-md-12 my-2">环境</div>
<div class="row">
<!--光强检测器-->
<div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('光强检测器')">
<div class="col-md-2 col-sm-3 col-4" v-for="device in getDevices('光强检测器')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
@ -50,7 +50,7 @@
</div>
</div>
<!--温湿度传感器-->
<div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('温湿度传感器')">
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('温湿度传感器')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
@ -93,7 +93,7 @@
</div>
</div>
<!--烟雾报警器-->
<div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('烟雾报警器')">
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('烟雾报警器')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
@ -123,7 +123,7 @@
</div>
</div>
<!--人体感应器-->
<div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('人体感应器')">
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('人体感应器')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
@ -153,6 +153,87 @@
</div>
</div>
</div>
<!--电器-->
<div class="col-md-12 my-2">用电</div>
<div class="row">
<!--窗帘电机-->
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('窗帘电机')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
<span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
<span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
</div>
<div class="card-body">
<div class="row" style="height:100px;">
<div class="col-md-6 col-sm-6 text-center">
<img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
</div>
<div class="col-md-6 col-sm-6">
<div class="row" style="line-height:28px;">
<img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/On')" src="/IoTCenter/images/left.png" />
<img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/Stop')" src="/IoTCenter/images/stop.png" />
<img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/Off')" src="/IoTCenter/images/right.png" />
</div>
</div>
</div>
</div>
</div>
</div>
<!--一路开关-->
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('三路开关')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
<span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
<span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
</div>
<div class="card-body">
<div class="row" style="height:100px;">
<div class="col-md-6 col-sm-6 text-center">
<img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
</div>
<div class="col-md-6 col-sm-6">
<div class="row" style="line-height:28px;">
<img v-if="getDataValue(device.number,'L1状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L1Off')" src="/IoTCenter/images/on.png" />
<img v-if="getDataValue(device.number,'L1状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L1On')" src="/IoTCenter/images/off.png" />
<img v-if="getDataValue(device.number,'L2状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L2Off')" src="/IoTCenter/images/on.png" />
<img v-if="getDataValue(device.number,'L2状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L2On')" src="/IoTCenter/images/off.png" />
<img v-if="getDataValue(device.number,'L3状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L3Off')" src="/IoTCenter/images/on.png" />
<img v-if="getDataValue(device.number,'L3状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L3On')" src="/IoTCenter/images/off.png" />
</div>
</div>
</div>
</div>
</div>
</div>
<!--智能插座-->
<div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('智能插座')">
<div class="card mb-4">
<div class="card-header">
{{device.displayName}}
<span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
<span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
</div>
<div class="card-body">
<div class="row" style="height:100px;">
<div class="col-md-6 col-sm-6 text-center">
<img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
</div>
<div class="col-md-6 col-sm-6">
<div class="row" style="line-height:28px;">
<img v-if="getDataValue(device.number,'状态')==='开'" v-on:click="CallApi(device.number,'/Socket/Off')" src="/IoTCenter/images/on.png" :data-status="getDataValue(device.number,'状态')" />
<img v-if="getDataValue(device.number,'状态')==='关'" v-on:click="CallApi(device.number,'/Socket/On')" src="/IoTCenter/images/off.png" :data-status="getDataValue(device.number,'状态')" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--test-->
<hr />
<div class="col-md-12" v-if="node">
<div class="row">
<template v-if="node">

3
projects/WebApp/wwwroot/pages/iot/node.js
Unescape View File

@ -34,6 +34,9 @@
}
return null;
},
getDataValue: function (number, name) {
return this.getDeviceDataAttr(number, name, 'value');
},
},
computed: {
node: function () {

2
projects/WebApp/wwwroot/pages/iot/nodes.html
Unescape View File

@ -6,7 +6,7 @@
</mt-header>
<div class="col-md-12">
<div class="row">
<router-link v-for="node in nodes" :to="{path:'/pages/iot/node',query:{number:node.number}}" class="col-lg-3 col-md-4 col-sm-6 p-5">
<router-link v-for="node in nodes" :to="{path:'/pages/iot/node',query:{number:node.number}}" class="col-md-2 col-sm-3 col-4 p-1">
<div class="weui-grid__icon">
<img :src="'/IoTCenter'+node.image" />
</div>

2
projects/WebApp/wwwroot/pages/iot/products.html
Unescape View File

@ -6,7 +6,7 @@
</mt-header>
<div class="col-md-12">
<div class="row">
<router-link v-for="product in products" :to="{path:'/pages/iot/product',query:{number:product.number}}" class="col-lg-3 col-md-4 col-sm-6 p-5">
<router-link v-for="product in products" :to="{path:'/pages/iot/product',query:{number:product.number}}" class="col-md-2 col-sm-3 col-4 p-1">
<div class="weui-grid__icon">
<img :src="'/IoTCenter'+product.image" />
</div>

4
projects/WebApp/wwwroot/pages/login.html
Unescape View File

@ -19,9 +19,7 @@
</div>
</div>
</div>
<div class="weui-form__opr-area">
<a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" v-on:click="submit()">确定</a>
</div>
<a class="weui-btn weui-btn_primary my-3" href="javascript:" id="showTooltips" v-on:click="submit()">确定</a>
</form>
<div class="weui-footer weui-footer_fixed-bottom">
<p class="weui-footer__text">Copyright © 2020</p>

2
projects/gateway/src/main/resources/application.yml
Unescape View File

@ -59,7 +59,7 @@ spring:
filters:
- StripPrefix=0
- id: WebUI
uri: http://localhost:8020/
uri: http://localhost:8030/
predicates:
- Path=/**
filters:

Write Preview
Loading…
Cancel
Save