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

调整样式

Browse Source 
Former-commit-id: 48acba1d77180652642f43e41f24979215cd7a4a
TangShanKaiPing
zhengpengju 6 years ago
parent f8e81fa81f
commit 56067072e4
6 changed files with 185 additions and 18 deletions
Show Stats Download Patch File Download Diff File

0
projects/WebUI/Readme.md
Unescape View File

161
projects/WebUI/libman.json
Unescape View File

@ -0,0 +1,161 @@
{
"version": "1.0",
"defaultProvider": "filesystem",
"libraries": [
{
"library": "../lib/node_modules/@fortawesome/fontawesome-free/webfonts/",
"destination": "wwwroot/lib/fontawesome-free/webfonts/"
},
{
"library": "../lib/node_modules/@fortawesome/fontawesome-free/css/",
"destination": "wwwroot/lib/fontawesome-free/css/",
"files": [ "all.min.css" ]
},
{
"library": "../lib/node_modules/ionicons/dist/fonts",
"destination": "wwwroot/lib/ionicons/fonts"
},
{
"library": "../lib/node_modules/ionicons/dist/",
"destination": "wwwroot/lib/ionicons/",
"files": [ "css/ionicons.min.css" ]
},
{
"library": "../lib/node_modules/jquery/dist/",
"destination": "wwwroot/lib/jquery/",
"files": [ "jquery.min.js" ]
},
{
"library": "../lib/node_modules/bootstrap/dist/",
"destination": "wwwroot/lib/bootstrap/",
"files": [ "css/bootstrap.min.css", "js/bootstrap.bundle.min.js" ]
},
{
"library": "../lib/node_modules/admin-lte/dist/",
"destination": "wwwroot/lib/admin-lte/",
"files": [ "css/adminlte.min.css", "js/adminlte.min.js" ]
},
{
"library": "../lib/node_modules/axios/dist/",
"destination": "wwwroot/lib/axios/",
"files": [ "axios.min.js" ]
},
{
"library": "../lib/node_modules/lodash/",
"destination": "wwwroot/lib/lodash/",
"files": [ "lodash.min.js" ]
},
{
"library": "../lib/node_modules/chart.js/dist/",
"destination": "wwwroot/lib/chart.js/",
"files": [ "Chart.bundle.min.js" ]
},
{
"library": "../lib/node_modules/flv.js/dist/",
"destination": "wwwroot/lib/flv.js/",
"files": [ "flv.min.js" ]
},
{
"library": "../lib/node_modules/framework7/",
"destination": "wwwroot/lib/framework7/",
"files": [ "css/framework7.bundle.min.css", "js/framework7.bundle.min.js" ]
},
{
"library": "../lib/node_modules/framework7-vue/",
"destination": "wwwroot/lib/framework7/js/",
"files": [ "framework7-vue.bundle.min.js" ]
},
{
"library": "../lib/node_modules/jquery-validation/dist/",
"destination": "wwwroot/lib/jquery-validation/",
"files": [ "jquery.validate.min.js", "localization/messages_zh.min.js" ]
},
{
"library": "../lib/node_modules/jquery-validation-unobtrusive/dist/",
"destination": "wwwroot/lib/jquery-validation-unobtrusive/",
"files": [ "jquery.validate.unobtrusive.min.js" ]
},
{
"library": "../lib/node_modules/jquery-validation-unobtrusive-bootstrap/dist/",
"destination": "wwwroot/lib/jquery-validation-unobtrusive/",
"files": [ "unobtrusive-bootstrap.js" ]
},
{
"library": "../lib/node_modules/vue/dist/",
"destination": "wwwroot/lib/vue/",
"files": [ "vue.min.js" ]
},
{
"library": "../lib/node_modules/urijs/src/",
"destination": "wwwroot/lib/urijs/",
"files": [ "URI.min.js" ]
},
{
"library": "../lib/node_modules/mobile-detect/",
"destination": "wwwroot/lib/mobile-detect/",
"files": [ "mobile-detect.min.js" ]
},
{
"library": "../lib/node_modules/@microsoft/signalr/dist/browser/",
"destination": "wwwroot/lib/signalr/",
"files": [ "signalr.min.js" ]
},
{
"library": "../lib/node_modules/@fancyapps/fancybox/dist/",
"destination": "wwwroot/lib/fancybox/",
"files": [ "jquery.fancybox.min.css", "jquery.fancybox.min.js" ]
},
{
"library": "../lib/node_modules/jquery-datetimepicker/build/",
"destination": "wwwroot/lib/jquery-datetimepicker/",
"files": [ "jquery.datetimepicker.min.css", "jquery.datetimepicker.full.min.js" ]
},
{
"library": "../lib/node_modules/select2/dist/",
"destination": "wwwroot/lib/select2/",
"files": [ "css/select2.min.css", "js/select2.full.min.js", "js/i18n/zh-CN.js" ]
},
{
"library": "../lib/node_modules/select2-bootstrap4-theme/dist/",
"destination": "wwwroot/lib/select2/css/",
"files": [ "select2-bootstrap4.min.css" ]
},
{
"library": "../lib/local/layer/",
"destination": "wwwroot/lib/layer/",
"files": [ "layer.js" ]
},
{
"library": "../lib/local/layer/skin/",
"destination": "wwwroot/lib/layer/skin/"
},
{
"destination": "wwwroot/lib/kindeditor/",
"library": "../lib/local/kindeditor/"
},
{
"library": "../lib/node_modules/metro4/build/",
"destination": "wwwroot/lib/metro4/",
"files": [ "css/metro-all.min.css", "js/metro.min.js" ]
},
{
"library": "../lib/node_modules/metro4/build/mif/",
"destination": "wwwroot/lib/metro4/mif/"
},
{
"library": "../lib/node_modules/linq/",
"destination": "wwwroot/lib/linq/",
"files": [ "linq.min.js" ]
},
{
"library": "../lib/node_modules/toastr/build",
"destination": "wwwroot/lib/toastr/",
"files": [ "toastr.min.css", "toastr.min.js" ]
},
{
"library": "../lib/local/jqcron-master/src/",
"destination": "wwwroot/lib/jqcron",
"files": [ "jqCron.css", "jqCron.js", "jqCron.cn.js" ]
}
]
}

