Skip to content

D
DoorLock
Commit a0a033cd by jenny
Options

Merge branch 'zjx' into 'master' 

merge zjx 76a6e035 76353011 fd29a166

See merge request iot-project-js/doorlock!1
parents de3d8ca3 76a6e035
Showing with 80 additions and 33 deletions
dev/src/lang/zh.json
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"login": "登录", "login": "登录",
"register": "注册", "register": "注册",
"forgetPassword": "忘记密码", "forgetPassword": "忘记密码",
"device": "智能指纹锁", "device": "U智锁",
"opendoorRecord": "开门记录", "opendoorRecord": "开门记录",
"alarmInfo": "报警信息", "alarmInfo": "报警信息",
"remoteOpendoor": "远程开门", "remoteOpendoor": "远程开门",
......
dev/src/public/config.js
...@@ -46,6 +46,6 @@ export default { ...@@ -46,6 +46,6 @@ export default {
"ringBell_timeout": 300, "ringBell_timeout": 300,
"intervalTime": 3, "intervalTime": 3,
"getHistoryTime": 10, "getHistoryTime": 10,
// "audioUrl": "../../resources/audio/tipSound.mp3" "audioUrl": "../../resources/audio/tipSound.mp3"
"audioUrl": "_www/resources/audio/tipSound.mp3" // "audioUrl": "_www/resources/audio/tipSound.mp3"
} }
\ No newline at end of file
dev/src/public/public.js
...@@ -239,31 +239,7 @@ iot.navigator.getCurrentWebView = function (){ ...@@ -239,31 +239,7 @@ iot.navigator.getCurrentWebView = function (){
} }
uPublic.loopUtils = function(func, opts, intervalTime, time){ uPublic.loopUtils = function(func, opts, intervalTime, time){
var _this = this;
var params = _extends({}, opts);
var loop = function loop() {
var handle = setTimeout(function () {
_this.loopUtils(func, opts, intervalTime, time);
window.clearTimeout(handle);
}, intervalTime);
};
params.success = function (ret) {
if (opts.success(ret) === false) {
return;
}
loop();
};
params.error = function (err) {
if (opts.error(err) === false) {
return;
}
loop();
};
func();
var timeout = setTimeout(function (){
window.clearTimeout(handle);
window.clearTimeout(timeout);
}, time);
} }
export {iot, uPublic, uComponents} export {iot, uPublic, uComponents}
\ No newline at end of file
dev/src/view/device/v_alarmInfo.js
...@@ -23,6 +23,7 @@ function init() { ...@@ -23,6 +23,7 @@ function init() {
list:[], list:[],
startId: 0, startId: 0,
deviceId: null, deviceId: null,
flag: true
}, },
mounted(){ mounted(){
resolve(this); resolve(this);
...@@ -94,6 +95,17 @@ function initComponentsConfig() { ...@@ -94,6 +95,17 @@ function initComponentsConfig() {
}, },
success: (response) => { success: (response) => {
console.log(response); console.log(response);
if(self.flag){
let data = uPublic.checkResponseData(response.data);
if(data && data.record.length > 0){
let record = data.record;
iot.storage.setMap('notifyTime', moment(record[0].time).toISOString(), (res) => {
console.log(res);
self.flag = false;
}, () => {
});
}
}
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
let list = []; let list = [];
......
dev/src/view/device/v_hijackRecord.js
...@@ -24,7 +24,8 @@ function init() { ...@@ -24,7 +24,8 @@ function init() {
list: [], list: [],
startId: 0, startId: 0,
deviceId: null, deviceId: null,
userInfo: [] userInfo: [],
flag: true
}, },
mounted(){ mounted(){
resolve(this); resolve(this);
...@@ -101,6 +102,17 @@ function initComponentsConfig() { ...@@ -101,6 +102,17 @@ function initComponentsConfig() {
page_size: PAGE_SIZE page_size: PAGE_SIZE
}, },
success: (response) => { success: (response) => {
if(self.flag){
let data = uPublic.checkResponseData(response.data);
if(data && data.record.length > 0){
let record = data.record;
iot.storage.setMap('alarmTime', moment(record[0].time).toISOString(), (res) => {
console.log(res);
self.flag = false;
}, () => {
});
}
}
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
console.log(data); console.log(data);
......
dev/src/view/device/v_opendoorRecord.js
...@@ -23,7 +23,8 @@ function init() { ...@@ -23,7 +23,8 @@ function init() {
list: [], list: [],
startId: 0, startId: 0,
deviceId: null, deviceId: null,
userInfo: [] userInfo: [],
flag: true
}, },
mounted(){ mounted(){
resolve(this); resolve(this);
...@@ -128,6 +129,17 @@ function getHistoryRecord(self){ ...@@ -128,6 +129,17 @@ function getHistoryRecord(self){
}, },
success: (response) => { success: (response) => {
setListData(self, response); setListData(self, response);
if(self.flag){
let data = uPublic.checkResponseData(response.data);
if(data && data.record.length > 0){
let record = data.record;
iot.storage.setMap('openTime', moment(record[0].time).toISOString(), (res) => {
console.log(res);
self.flag = false;
}, () => {
});
}
}
}, },
error: (error) => { error: (error) => {
console.log(error); console.log(error);
......
dev/src/view/doorlockUsers/v_index.js
...@@ -196,7 +196,7 @@ function setUserData(self, data){ ...@@ -196,7 +196,7 @@ function setUserData(self, data){
role: data[i].role, role: data[i].role,
image: data[i].role == 0 ? '../../resources/image/green_admin_icon.png' : data[i].user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindHead_icon.png', image: data[i].role == 0 ? '../../resources/image/green_admin_icon.png' : data[i].user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindHead_icon.png',
title: data[i].nickname, title: data[i].nickname,
subtitle: data[i].username ? Vue.t('userList.binded'):Vue.t('userList.unbind') subtitle: data[i].hasOwnProperty('username') ? Vue.t('userList.binded'):Vue.t('userList.unbind')
} }
} }
console.log(data); console.log(data);
......
dev/webpack.config.js
...@@ -55,7 +55,8 @@ module.exports = { ...@@ -55,7 +55,8 @@ module.exports = {
}, },
resolve: { resolve: {
alias: { alias: {
'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js' 'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js',
'mui': '../src/public/mui.js'
} }
}, },
plugins: [ plugins: [
......
web/lib/js/UIOT.js
...@@ -5915,8 +5915,17 @@ var App = function (_Base) { ...@@ -5915,8 +5915,17 @@ var App = function (_Base) {
_createClass(App, [{ _createClass(App, [{
key: 'openWindow', key: 'openWindow',
value: function openWindow(params) { value: function openWindow(params) {
var wv = plus.webview.create(params.url, params.id, { styles: params.styles || {} }, { IOTData: params.extras }); var wv = plus.webview.create(params.url, params.id, { styles:{backgroundColor:'#000000'} }, { IOTData: params.extras });
wv.show('slide-in-right'); wv.show('slide-in-right');
// var IOTData = params.extras;
// var webview = mui.openWindow({
// url: params.url,
// id: params.id,
// extras: IOTData,
// waiting:{
// autoShow:false//自动显示等待框，默认为true
// }
// },"slide-in-right");
} }
}, { }, {
key: 'getExtras', key: 'getExtras',
......
web/lib/js/mui.min.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
web/view/addDevice/deviceList.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/addDevice/index.html
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</style> </style>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/addDevice/scanCodeAdd.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/addDevice/wifiAdd.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script> <script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/addDevice/wifiAddHelp.html
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</style> </style>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/bindUser/index.html
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</style> </style>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/device/alarmInfo.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/device/hijackRecord.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/device/index.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script> <script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/device/opendoorRecord.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/device/remoteOpendoor.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockManage/editName.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<div id="app" v-cloak> <div id="app" v-cloak>
......
web/view/doorlockManage/index.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script> <script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/addUnlockInfo.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/addUser.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/doorlockUser.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/editName.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/inviteBind.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script> <script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/doorlockUsers/unlockInfo.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/login/index.html
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/SDSPlugin.js"></script> <script type="text/javascript" src="../../lib/js/SDSPlugin.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
......
web/view/myInfo/editNickname.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<div id="app" v-cloak> <div id="app" v-cloak>
......
web/view/myInfo/editPassword.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>--> <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<div id="app" v-cloak> <div id="app" v-cloak>
......
web/view/myInfo/index.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script> <script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script> <script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<div id="app" v-cloak> <div id="app" v-cloak>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment