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

update

Browse Source 
Former-commit-id: 0cb9eb7268f05100ae849b45c10fa67cb8285bba
Former-commit-id: 94407fbdf493dab0f8513c5547f400c75aa32170
TangShanKaiPing
wanggang 5 years ago
parent 653e821de5
commit d9eabd60c6
20 changed files with 2363 additions and 2216 deletions
Show Stats Download Patch File Download Diff File

128
projects/WebMVC/libman.json
Unescape View File

@ -0,0 +1,128 @@
{
"version": "1.0",
"defaultProvider": "cdnjs",
"libraries": [
{
"library": "jquery@3.5.1",
"destination": "wwwroot/lib/jquery",
"files": [ "jquery.min.js" ]
},
{
"library": "jquery.serializeJSON@2.9.0",
"destination": "wwwroot/lib/jquery.serializeJSON",
"files": [ "jquery.serializejson.min.js" ]
},
{
"library": "axios@0.19.2",
"destination": "wwwroot/lib/axios"
},
{
"library": "pubsub-js@1.8.0",
"destination": "wwwroot/lib/pubsub-js",
"files": [ "pubsub.min.js" ]
},
{
"library": "moment.js@2.26.0",
"destination": "wwwroot/lib/moment.js",
"files": [ "locale/zh-cn.js", "moment.min.js" ]
},
{
"library": "vue@2.6.11",
"destination": "wwwroot/lib/vue",
"files": [ "vue.min.js" ]
},
{
"library": "vue-router@3.2.0",
"destination": "wwwroot/lib/vue-router",
"files": [ "vue-router.min.js" ]
},
{
"library": "vuex@3.2.0",
"destination": "wwwroot/lib/vuex",
"files": [ "vuex.min.js" ]
},
{
"library": "popper.js@2.4.2",
"destination": "wwwroot/lib/popper.js",
"files": [ "umd/popper.min.js" ]
},
{
"library": "twitter-bootstrap@4.5.0",
"destination": "wwwroot/lib/bootstrap",
"files": [ "css/bootstrap.min.css", "js/bootstrap.min.js" ]
},
{
"library": "bootstrap-vue@2.15.0",
"destination": "wwwroot/lib/bootstrap-vue",
"files": [ "bootstrap-vue.min.css", "bootstrap-vue.min.js" ]
},
{
"library": "ant-design-vue@1.5.3",
"destination": "wwwroot/lib/ant-design-vue",
"files": [ "antd.min.css", "antd.min.js" ]
},
{
"library": "element-ui@2.13.2",
"destination": "wwwroot/lib/element-ui",
"files": [ "index.js", "theme-chalk/**" ]
},
{
"library": "admin-lte@3.0.5",
"destination": "wwwroot/lib/admin-lte",
"files": [ "css/adminlte.min.css", "js/adminlte.min.js" ]
},
{
"provider": "unpkg",
"library": "jwt-decode@2.2.0",
"destination": "wwwroot/lib/jwt-decode",
"files": [ "build/jwt-decode.min.js" ]
},
{
"library": "admin-lte@3.0.5",
"destination": "wwwroot/lib/admin-lte",
"files": [ "css/adminlte.min.css", "js/adminlte.min.js" ]
},
{
"provider": "unpkg",
"library": "@fortawesome/fontawesome-free@5.13.0",
"destination": "wwwroot/lib/fontawesome-free",
"files": [ "css/all.min.css", "webfonts/**" ]
},
{
"provider": "unpkg",
"library": "sweetalert2@9.15.2",
"destination": "wwwroot/lib/sweetalert2",
"files": [ "dist/sweetalert2.all.min.js", "dist/sweetalert2.min.css" ]
},
{
"library": "ionicons@4.6.3",
"destination": "wwwroot/lib/ionicons",
"files": [ "css/ionicons.min.css", "fonts/**" ]
},
{
"library": "weui@2.3.0",
"destination": "wwwroot/lib/weui",
"files": [ "style/weui.min.css" ]
},
{
"library": "microsoft-signalr@3.1.3",
"destination": "wwwroot/lib/signalr",
"files": [ "signalr.min.js" ]
},
{
"library": "linq.js@3.2.2",
"destination": "wwwroot/lib/linq.js",
"files": [ "linq.min.js" ]
},
{
"library": "Chart.js@2.9.3",
"destination": "wwwroot/lib/chart.js/",
"files": [ "Chart.bundle.min.js" ]
},
{
"library": "flv.js@1.5.0",
"destination": "wwwroot/lib/flv.js/",
"files": [ "flv.min.js" ]
}
]
}