4
projects/WebUI/wwwroot/css/app.css
Unescape View File

@ -1159,3 +1159,7 @@ ul {
.weui-grids a::before, .weui-grids a::after{
border: none;
}
.row a:hover{
text-decoration-line: none;
background-color: #f5f5f5;
}

1
projects/WebUI/wwwroot/js/config.js
Unescape View File

@ -3,6 +3,7 @@ var config = (function(global){
//global.resourceUrl = 'http://192.168.3.118'; // 媒体文件资源
global.iotCenterUrl = 'http://192.168.3.118/IoTCenter'; // IoT服务API
global.hubUrl = 'http://192.168.3.118/IoTCenter/hub?group=page'; // 设备WebSocket访问地址
global.liverUrl = 'http://192.168.3.118'; // 流媒体服务器地址
return global;
})(window.config||{});
console.log('config init');

33
projects/WebUI/wwwroot/pages/iot/device/camera.html
Unescape View File

@ -1,5 +1,5 @@
<template>
<div class="card camera" style="box-sizing:border-box;min-height:540px;margin:10px;">
<div class="card camera" style="box-sizing:border-box;min-height:540px;margin-top:10px;">
<div class="card-header">
{{device.displayName}}
</div>
@ -27,36 +27,36 @@
</template>
</div>
<div style="box-sizing: border-box; min-width: 320px;margin: 5px auto; padding:15px;position:relative;" :class="'row ptz '+ device.number">
<table style="width: 100%; max-width:480px; height: 100px; margin: 5px auto;">
<table style="width: 100%; max-width:320px; height: 100px; margin: 5px auto;">
<tr>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StartRecord')" style="margin: 10px;" >启动推流</button></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StartRecord')" style="margin: 5px;" >启动推流</button></td>
<td></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StopRecord')" style="margin: 10px;" >停止推流</button></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StopRecord')" style="margin: 5px;" >停止推流</button></td>
</tr>
<tr>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StartPush')" style="margin: 10px;" >开始录像</button></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StartPush')" style="margin: 5px;" >开始录像</button></td>
<td></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StopPush')" style="margin: 10px;" >停止录像</button></td>
<td colspan="2" style="text-align:center;"><button class="weui-btn weui-btn_mini weui-btn_default" v-on:click="execApi(model.number,'/Onvif/StopPush')" style="margin: 5px;" >停止录像</button></td>
</tr>
<template v-if="ptz">
<tr>
<td></td>
<td></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Up')" :src="config.apigateway+'/IoTCenter/images/up.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Up')" :src="config.apigateway+'/IoTCenter/images/up.png'" style="margin: 5px;" /></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Zoomin')" :src="config.apigateway+'/IoTCenter/images/zoomin.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Left')" :src="config.apigateway+'/IoTCenter/images/left.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Stop')" :src="config.apigateway+'/IoTCenter/images/stop.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Right')" :src="config.apigateway+'/IoTCenter/images/right.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Zoomout')" :src="config.apigateway+'/IoTCenter/images/zoomout.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Zoomin')" :src="config.apigateway+'/IoTCenter/images/zoomin.png'" style="margin: 5px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Left')" :src="config.apigateway+'/IoTCenter/images/left.png'" style="margin: 5px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Stop')" :src="config.apigateway+'/IoTCenter/images/stop.png'" style="margin: 5px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Right')" :src="config.apigateway+'/IoTCenter/images/right.png'" style="margin: 5px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Zoomout')" :src="config.apigateway+'/IoTCenter/images/zoomout.png'" style="margin: 5px;" /></td>
</tr>
<tr>
<td></td>
<td></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Down')" :src="config.apigateway+'/IoTCenter/images/down.png'" style="margin: 10px;" /></td>
<td style="text-align: center;"><img v-on:click="execApi(device.number,'/Onvif/Down')" :src="config.apigateway+'/IoTCenter/images/down.png'" style="margin: 5px;" /></td>
<td></td>
<td></td>
</tr>
@ -67,10 +67,10 @@
<div class="weui-panel weui-panel_access">
<div class="weui-panel__hd" >设备信息</div>
<div class="weui-panel__bd" >
<div class="weui-cell" v-for="item in device.data" style="word-wrap:break-word">
<code class="weui-cell" v-for="item in device.data" style="word-wrap:break-word; color:#212529">
{{item.name}}
{{item.value}}
</div>
</code>
</div>
</div>
</div>
@ -268,7 +268,8 @@
},
computed: {
url: function () {
return location.protocol + '//' + location.hostname + '/live/' + this.device.number + '.flv';
//return location.protocol + '//' + location.hostname + '/live/' + this.device.number + '.flv';
return config.liverUrl + '/live/' + this.device.number + '.flv';
//return getDeviceDataValue(this.device, 'flv');
},
isFlvSupported: function () {

2
projects/WebUI/wwwroot/pages/iot/device/switch.html
Unescape View File

@ -8,7 +8,7 @@
<div class="card-body">
<div class="row" style="height:100%;width:300px;margin: 0 auto;">
<div class="col-4 align-self-center">
<img class="mh-100" :src="config.apigateway+'/IoTCenter/images/switch1.png" style="width:48px;" />
<img class="mh-100" :src="config.apigateway+'/IoTCenter/images/switch1.png'" style="width:48px;" />
</div>
<div class="col-8 align-self-center">
<div class="row" style="line-height:28px;">

Write Preview
Loading…
Cancel
Save