58
projects/WebMVC/wwwroot/components/device/ir.html
Unescape View File

@ -1,29 +1,28 @@
<template>
<div>
<div class="card" style="box-sizing:border-box;min-height:490px;margin:10px;">
<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 class="card" :id="device.number" style="box-sizing:border-box;min-height:490px;margin:10px;">
<div class="card-header d-flex" style="height:50px;">
<div class="card-title">{{device.displayName}}</div>
<ul class="nav nav-pills ml-auto">
<li class="nav-item">
<a id="tv-tab" :href="'#tv-'+device.number" class="nav-link active" data-toggle="tab" aria-controls="tv" aria-selected="true" style="padding:2px 8px">电视</a>
</li>
<li class="nav-item">
<a id="air-tab" :href="'#air'+device.number" class="nav-link" data-toggle="tab" aria-controls="air" aria-selected="false" style="padding:2px 8px">空调</a>
</li>
<li class="nav-item">
<a id="box-tab" :href="'#box'+device.number" class="nav-link" data-toggle="tab" aria-controls="box" aria-selected="false" style="padding:2px 8px">机顶盒</a>
</li>
<li class="nav-item">
<a id="diy-tab" :href="'#diy'+device.number" class="nav-link" data-toggle="tab" aria-controls="diy" aria-selected="false" style="padding:2px 8px">自定义</a>
</li>
</ul>
</div>
<div class="card-body" style="padding:10px;">
<div class="nav-tabs-custom">
<ul class="nav nav-tabs" role="tablist" id="myTab" style="font-size: 14px;">
<li class="nav-item">
<a id="tv-tab" href="#tv" class="nav-link active" role="tab" aria-controls="tv" aria-selected="true" style="padding:8px">电视</a>
</li>
<li class="nav-item">
<a id="air-tab" href="#air" class="nav-link" role="tab" aria-controls="air" aria-selected="false" style="padding:8px">空调</a>
</li>
<li class="nav-item">
<a id="box-tab" href="#box" class="nav-link" role="tab" aria-controls="box" aria-selected="false" style="padding:8px">机顶盒</a>
</li>
<li class="nav-item">
<a id="diy-tab" href="#diy" class="nav-link" role="tab" aria-controls="diy" aria-selected="false" style="padding:8px">自定义</a>
</li>
</ul>
<div class="tab-content" style="padding:20px;">
<div id="tv" class="tab-pane fade show active" role="tabpanel" aria-labelledby="tv-tab">
<div :id="'tv'+device.number" class="tab-pane fade show active" role="tabpanel" aria-labelledby="tv-tab">
<table style="margin: 20px auto;">
<tr>
<td>
@ -154,7 +153,7 @@
</tr>
</table>
</div>
<div id="air" class="tab-pane fade" role="tabpanel" aria-labelledby="air-tab">
<div :id="'air'+device.number" class="tab-pane fade" role="tabpanel" aria-labelledby="air-tab">
<table style="margin: 50px auto;">
<tr>
<td>
@ -197,7 +196,7 @@
</tr>
</table>
</div>
<div id="box" class="tab-pane fade" role="tabpanel" aria-labelledby="box-tab">
<div :id="'box'+device.number" class="tab-pane fade" role="tabpanel" aria-labelledby="box-tab">
<table style="margin: 20px auto;">
<tr>
<td>
@ -326,7 +325,7 @@
</tr>
</table>
</div>
<div id="diy" class="tab-pane fade" role="tabpanel" aria-labelledby="diy-tab">
<div :id="'diy'+device.number" class="tab-pane fade" role="tabpanel" aria-labelledby="diy-tab">
<div class="button-sp-area cell" style="width:100%;height:100%;overflow:auto;">
<button v-for="button in getCustomButtons()" type="button" class="btn btn-default px-2 m-2 btn-sm" :value="button.value" v-on:click="send($event.target.value,5)">{{button.name}}</button>
</div>
@ -385,10 +384,15 @@
export default {
props: ['device', 'edit'],
mounted: function () {
//weui.tab('.weui-tab');
$('#myTab a').on('click', function (e) {
e.preventDefault()
$(this).tab('show')
var number = this.device.number;
this.$nextTick(function () {
$(document).on('click', '#' + number + ' .nav-link:not(.active)', function () {
$('#' + number + ' .nav-link.active').removeClass('active');
$(this).addClass('active');
$('#' + number + ' .tab-pane.active').removeClass('active');
$($(this).attr('href')).addClass('active').addClass('show');
return false;
});
});
},
methods: {

2
projects/WebMVC/wwwroot/components/device/light.html
Unescape View File

@ -20,7 +20,7 @@
<span v-else class="text-danger mx-2" style="font-size:28px;">
{{getDeviceDataDescription(device,'光照度')}}
</span>
{{getDeviceData(device,'光照度')}}
{{getDeviceData(device,'温度')}} {{getDeviceData(device,'湿度')}}
</span>
</div>
</div>

BIN
projects/WebMVC/wwwroot/favicon.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
projects/WebMVC/wwwroot/images/button.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

2
projects/WebMVC/wwwroot/index.html
Unescape View File

@ -11,6 +11,7 @@
<!--<link rel="stylesheet" href="lib/ant-design-vue/antd.min.css" />-->
<!--<link rel="stylesheet" href="lib/element-ui/theme-chalk/index.css" />-->
<link rel="stylesheet" href="lib/weui/style/weui.min.css" />
<link rel="stylesheet" href="lib/sweetalert2/dist/sweetalert2.min.css" />
<link rel="stylesheet" href="css/site.css" />
<title></title>
</head>
@ -38,6 +39,7 @@
<script src="lib/signalr/signalr.min.js"></script>
<script src="lib/chart.js/Chart.bundle.min.js"></script>
<script src="lib/flv.js/flv.min.js"></script>
<script src="lib/sweetalert2/dist/sweetalert2.all.min.js"></script>
<!--<script src="lib/toastr.js/toastr.min.js"></script>-->
<!--<script src="lib/bootstrap/js/bootstrap.min.js"></script>-->
<!--<script src="lib/bootstrap-vue/bootstrap-vue.min.js"></script>-->

8
projects/WebMVC/wwwroot/js/common.js
Unescape View File

@ -106,7 +106,7 @@ function execScene(id) {
console.log(error);
})
.finally(function () {
loading.show();
loading.hide();
});
}
@ -120,7 +120,7 @@ function nodePower(number, command) {
console.log(error);
})
.finally(function () {
loading.show();
loading.hide();
});
}
@ -134,11 +134,11 @@ function nodeMethod(number, method) {
console.log(error);
})
.finally(function () {
loading.show();
loading.hide();
});
}
//
function Select(e) {
function selectNode(e) {
var checkbox = $(e.target);
if (checkbox.hasClass('checkall')) {
if (e.target.checked) {

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

@ -1,4 +1,4 @@
var config = {
baseUrl: window.location.protocol + '//' + window.location.host,
baseUrl: 'http://localhost',//window.location.protocol + '//' + window.location.hostname,
isMobile: /(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent)
};

6
projects/WebMVC/wwwroot/lib/ionicons/css/ionicons.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
projects/WebMVC/wwwroot/lib/ionicons/fonts/ionicons.eot
View File

Binary file not shown.

4204
projects/WebMVC/wwwroot/lib/ionicons/fonts/ionicons.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
projects/WebMVC/wwwroot/lib/ionicons/fonts/ionicons.ttf
View File

Binary file not shown.

BIN
projects/WebMVC/wwwroot/lib/ionicons/fonts/ionicons.woff
View File

Binary file not shown.

BIN
projects/WebMVC/wwwroot/lib/ionicons/fonts/ionicons.woff2
View File

Binary file not shown.

2
projects/WebMVC/wwwroot/lib/sweetalert2/dist/sweetalert2.all.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
projects/WebMVC/wwwroot/lib/sweetalert2/dist/sweetalert2.min.css vendored
View File

File diff suppressed because one or more lines are too long

30
projects/WebMVC/wwwroot/pages/home.html
Unescape View File

@ -1,6 +1,6 @@
<template>
<layout v-bind:title="title">
<div class="row overlay-wrapper">
<div class="row">
<div class="col-md-2 col-sm-4 col-xs-6" v-for="item in products">
<div class="card">
<div class="card-header">
@ -13,6 +13,22 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">平台场景</h3>
<div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{scenes.count}}</span></div>
</div>
<div class="card-body">
<a class="btn btn-app" href="javascript:;" v-for="scene in scenes" v-on:click="execScene(scene.id)">
<img :src="config.baseUrl+scene.image" style="height:20px;max-width:68px;" />
<div>{{scene.name}}</div>
</a>
</div>
</div>
</div>
</div>
</layout>
</template>
<script>
@ -20,10 +36,14 @@
data: function () {
return {
title: '产品列表',
getProductsApi: '/IoTCenter/api/v1/product/getProducts',
getScenesApi: '/IoTCenter/api/v1/scene/getScenes',
url: '/IoTCenter/api/v1/product/getProducts',
products: [],
scenes: [],
events: ['ProductEntityInserted', 'ProductEntityUpdated', 'ProductEntityDeleted',
'DeviceEntityInserted', 'DeviceEntityUpdated', 'DeviceEntityDeleted']
'DeviceEntityInserted', 'DeviceEntityUpdated', 'DeviceEntityDeleted',
'SceneEntityInserted', 'SceneEntityUpdated', 'SceneEntityDeleted']
}
},
mounted: function () {
@ -32,11 +52,13 @@
},
methods: {
load() {
var url = config.baseUrl + this.url;
var vm = this;
axios.post(url).then(function (response) {
axios.post(config.baseUrl + this.getProductsApi).then(function (response) {
vm.products = response.data;
});
axios.post(config.baseUrl + this.getScenesApi).then(function (response) {
vm.scenes = response.data;
});
},
subscribe() {
var vm = this;

5
projects/WebMVC/wwwroot/pages/node.html
Unescape View File

@ -6,7 +6,10 @@
<div class="card" style="margin:10px;">
<div class="card-header">{{node.name}}的场景</div>
<div class="card-body">
<button class="btn btn-success" v-for="scene in node.scenes" v-on:click="execScene(scene.id)">{{scene.name}}</button>
<a class="btn btn-app" href="javascript:;" v-for="scene in node.scenes" v-on:click="execScene(scene.id)">
<img :src="config.baseUrl+scene.image" style="height:20px;max-width:68px;" />
<div>{{scene.name}}</div>
</a>
</div>
</div>
</div>

35
projects/WebMVC/wwwroot/pages/nodes.html
Unescape View File

@ -1,10 +1,26 @@
<template>
<layout v-bind:title="title">
<div class="row overlay-wrapper">
<div class="col-md-12" v-if="nodes.length">
<div class="card">
<div class="card-header">
<div class="card-title">
<input type="checkbox" id="All" class="checkall" v-on:change="SelectNode($event)" />
<label for="All" class="btn btn-sm btn-info" style="height:31px;margin-bottom:0;">全选</label>
<button class="btn btn-sm btn-info uncheck" v-on:click="SelectNode($event)">反选</button>
</div>
<div class="card-tools">
<button class="btn btn-success" v-on:click="Power('On')">开</button>
<button class="btn btn-success" v-on:click="Power('Off')">关</button>
</div>
</div>
</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6" v-for="item in nodes">
<div class="card">
<div class="card-header">
<h3 class="card-title">
<input type="checkbox" name="numbers[]" class="item" :value="item.number" v-on:change="SelectNode($event)">
<span v-if="item.isOnline" style="color:green;">{{item.name}}</span>
<span v-else style="color:red;">{{item.name}}</span>
</h3>
@ -13,6 +29,10 @@
<router-link :to="{path:'/pages/node.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
<img :src="config.baseUrl+item.image" style="margin: 0px auto; width: 64px;">
</router-link>
<div class="card-footer text-center">
<button class="btn btn-success" v-on:click="nodePower(item.number,'On')">开</button>
<button class="btn btn-success" v-on:click="nodePower(item.number,'Off')">关</button>
</div>
</div>
</div>
</div>
@ -40,6 +60,21 @@
vm.nodes = response.data;
});
},
SelectNode: selectNode,
Power(method) {
var numbers = [];
$('.item:checked').each(function () {
numbers.push($(this).val());
});
if (numbers.length) {
for (var i = 0; i < numbers.length; i++) {
nodePower(numbers[i], method);
}
}
else {
Swal.fire('没有选中任何项');
}
},
subscribe() {
var vm = this;
subscribe(this.events, function (method, data) {

96
projects/WebMVC/wwwroot/pages/product.html
Unescape View File

@ -1,15 +1,59 @@
<template>
<layout v-bind:title="title">
<div class="row mb-2">
<div class="col-sm-6">
<h1>{{product.name}}</h1>
</div>
<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 active">{{product.name}}</li>
</ol>
</div>
</div>
<div class="row overlay-wrapper">
<div class="col-md-12" v-if="HasBatchCommand()">
<div class="card">
<div class="card-header">
<div class="card-title">
<input type="checkbox" id="All" class="checkall" v-on:change="SelectDevice($event)" />
<label for="All" class="btn btn-sm btn-info" style="height:31px;margin-bottom:0;">全选</label>
<button class="btn btn-sm btn-info uncheck" v-on:click="SelectDevice($event)">反选</button>
</div>
<div class="card-tools">
<button class="btn btn-success" v-on:click="CallApiAll('On')">开</button>
<button class="btn btn-success" v-on:click="CallApiAll('Stop')" v-if="product.name.indexOf('窗帘电机')>=0">停</button>
<button class="btn btn-success" v-on:click="CallApiAll('Off')">关</button>
</div>
</div>
</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6" v-for="item in product.devices">
<div class="card">
<div class="card-header">
<h3 class="card-title">{{item.displayName||item.name}}</h3>
<div class="card-tools"><span data-toggle="tooltip" class="badge bg-green">{{item.count}}</span></div>
<h3 class="card-title">
<label style="font-weight:normal;"><input type="checkbox" name="numbers[]" class="item" :value="item.number" v-if="HasBatchCommand()" v-on:change="SelectDevice($event)">{{item.name}}</label>
</h3>
<div class="card-tools">
<template v-if="HasBatchCommand()">
{{GetDataValue(item.number,'状态')}}
</template>
</div>
</div>
<router-link :to="{path:'/pages/device.html',query:{number:item.number}}" class="card-body" style="display: block; text-align: center;">
<img :src="config.baseUrl+product.image" style="margin: 0px auto; width: 64px;">
<div>
<template v-if="item.name==='光强检测器'">
{{GetDataValue(item.number,'光照度')}}
</template>
<template v-else-if="item.name==='温湿度传感器'">
{{GetDataValue(item.number,'温度')}}℃ {{GetDataValue(item.number,'湿度')}}RH%
</template>
</div>
</router-link>
<div class="card-footer">
{{item.node.name}}
</div>
</div>
</div>
</div>
@ -22,6 +66,7 @@
title: '产品',
url: '/IoTCenter/api/v1/product/getProduct?number=' + this.$route.query.number,
product: {
name: "",
devices: []
},
events: ['ProductEntityInserted', 'ProductEntityUpdated', 'ProductEntityDeleted',
@ -41,10 +86,55 @@
vm.product = response.data;
});
},
HasBatchCommand() {
return this.product.name === '调色灯'
|| this.product.name.indexOf('窗帘电机') >= 0
|| this.product.name.indexOf('开关') >= 0
|| this.product.name.indexOf('插座') >= 0;
},
GetDevices() {
return Enumerable.from(this.product.devices).orderBy(function (o) { return o.displayOrder; }).orderBy(function (o) { return o.name; }).toArray();
},
GetDataValue(number, name) {
var device = Enumerable.from(this.product.devices)
.where(function (o) { return o.number === number; })
.firstOrDefault();
if (device !== null) {
var data = Enumerable.from(device.data)
.where(function (o) { return o.name === name; })
.firstOrDefault();
if (data) {
return data.value;
}
}
return null;
},
GetDeviceDataAttr(number, name, attr) {
var device = Enumerable.from(this.product.devices).where(function (o) { return o.number === number; }).firstOrDefault();
var data = Enumerable.from(device.data).where(o => o.name === name).firstOrDefault();
if (data !== null) {
return data[attr];
}
return null;
},
SelectDevice: selectNode,
CallApiAll(method) {
var numbers = [];
$('.item:checked').each(function () {
numbers.push($(this).val());
});
if (numbers.length) {
for (var i = 0; i < numbers.length; i++) {
execApi(numbers[i], this.product.path + method);
}
} else {
Swal.fire('没有选中任何项');
}
},
subscribe() {
var vm = this;
subscribe(this.events, function (method, data) {
var item = JSON.product(data.message);
var item = JSON.parse(data.message);
if (method.indexOf('Product') == 0) {
vm.load();
}

Write Preview
Loading…
Cancel
Save