Skip to content

D
DoorLock
Commit a3f44d8c by 朱建香
Options

0927

parent 0f6ec37a
Showing with 426 additions and 335 deletions
dev/src/lang/zh.json
...@@ -88,19 +88,24 @@ ...@@ -88,19 +88,24 @@
"followTitle": "关注服务号", "followTitle": "关注服务号",
"followCont1": "关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧", "followCont1": "关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧",
"followCont2": "1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注", "followCont2": "1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注",
"laterFollow": "稍后关注" "laterFollow": "稍后关注",
"newMsgDoorlock": "门锁最新消息",
"doorLockRinging": "门铃响了"
}, },
"opendoorRecord":{ "opendoorRecord":{
"noRecordTip": "暂无记录", "noRecordTip": "暂无记录",
"mode_0": "APP开门", "mode_0": "密码开门",
"mode_1": "指纹开门", "mode_1": "指纹开门",
"mode_2": "劫持指纹开门", "mode_2": "IC卡开门",
"mode_4": "IC卡开门" "mode_3": "遥控器开门",
"mode_4": "钥匙开门",
"mode_5": "劫持报警",
"mode_6": "app远程开门"
}, },
"alarmInfo":{ "alarmInfo":{
"noInfoTip": "暂无信息", "noInfoTip": "暂无信息",
"mode_0": "禁示报警", "mode_0": "防撬报警",
"mode_1": "防撬报警", "mode_1": "试错报警",
"mode_2": "欠电报警", "mode_2": "欠电报警",
"mode_3": "假锁报警" "mode_3": "假锁报警"
}, },
...@@ -112,7 +117,7 @@ ...@@ -112,7 +117,7 @@
}, },
"hijackRecord":{ "hijackRecord":{
"noRecordTip": "暂无记录", "noRecordTip": "暂无记录",
"mode_0": "劫持指纹开门" "mode_5": "劫持指纹报警"
}, },
"doorlockManage":{ "doorlockManage":{
"noDeviceTip": "暂无设备", "noDeviceTip": "暂无设备",
......
dev/src/public/config.js
let uComponents = {}; export default {
"powerIcon":["&#xe6e5;", "&#xe62b;", "&#xe627;", "&#xe628;", "&#xe62a;", "&#xe629;"]
uComponents.changeGridList = function (vmObj, list) { }
vmObj.$refs.gridlist.changeList(list); \ No newline at end of file
};
uComponents.changeTimeline = function (vmObj, list) {
vmObj.$refs.timeline.changeList(list);
};
export {uComponents}
\ No newline at end of file
dev/src/public/public.js
...@@ -11,7 +11,7 @@ const iot = new UIOT({ ...@@ -11,7 +11,7 @@ const iot = new UIOT({
lang: ['zh', 'en'], lang: ['zh', 'en'],
vue: Vue, vue: Vue,
i18n: VueI18n, i18n: VueI18n,
appId: '10003', appId: '10004',
wx: { wx: {
appId: '' appId: ''
}, },
......
dev/src/view/addDevice/v_wifiAdd.js
...@@ -38,6 +38,12 @@ function init() { ...@@ -38,6 +38,12 @@ function init() {
setTextPassword(pwd){ setTextPassword(pwd){
this.textPassword = pwd; this.textPassword = pwd;
}, },
gettTextErrorTip(){
return this.textErrorTip;
},
setTextErrorTip(tip){
this.textErrorTip = tip;
},
getStatus(){ getStatus(){
return this.status; return this.status;
}, },
...@@ -144,13 +150,16 @@ function connectButtonTap(self){ ...@@ -144,13 +150,16 @@ function connectButtonTap(self){
// },3000); // },3000);
console.log(self.getTextWiFiName()); console.log(self.getTextWiFiName());
self.setTextPassword('macro_scope00'); // self.setTextPassword('macro_scope00');
console.log(self.getTextPassword()); console.log(self.getTextPassword());
if(self.getTextPassword() == null || self.getTextPassword().trim() == ''){
self.setTextErrorTip(Vue.t('wifiAdd.passwordInputTip'));
}else{
iot.business.sds.findWifi({ iot.business.sds.findWifi({
data: { data: {
model: 'THM_LIVING_ELECTRICALBLANKET_TH_1507', model: 'THM_LIVING_ELECTRICALBLANKET_TH_1507',
ssid: "ugen-f", ssid: self.getTextWiFiName(),
wifiPwd: 'macro_scope00', wifiPwd: self.getTextPassword(),
timeout: 20000 timeout: 20000
}, },
success: (response) => { success: (response) => {
...@@ -161,10 +170,10 @@ function connectButtonTap(self){ ...@@ -161,10 +170,10 @@ function connectButtonTap(self){
uComponents.showCommLoading(self); uComponents.showCommLoading(self);
}else if(response.data == 'provisioned success'){ }else if(response.data == 'provisioned success'){
//wifi连接成功，停止连接wifi //wifi连接成功，停止连接wifi
// iot.business.sds.stopFindWifi({ // iot.business.sds.stopFindWifi({
// success: (response) => {}, // success: (response) => {},
// error: (error) => {} // error: (error) => {}
// }); // });
} }
}, },
error: (error) => { error: (error) => {
...@@ -179,7 +188,7 @@ function connectButtonTap(self){ ...@@ -179,7 +188,7 @@ function connectButtonTap(self){
//连接成功 //连接成功
uComponents.changeCommLoadingStatusAndText(self, 1, '绑定成功'); uComponents.changeCommLoadingStatusAndText(self, 1, '绑定成功');
self.setStatus(1); self.setStatus(1);
// //停止查找设备 // //停止查找设备
iot.business.sds.stopFindDevices({ iot.business.sds.stopFindDevices({
success: (response) => {}, success: (response) => {},
error: (error) => {} error: (error) => {}
...@@ -200,7 +209,7 @@ function connectButtonTap(self){ ...@@ -200,7 +209,7 @@ function connectButtonTap(self){
console.log(error); console.log(error);
} }
}); });
}
} }
//tap loading button //tap loading button
......
dev/src/view/device/v_alarmInfo.js
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
import moment from 'moment'; import moment from 'moment';
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
const PAGE_SIZE = 10;
iot.ready(init); iot.ready(init);
function init() { function init() {
...@@ -35,8 +36,8 @@ function init() { ...@@ -35,8 +36,8 @@ function init() {
getStartId(){ getStartId(){
return this.startId; return this.startId;
}, },
setStartId(){ setStartId(id){
this.startId; this.startId = id;
}, },
getDeviceId(){ getDeviceId(){
return this.deviceId; return this.deviceId;
...@@ -44,6 +45,9 @@ function init() { ...@@ -44,6 +45,9 @@ function init() {
setDeviceId(id){ setDeviceId(id){
this.deviceId = id; this.deviceId = id;
}, },
onListLoadTap(){
listLoadTap(this);
},
//tap < //tap <
onBackTap(){ onBackTap(){
backTap(); backTap();
...@@ -82,15 +86,19 @@ function initComponentsConfig() { ...@@ -82,15 +86,19 @@ function initComponentsConfig() {
} }
function resolve(self) { function resolve(self) {
// self.setDeviceId(iot.navigator.getExtras().deviceId); self.setDeviceId(iot.navigator.getExtras().deviceId);
self.setDeviceId(1); uComponents.showLoading(self);
let data = {record: [{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, iot.business.api.sendCustom('lock/getHistoryRecord',
{"openId": 1,mode: 1,id: 1, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, {
{"openId": 2,mode: 2,id: 2, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, data: {
{"openId": 3,mode: 3,id: 3, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, device_id: self.getDeviceId(),
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, action: 2,
{"openId": 1,mode: 1,id: 1, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, start_id: self.getStartId(),
{"openId": 2,mode: 2,id: 2, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}]}; page_size: PAGE_SIZE
},
success: (response) => {
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
let list = []; let list = [];
let record = data.record; let record = data.record;
...@@ -99,7 +107,6 @@ function initComponentsConfig() { ...@@ -99,7 +107,6 @@ function initComponentsConfig() {
value: record[i].openId, value: record[i].openId,
leftImage: '../../resources/image/green_alarmInfo'+record[i].mode+'_icon.png', leftImage: '../../resources/image/green_alarmInfo'+record[i].mode+'_icon.png',
subtitle: Vue.t('alarmInfo.mode_'+record[i].mode+''), subtitle: Vue.t('alarmInfo.mode_'+record[i].mode+''),
// title: ('ID:'+record[i].id),
rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss") rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
}; };
} }
...@@ -111,50 +118,24 @@ function initComponentsConfig() { ...@@ -111,50 +118,24 @@ function initComponentsConfig() {
uComponents.changeList(self, self.getList()); uComponents.changeList(self, self.getList());
}else{ }else{
} }
// iot.business.api.getRecorderList( uComponents.hideLoading(self);
// { },
// data: { error: (err) => {
// lock_id: self.getDeviceId(), uPublic.openRequestErrorAlert(self);
// action: 2, console.log(err);
// start_id: self.getStartId(), },
// page_size: PAGE_SIZE complete: () => {
// }, uComponents.hideLoading(self);
// success: (response) => { }
// let data = uPublic.checkResponseData(response.data); });
// data = [{"openId": 1,mode: 1,id: 1, time: '2017.08.0310:29:53'}];
// if(data){
// let list = [];
// let record = data.record;
// for(let i=0; i<record.length; i++){
// list[i] = {
// value: record[i].openId,
// leftImage: '../../resources/image/green_alarmInfo'+record[i].mode+'_icon.png',
// subtitle: Vue.t('alarmInfo.mode_'+record[i].mode+''),
// title: ('ID:'+record[i].id),
// rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
// };
// }
// self.setList(self.getList().concat(list));
// if(record.length > 0){
// self.setStartId(record[record.length-1].id);
// }
// //更新列表数据
// uComponents.changeList(self, self.getList());
// }else{
// }
// uComponents.hideLoading(self);
// },
// error: (err) => {
// uPublic.openRequestErrorAlert(self);
// console.log(err);
// },
// complete: () => {
//
// }
// });
} }
//tap < //tap <
function backTap(){ function backTap(){
iot.navigator.back(); iot.navigator.back();
} }
//tap 点击加载更多
function listLoadTap(self) {
resolve(self);
}
\ No newline at end of file
dev/src/view/device/v_hijackRecord.js
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
import moment from 'moment'; import moment from 'moment';
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
const PAGE_SIZE = 10;
iot.ready(init); iot.ready(init);
function init() { function init() {
...@@ -35,8 +36,8 @@ function init() { ...@@ -35,8 +36,8 @@ function init() {
getStartId(){ getStartId(){
return this.startId; return this.startId;
}, },
setStartId(){ setStartId(id){
this.startId; this.startId = id;
}, },
getDeviceId(){ getDeviceId(){
return this.deviceId; return this.deviceId;
...@@ -50,6 +51,9 @@ function init() { ...@@ -50,6 +51,9 @@ function init() {
setUserInfo(info){ setUserInfo(info){
this.userInfo = info; this.userInfo = info;
}, },
onListLoadTap(){
listLoadTap(this);
},
//tap < //tap <
onBackTap(){ onBackTap(){
backTap(); backTap();
...@@ -86,19 +90,20 @@ function initComponentsConfig() { ...@@ -86,19 +90,20 @@ function initComponentsConfig() {
} }
function resolve(self) { function resolve(self) {
// self.setDeviceId(iot.navigator.getExtras().deviceId); self.setDeviceId(iot.navigator.getExtras().deviceId);
self.setDeviceId(1); uComponents.showLoading(self);
let data = {record: [{"openId": 1,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, iot.business.api.sendCustom('lock/getHistoryRecord',
{"openId": 2,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, {
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, data: {
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, device_id: self.getDeviceId(),
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, action: 3,
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, start_id: self.getStartId(),
{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}], page_size: PAGE_SIZE
info: [{"openId": 1,"mode": 0, "nickname": "测试用户01"}, },
{"openId": 2,"mode": 0, "nickname": "测试用户02"}] success: (response) => {
}; let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
console.log(data);
let list = []; let list = [];
let record = data.record; let record = data.record;
if(data.hasOwnProperty('info')){ if(data.hasOwnProperty('info')){
...@@ -107,9 +112,9 @@ function initComponentsConfig() { ...@@ -107,9 +112,9 @@ function initComponentsConfig() {
for(let i=0; i<record.length; i++){ for(let i=0; i<record.length; i++){
list[i] = { list[i] = {
value: record[i].openId, value: record[i].openId,
leftImage: '../../resources/image/green_opendoor2_icon.png', leftImage: '../../resources/image/green_opendoor5_icon.png',
subtitle: Vue.t('hijackRecord.mode_'+record[i].mode+''), subtitle: Vue.t('hijackRecord.mode_'+record[i].mode+''),
// title: ('ID:'+record[i].id), // title: ('ID:'+record[i].id),
rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss") rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
}; };
for(let j=0; j<self.getUserInfo().length; j++){ for(let j=0; j<self.getUserInfo().length; j++){
...@@ -117,7 +122,7 @@ function initComponentsConfig() { ...@@ -117,7 +122,7 @@ function initComponentsConfig() {
list[i].title = self.getUserInfo()[j].nickname == null ? '': self.getUserInfo()[j].nickname; list[i].title = self.getUserInfo()[j].nickname == null ? '': self.getUserInfo()[j].nickname;
}else{ }else{
console.log(record[i].id); console.log(record[i].id);
list[i].title = record[i].id == null ? '':"ID:"+record[i].id; list[i].title = self.getUserInfo()[j].id == null ? '':"ID:"+self.getUserInfo()[j].id;
} }
} }
} }
...@@ -129,50 +134,24 @@ function initComponentsConfig() { ...@@ -129,50 +134,24 @@ function initComponentsConfig() {
uComponents.changeList(self, self.getList()); uComponents.changeList(self, self.getList());
}else{ }else{
} }
// iot.business.api.getRecorderList( uComponents.hideLoading(self);
// { },
// data: { error: (err) => {
// lock_id: self.getDeviceId(), uPublic.openRequestErrorAlert(self);
// action: 2, console.log(err);
// start_id: self.getStartId(), },
// page_size: PAGE_SIZE complete: () => {
// }, uComponents.hideLoading(self);
// success: (response) => { }
// let data = uPublic.checkResponseData(response.data); });
// data = [{"openId": 1,mode: 1,id: 1, time: '2017.08.0310:29:53'}];
// if(data){
// let list = [];
// let record = data.record;
// for(let i=0; i<record.length; i++){
// list[i] = {
// value: record[i].openId,
// leftImage: '../../resources/image/green_alarmInfo'+record[i].mode+'_icon.png',
// subtitle: Vue.t('alarmInfo.mode_'+record[i].mode+''),
// title: ('ID:'+record[i].id),
// rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
// };
// }
// self.setList(self.getList().concat(list));
// if(record.length > 0){
// self.setStartId(record[record.length-1].id);
// }
// //更新列表数据
// uComponents.changeList(self, self.getList());
// }else{
// }
// uComponents.hideLoading(self);
// },
// error: (err) => {
// uPublic.openRequestErrorAlert(self);
// console.log(err);
// },
// complete: () => {
//
// }
// });
} }
//tap < //tap <
function backTap(){ function backTap(){
iot.navigator.back(); iot.navigator.back();
} }
//tap 点击加载更多
function listLoadTap(self) {
resolve(self);
}
\ No newline at end of file
dev/src/view/device/v_index.js
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved. * Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 主控页面 * 主控页面
*/ */
import moment from 'moment';
import config from '../../public/config.js';
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init); iot.ready(init);
...@@ -30,10 +31,92 @@ function init() { ...@@ -30,10 +31,92 @@ function init() {
activeFlag: true, activeFlag: true,
followShowFlag: false, followShowFlag: false,
//配置组件 //配置组件
componentsConfig: initComponentsConfig() componentsConfig: initComponentsConfig(),
//电量
batteryState: null,
//电量百分比
batteryPercent: 0,
//响铃时间
ringingTime: null,
//门铃是否响起
doorbellRingingFlag: true,
//远程开门是否开启
remoteOpendoorFlag: true,
//设备ID
deviceId: null
}, },
mounted(){ mounted(){
let self = this;
iot.navigator.closeAllBesidesItself(); iot.navigator.closeAllBesidesItself();
iot.business.sds.getDevicesByUser({
success: (response) => {
let data = uPublic.checkResponseData(response.data);
if(data){
let uuid = data[0].uuid;
self.deviceId = data[0].sn;
iot.business.sds.getDeviceStatus({
data: {
uuid: uuid
},
success: (response) => {
console.log(response);
},
error: (error) => {
console.log(error);
uPublic.openRequestErrorAlert(self);
}
});
iot.business.api.sendCustom('lock/getLockInfo',{
data: {
// device_id:"600194283588"
device_id: self.deviceId
},
success: (response) => {
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(data){
console.log(data.info);
let newMsg = moment(data.info[0].time).format("YY.MM.DD HH:mm") + data.info[0].nickname + Vue.t('opendoorRecord.mode_'+data.info[0].mode+'')
uComponents.changeMarqueeText(self, newMsg);
}else{
}
},
error: (error) => {
console.log(error);
uPublic.openRequestErrorAlert(self);
}
});
}else{
}
},
error: (error) => {}
});
//注册监听上报
iot.business.sds.registerPushListener({
success: (response) => {
console.log(response);
if(response.hasOwnProperty('params')){
console.log(JSON.parse(response));
setDevceInfo(self, response.params);
}
},
error: (error) => {
console.log(error);
uPublic.openRequestErrorAlert(self);
}
});
let power = 5;
this.batteryPercent = power/5*100;
this.batteryState = config.powerIcon[power];
let newMsg = '2017.08.02 18:45 宝贝指纹开门';
// uComponents.changeMarqueeText(this, newMsg);
let time = new Date();
this.ringingTime = moment(time).format("HH:mm");
// getNewOpenDoorRecord(this);
}, },
methods:{ methods:{
getValueOpendoorRecord(){ getValueOpendoorRecord(){
...@@ -66,17 +149,47 @@ function init() { ...@@ -66,17 +149,47 @@ function init() {
setFollowShowFlag(boolean){ setFollowShowFlag(boolean){
this.followShowFlag = boolean; this.followShowFlag = boolean;
}, },
getBatteryState(){
return this.batteryState();
},
setBatteryState(number){
this.batteryState = number
},
getBatteryPercent(){
return this.batteryPercent;
},
setBatteryPercent(percent){
this.batteryPercent = percent;
},
getRingingTime(){
return this.ringingTime;
},
setRingingTime(time){
this.ringingTime = time
},
getDoorbellRingingFlag(){
return this.doorbellRingingFlag;
},
setDoorbellRingingFlag(boolean){
this.doorbellRingingFlag = boolean;
},
getRemoteOpendoorFlag(){
return this.remoteOpendoorFlag;
},
setRemoteOpendoorFlag(flag){
this.remoteOpendoorFlag = flag;
},
//tap 门锁管理 //tap 门锁管理
onDoorlockManageTap(){ onDoorlockManageTap(){
doorlockManageTap(); doorlockManageTap();
}, },
//tap 开门记录 //tap 开门记录
onOpendoorRecordTap(){ onOpendoorRecordTap(){
opendoorRecordTap(); opendoorRecordTap(this);
}, },
//tap 安全报警 //tap 安全报警
onSecurityAlarmTap(){ onSecurityAlarmTap(){
securityAlarmTap(); securityAlarmTap(this);
}, },
//tap 门锁用户 //tap 门锁用户
onDoorlockUserTap(){ onDoorlockUserTap(){
...@@ -88,7 +201,7 @@ function init() { ...@@ -88,7 +201,7 @@ function init() {
}, },
//tap 劫持报警 //tap 劫持报警
onHijackAlarmTap(){ onHijackAlarmTap(){
hijackAlarmTap(); hijackAlarmTap(this);
}, },
//tap 保存二维码到相册 //tap 保存二维码到相册
onSaveQRcodeButtonTap(){ onSaveQRcodeButtonTap(){
...@@ -189,6 +302,38 @@ function initComponentsConfig() { ...@@ -189,6 +302,38 @@ function initComponentsConfig() {
} }
} }
//设置设备信息
function setDevceInfo(self, data) {
self.setBatteryState(config.powerIcon[data.power]);
self.setBatteryPercent(data.power/5*100);
self.setRingingTime(moment(data.time).format("HH:mm"));
self.setDoorbellRingingFlag(data);
self.setRemoteOpendoorFlag(flag);
}
//获取最新开门记录
function getNewOpenDoorRecord(self){
iot.business.api.sendCustom('',{
data: {
uuid: 'uuid',
start_id: 0,
page_size: 0
},
success: (response) => {
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(data){
uComponents.changeMarqueeText(self, data.message);
}
},
error:　(error) => {
uPublic.openRequestErrorAlert(self);
console.log(error);
},
complete: () => {}
});
}
//tap 门锁管理 //tap 门锁管理
function doorlockManageTap(){ function doorlockManageTap(){
iot.navigator.openWindow({ iot.navigator.openWindow({
...@@ -198,24 +343,29 @@ function doorlockManageTap(){ ...@@ -198,24 +343,29 @@ function doorlockManageTap(){
} }
//tap 开门记录 //tap 开门记录
function opendoorRecordTap(){ function opendoorRecordTap(self){
iot.navigator.openWindow({ iot.navigator.openWindow({
url: './opendoorRecord.html', url: './opendoorRecord.html',
id: 'opendoorRecord' id: 'opendoorRecord',
extras: {
deviceId: self.deviceId
}
}); });
} }
//tap 安全报警 //tap 安全报警
function securityAlarmTap(){ function securityAlarmTap(self){
iot.navigator.openWindow({ iot.navigator.openWindow({
url: './alarmInfo.html', url: './alarmInfo.html',
id: 'alarmInfo' id: 'alarmInfo',
extras: {
deviceId: self.deviceId
}
}); });
} }
//tap 门锁用户 //tap 门锁用户
function doorlockUserTap(){ function doorlockUserTap(){
} }
//tap 远程开门 //tap 远程开门
...@@ -227,10 +377,13 @@ function remoteOpendoorTap(){ ...@@ -227,10 +377,13 @@ function remoteOpendoorTap(){
} }
//tap 劫持报警 //tap 劫持报警
function hijackAlarmTap(){ function hijackAlarmTap(self){
iot.navigator.openWindow({ iot.navigator.openWindow({
url: './hijackRecord.html', url: './hijackRecord.html',
id: 'hijackRecord' id: 'hijackRecord',
extras: {
deviceId: self.deviceId
}
}); });
} }
......
dev/src/view/device/v_opendoorRecord.js
...@@ -36,8 +36,8 @@ function init() { ...@@ -36,8 +36,8 @@ function init() {
getStartId(){ getStartId(){
return this.startId; return this.startId;
}, },
setStartId(){ setStartId(id){
this.startId; this.startId = id;
}, },
getDeviceId(){ getDeviceId(){
return this.deviceId; return this.deviceId;
...@@ -51,6 +51,9 @@ function init() { ...@@ -51,6 +51,9 @@ function init() {
setDeviceId(id){ setDeviceId(id){
this.deviceId = id; this.deviceId = id;
}, },
onListLoadTap(){
listLoadTap(this);
},
//tap < //tap <
onBackTap(){ onBackTap(){
backTap(); backTap();
...@@ -65,16 +68,6 @@ function initComponentsConfig() { ...@@ -65,16 +68,6 @@ function initComponentsConfig() {
opendoorRecordList:{ opendoorRecordList:{
initParam: { initParam: {
class: 'custom-list', class: 'custom-list',
// list: [
// {value: 1, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.08.0310:29:53'},
// {value: 2, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.08.0310:27:56'},
// {value: 3, leftImage: '../../resources/image/green_opendoor1_icon.png', title:'ID:6', subtitle: '指纹开门', rightText: '2017.08.0310:25:47'},
// {value: 4, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.07.3117:13:03',},
// {value: 5, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.3117:10:10'},
// {value: 6, leftImage: '../../resources/image/green_opendoor3_icon.png', title:'测试用户', subtitle: '密码开门', rightText: '2017.07.3117:09:59'},
// {value: 7, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.3117:05:19'},
// {value: 8, leftImage: '../../resources/image/green_opendoor3_icon.png', title:'测试用户', subtitle: '密码开门', rightText: '2017.07.3117:03:50',}
// ],
list: [], list: [],
tip: Vue.t('opendoorRecord.noRecordTip') tip: Vue.t('opendoorRecord.noRecordTip')
} }
...@@ -94,21 +87,20 @@ function initComponentsConfig() { ...@@ -94,21 +87,20 @@ function initComponentsConfig() {
//调用接口获取开门记录 //调用接口获取开门记录
function resolve(self) { function resolve(self) {
// self.setDeviceId(iot.navigator.getExtras().deviceId); uComponents.showLoading(self);
self.setDeviceId(1); self.setDeviceId(iot.navigator.getExtras().deviceId);
console.log(new Date()); iot.business.api.sendCustom('lock/getHistoryRecord',
let data = {record: [{"openId": 0,mode: 0,id: 0, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, {
{"openId": 1,mode: 1,id: 1, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, data: {
{"openId": 2,mode: 2,id: 2, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, device_id: self.getDeviceId(),
{"openId": 4,mode: 4,id: 4, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, action: 0,
{"openId": 0,mode: 0,id: null, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, start_id: self.getStartId(),
{"openId": 1,mode: 1,id: null, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}, page_size: PAGE_SIZE
{"openId": 2,mode: 2,id: null, time: 'Thu Sep 21 2017 13:58:00 GMT+0800'}], },
info: [{"openId": 1,"mode": 1, "nickname": "测试用户01"}, success: (response) => {
{"openId": 2,"mode": 2, "nickname": "测试用户02"}] let data = uPublic.checkResponseData(response.data);
};
if(data){ if(data){
console.log(data);
let list = []; let list = [];
let record = data.record; let record = data.record;
if(data.hasOwnProperty('info')){ if(data.hasOwnProperty('info')){
...@@ -125,8 +117,7 @@ function initComponentsConfig() { ...@@ -125,8 +117,7 @@ function initComponentsConfig() {
if(record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode){ if(record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode){
list[i].title = self.getUserInfo()[j].nickname == null ? '': self.getUserInfo()[j].nickname; list[i].title = self.getUserInfo()[j].nickname == null ? '': self.getUserInfo()[j].nickname;
}else{ }else{
console.log(record[i].id); list[i].title = self.getUserInfo()[j].id == null ? '':"ID:"+self.getUserInfo()[j].id;
list[i].title = record[i].id == null ? '':"ID:"+record[i].id;
} }
} }
} }
...@@ -136,59 +127,19 @@ function initComponentsConfig() { ...@@ -136,59 +127,19 @@ function initComponentsConfig() {
} }
//更新列表数据 //更新列表数据
uComponents.changeList(self, self.getList()); uComponents.changeList(self, self.getList());
console.log("in");
}else{ }else{
} }
// iot.business.api.getRecorderList( uComponents.hideLoading(self);
// { },
// data: { error: (err) => {
// lock_id: self.getDeviceId(), uPublic.openRequestErrorAlert(self);
// action: 2, console.log(err);
// start_id: self.getStartId(), },
// page_size: PAGE_SIZE complete: () => {
// }, uComponents.hideLoading(self);
// success: (response) => {
// let data = uPublic.checkResponseData(response.data);
// data = [{"openId": 1,mode: 1,id: 1, time: '2017.08.0310:29:53'}];
// if(data){
// let list = [];
let record = data.record;
if(data.hasOwnProperty('info')){
self.setUserInfo(data.info);
}
for(let i=0; i<record.length; i++){
list[i] = {
value: record[i].openId,
leftImage: '../../resources/image/green_opendoor'+record[i].mode+'_icon.png',
subtitle: Vue.t('opendoorRecord.mode_'+record[i].mode+''),
rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
};
for(let j=0; j<self.getUserInfo().length; j++){
if(record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode){
list[i].title = self.getUserInfo()[j].nickname == null ? '': self.getUserInfo()[j].nickname;
}else{
console.log(record[i].id);
list[i].title = record[i].id == null ? '':"ID:"+record[i].id;
}
}
}
self.setList(self.getList().concat(list));
if(record.length > 0){
self.setStartId(record[record.length-1].id);
} }
//更新列表数据 });
uComponents.changeList(self, self.getList());
// }else{
// }
// uComponents.hideLoading(self);
// },
// error: (err) => {
// uPublic.openRequestErrorAlert(self);
// console.log(err);
// },
// complete: () => {
//
// }
// });
} }
//tap < //tap <
...@@ -197,10 +148,6 @@ function backTap(){ ...@@ -197,10 +148,6 @@ function backTap(){
} }
//tap 点击加载更多 //tap 点击加载更多
//function loadTap(self) { function listLoadTap(self) {
// if(!self.getLoadFlag()){ resolve(self);
// resolve(self); }
// self.setLoadText(Vue.t('scroll.loading')); \ No newline at end of file
// self.setLoadFlag(true);
// }
//}
\ No newline at end of file
dev/src/view/device/v_remoteOpendoor.js
...@@ -25,6 +25,15 @@ function init() { ...@@ -25,6 +25,15 @@ function init() {
mounted(){ mounted(){
}, },
methods:{ methods:{
getTextPassword(){
return this.textPassword;
},
setTextPassword(pwd){
this.textPassword = pwd;
},
setTextErrorTip(tip){
this.textErrorTip = tip;
},
getTextLoading(){ getTextLoading(){
return this.textLoading; return this.textLoading;
}, },
...@@ -96,7 +105,8 @@ function initComponentsConfig() { ...@@ -96,7 +105,8 @@ function initComponentsConfig() {
} }
function passwordChange(self,text){ function passwordChange(self,text){
self.textPassword = text; self.setTextPassword(text);
self.setTextErrorTip('');
console.log('passwordChange: ' + self.textPassword); console.log('passwordChange: ' + self.textPassword);
} }
...@@ -107,23 +117,45 @@ function backTap(){ ...@@ -107,23 +117,45 @@ function backTap(){
//tap 确定 //tap 确定
function confirmButtonTap(self){ function confirmButtonTap(self){
uComponents.showCommstatusloading(self); console.log(self.getTextPassword());
setTimeout(function(){ if(self.getTextPassword() == null || self.getTextPassword().trim() == ''){
self.setTextLoading(Vue.t('commstatusLoading.connectSuccess')); self.setTextErrorTip(Vue.t('remoteOpendoor.error.noPasswordTip'));
setTimeout(function(){ }else{
//绑定成功 // iot.business.sds.setDeviceStatus({
self.setStatus(1); // data: {
self.setTextLoading(Vue.t('commstatusLoading.bindSuccess')); // uuid: 'uuid',
//绑定失败 // setParams: {
//self.setStatus(2); // 'OnOff_Power': {
//self.setTextLoading(Vue.t('commstatusLoading.bindFailed')); // 'value': '1'
//uComponents.changeCommstatusButtonText(self,Vue.t('btn.reBound')); // }
},3000); // }
},3000); // },
// success: (response) => {
// console.log(response);
// },
// error: (error) => {
// console.log(error);
// }
// });
}
// uComponents.showCommstatusloading(self);
// setTimeout(function(){
// self.setTextLoading(Vue.t('commstatusLoading.connectSuccess'));
// setTimeout(function(){
// //绑定成功
// self.setStatus(1);
// self.setTextLoading(Vue.t('commstatusLoading.bindSuccess'));
// //绑定失败
// //self.setStatus(2);
// //self.setTextLoading(Vue.t('commstatusLoading.bindFailed'));
// //uComponents.changeCommstatusButtonText(self,Vue.t('btn.reBound'));
// },3000);
// },3000);
} }
//tap loading button //tap loading button
function commstatusLoadingButtonTap(self) { function commstatusLoadingButtonTap(self) {
//绑定成功 //绑定成功
uComponents.hideCommstatusloading(self); uComponents.hideCommstatusloading(self);
iot.navigator.back(); iot.navigator.back();
......
web/lib/js/p.js
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "" + ({"0":"device/opendoorRecord","1":"device/hijackRecord","2":"device/alarmInfo","3":"doorlockManage/qrcode","4":"bindUser/index","5":"doorlockManage/index","6":"login/register","7":"login/login","8":"login/index","9":"login/forgetPassword","10":"doorlockManage/editName","11":"device/remoteOpendoor","12":"device/index","13":"addDevice/wifiAddHelp","14":"addDevice/wifiAdd","15":"addDevice/scanCodeAdd","16":"addDevice/index"}[chunkId]||chunkId) + ".js"; /******/ script.src = __webpack_require__.p + "" + ({"0":"device/opendoorRecord","1":"device/index","2":"device/hijackRecord","3":"device/alarmInfo","4":"doorlockManage/qrcode","5":"bindUser/index","6":"doorlockManage/index","7":"login/register","8":"login/login","9":"login/index","10":"login/forgetPassword","11":"doorlockManage/editName","12":"device/remoteOpendoor","13":"addDevice/wifiAddHelp","14":"addDevice/wifiAdd","15":"addDevice/scanCodeAdd","16":"addDevice/index"}[chunkId]||chunkId) + ".js";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {
...@@ -9470,7 +9470,7 @@ Vue$3.compile = compileToFunctions; ...@@ -9470,7 +9470,7 @@ Vue$3.compile = compileToFunctions;
/* harmony default export */ __webpack_exports__["default"] = (Vue$3); /* harmony default export */ __webpack_exports__["default"] = (Vue$3);
/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(124), __webpack_require__(134), __webpack_require__(131))) /* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(124), __webpack_require__(135), __webpack_require__(132)))
/***/ }), /***/ }),
/* 2 */ /* 2 */
...@@ -9486,7 +9486,7 @@ exports.uComponents = exports.uPublic = exports.iot = undefined; ...@@ -9486,7 +9486,7 @@ exports.uComponents = exports.uPublic = exports.iot = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _config = __webpack_require__(192); var _config = __webpack_require__(131);
var _config2 = _interopRequireDefault(_config); var _config2 = _interopRequireDefault(_config);
...@@ -9514,7 +9514,7 @@ var iot = new UIOT({ ...@@ -9514,7 +9514,7 @@ var iot = new UIOT({
lang: ['zh', 'en'], lang: ['zh', 'en'],
vue: Vue, vue: Vue,
i18n: _vueI18n2.default, i18n: _vueI18n2.default,
appId: '10003', appId: '10004',
wx: { wx: {
appId: '' appId: ''
}, },
...@@ -10092,6 +10092,20 @@ process.umask = function() { return 0; }; ...@@ -10092,6 +10092,20 @@ process.umask = function() { return 0; };
/* 131 */ /* 131 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = {
"powerIcon": ["&#xe6e5;", "&#xe62b;", "&#xe627;", "&#xe628;", "&#xe62a;", "&#xe629;"]
};
/***/ }),
/* 132 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(process, Promise, global) {var require;/*! /* WEBPACK VAR INJECTION */(function(process, Promise, global) {var require;/*!
* @overview es6-promise - a tiny implementation of Promises/A+. * @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
...@@ -11251,10 +11265,10 @@ return Promise; ...@@ -11251,10 +11265,10 @@ return Promise;
}))); })));
//# sourceMappingURL=es6-promise.map //# sourceMappingURL=es6-promise.map
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(124), __webpack_require__(131), __webpack_require__(134))) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(124), __webpack_require__(132), __webpack_require__(135)))
/***/ }), /***/ }),
/* 132 */ /* 133 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ var __WEBPACK_AMD_DEFINE_RESULT__;/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
...@@ -13352,7 +13366,7 @@ if ( typeof module != 'undefined' && module.exports ) { ...@@ -13352,7 +13366,7 @@ if ( typeof module != 'undefined' && module.exports ) {
/***/ }), /***/ }),
/* 133 */ /* 134 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.8.3 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.8.3
...@@ -14907,7 +14921,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor ...@@ -14907,7 +14921,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
/***/ }), /***/ }),
/* 134 */ /* 135 */
/***/ (function(module, exports) { /***/ (function(module, exports) {
var g; var g;
...@@ -14934,7 +14948,6 @@ module.exports = g; ...@@ -14934,7 +14948,6 @@ module.exports = g;
/***/ }), /***/ }),
/* 135 */,
/* 136 */, /* 136 */,
/* 137 */, /* 137 */,
/* 138 */, /* 138 */,
...@@ -14970,7 +14983,8 @@ module.exports = g; ...@@ -14970,7 +14983,8 @@ module.exports = g;
/* 168 */, /* 168 */,
/* 169 */, /* 169 */,
/* 170 */, /* 170 */,
/* 171 */ /* 171 */,
/* 172 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15033,7 +15047,7 @@ function tapButton(self) { ...@@ -15033,7 +15047,7 @@ function tapButton(self) {
} }
/***/ }), /***/ }),
/* 172 */ /* 173 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15317,7 +15331,7 @@ function setTransition(time, select) { ...@@ -15317,7 +15331,7 @@ function setTransition(time, select) {
} }
/***/ }), /***/ }),
/* 173 */ /* 174 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15394,7 +15408,7 @@ function _changeCommLoadingStatusAndText(self, status, text) { ...@@ -15394,7 +15408,7 @@ function _changeCommLoadingStatusAndText(self, status, text) {
} }
/***/ }), /***/ }),
/* 174 */ /* 175 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15496,7 +15510,7 @@ function handleButton(self, name, button) { ...@@ -15496,7 +15510,7 @@ function handleButton(self, name, button) {
} }
/***/ }), /***/ }),
/* 175 */ /* 176 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15620,7 +15634,7 @@ function _changeList(self, list) { ...@@ -15620,7 +15634,7 @@ function _changeList(self, list) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 176 */ /* 177 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15630,7 +15644,7 @@ Object.defineProperty(exports, "__esModule", { ...@@ -15630,7 +15644,7 @@ Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
var _iscroll = __webpack_require__(132); var _iscroll = __webpack_require__(133);
var _iscroll2 = _interopRequireDefault(_iscroll); var _iscroll2 = _interopRequireDefault(_iscroll);
...@@ -15738,7 +15752,7 @@ function _changeList(self, list) { ...@@ -15738,7 +15752,7 @@ function _changeList(self, list) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 177 */ /* 178 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15788,7 +15802,7 @@ exports.default = { ...@@ -15788,7 +15802,7 @@ exports.default = {
}; };
/***/ }), /***/ }),
/* 178 */ /* 179 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15841,7 +15855,7 @@ function _changeText(self, text) { ...@@ -15841,7 +15855,7 @@ function _changeText(self, text) {
} }
/***/ }), /***/ }),
/* 179 */ /* 180 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15979,7 +15993,7 @@ function checkOutOfRange(self) { ...@@ -15979,7 +15993,7 @@ function checkOutOfRange(self) {
} }
/***/ }), /***/ }),
/* 180 */ /* 181 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -15989,7 +16003,7 @@ Object.defineProperty(exports, "__esModule", { ...@@ -15989,7 +16003,7 @@ Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
var _underscore = __webpack_require__(133); var _underscore = __webpack_require__(134);
var _underscore2 = _interopRequireDefault(_underscore); var _underscore2 = _interopRequireDefault(_underscore);
...@@ -16269,7 +16283,7 @@ function _changeData(self, data) { ...@@ -16269,7 +16283,7 @@ function _changeData(self, data) {
} }
/***/ }), /***/ }),
/* 181 */ /* 182 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -16279,7 +16293,7 @@ Object.defineProperty(exports, "__esModule", { ...@@ -16279,7 +16293,7 @@ Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
var _underscore = __webpack_require__(133); var _underscore = __webpack_require__(134);
var _underscore2 = _interopRequireDefault(_underscore); var _underscore2 = _interopRequireDefault(_underscore);
...@@ -16424,7 +16438,7 @@ function setScrollPosition(self) { ...@@ -16424,7 +16438,7 @@ function setScrollPosition(self) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 182 */ /* 183 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -16536,7 +16550,7 @@ function _setValue(self, parameter) { ...@@ -16536,7 +16550,7 @@ function _setValue(self, parameter) {
} }
/***/ }), /***/ }),
/* 183 */ /* 184 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -16546,7 +16560,7 @@ Object.defineProperty(exports, "__esModule", { ...@@ -16546,7 +16560,7 @@ Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
var _iscroll = __webpack_require__(132); var _iscroll = __webpack_require__(133);
var _iscroll2 = _interopRequireDefault(_iscroll); var _iscroll2 = _interopRequireDefault(_iscroll);
...@@ -16693,7 +16707,7 @@ function _changeList(self, list) { ...@@ -16693,7 +16707,7 @@ function _changeList(self, list) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 184 */ /* 185 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -16765,7 +16779,7 @@ function tapSwitch(self) { ...@@ -16765,7 +16779,7 @@ function tapSwitch(self) {
} }
/***/ }), /***/ }),
/* 185 */ /* 186 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -16897,10 +16911,10 @@ function watchInputText(self, text) { ...@@ -16897,10 +16911,10 @@ function watchInputText(self, text) {
} }
/***/ }), /***/ }),
/* 186 */,
/* 187 */, /* 187 */,
/* 188 */, /* 188 */,
/* 189 */ /* 189 */,
/* 190 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -17007,7 +17021,7 @@ function tapLoad(self) { ...@@ -17007,7 +17021,7 @@ function tapLoad(self) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 190 */ /* 191 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
...@@ -17107,29 +17121,7 @@ function _changeList(self, list) { ...@@ -17107,29 +17121,7 @@ function _changeList(self, list) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"])) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }), /***/ }),
/* 191 */, /* 192 */,
/* 192 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
var uComponents = {};
uComponents.changeGridList = function (vmObj, list) {
vmObj.$refs.gridlist.changeList(list);
};
uComponents.changeTimeline = function (vmObj, list) {
vmObj.$refs.timeline.changeList(list);
};
exports.uComponents = uComponents;
/***/ }),
/* 193 */ /* 193 */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
...@@ -20990,7 +20982,7 @@ module.exports = plugin; ...@@ -20990,7 +20982,7 @@ module.exports = plugin;
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(171), __webpack_require__(172),
/* template */ /* template */
__webpack_require__(225), __webpack_require__(225),
/* scopeId */ /* scopeId */
...@@ -21024,7 +21016,7 @@ module.exports = Component.exports ...@@ -21024,7 +21016,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(172), __webpack_require__(173),
/* template */ /* template */
__webpack_require__(235), __webpack_require__(235),
/* scopeId */ /* scopeId */
...@@ -21058,7 +21050,7 @@ module.exports = Component.exports ...@@ -21058,7 +21050,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(173), __webpack_require__(174),
/* template */ /* template */
__webpack_require__(224), __webpack_require__(224),
/* scopeId */ /* scopeId */
...@@ -21092,7 +21084,7 @@ module.exports = Component.exports ...@@ -21092,7 +21084,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(174), __webpack_require__(175),
/* template */ /* template */
__webpack_require__(227), __webpack_require__(227),
/* scopeId */ /* scopeId */
...@@ -21126,7 +21118,7 @@ module.exports = Component.exports ...@@ -21126,7 +21118,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(175), __webpack_require__(176),
/* template */ /* template */
__webpack_require__(222), __webpack_require__(222),
/* scopeId */ /* scopeId */
...@@ -21160,7 +21152,7 @@ module.exports = Component.exports ...@@ -21160,7 +21152,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(176), __webpack_require__(177),
/* template */ /* template */
__webpack_require__(221), __webpack_require__(221),
/* scopeId */ /* scopeId */
...@@ -21194,7 +21186,7 @@ module.exports = Component.exports ...@@ -21194,7 +21186,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(177), __webpack_require__(178),
/* template */ /* template */
__webpack_require__(237), __webpack_require__(237),
/* scopeId */ /* scopeId */
...@@ -21228,7 +21220,7 @@ module.exports = Component.exports ...@@ -21228,7 +21220,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(178), __webpack_require__(179),
/* template */ /* template */
__webpack_require__(231), __webpack_require__(231),
/* scopeId */ /* scopeId */
...@@ -21262,7 +21254,7 @@ module.exports = Component.exports ...@@ -21262,7 +21254,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(179), __webpack_require__(180),
/* template */ /* template */
__webpack_require__(232), __webpack_require__(232),
/* scopeId */ /* scopeId */
...@@ -21296,7 +21288,7 @@ module.exports = Component.exports ...@@ -21296,7 +21288,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(180), __webpack_require__(181),
/* template */ /* template */
__webpack_require__(229), __webpack_require__(229),
/* scopeId */ /* scopeId */
...@@ -21330,7 +21322,7 @@ module.exports = Component.exports ...@@ -21330,7 +21322,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(181), __webpack_require__(182),
/* template */ /* template */
__webpack_require__(233), __webpack_require__(233),
/* scopeId */ /* scopeId */
...@@ -21364,7 +21356,7 @@ module.exports = Component.exports ...@@ -21364,7 +21356,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(182), __webpack_require__(183),
/* template */ /* template */
__webpack_require__(230), __webpack_require__(230),
/* scopeId */ /* scopeId */
...@@ -21398,7 +21390,7 @@ module.exports = Component.exports ...@@ -21398,7 +21390,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(183), __webpack_require__(184),
/* template */ /* template */
__webpack_require__(223), __webpack_require__(223),
/* scopeId */ /* scopeId */
...@@ -21432,7 +21424,7 @@ module.exports = Component.exports ...@@ -21432,7 +21424,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(184), __webpack_require__(185),
/* template */ /* template */
__webpack_require__(220), __webpack_require__(220),
/* scopeId */ /* scopeId */
...@@ -21466,7 +21458,7 @@ module.exports = Component.exports ...@@ -21466,7 +21458,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(185), __webpack_require__(186),
/* template */ /* template */
__webpack_require__(238), __webpack_require__(238),
/* scopeId */ /* scopeId */
...@@ -21503,7 +21495,7 @@ module.exports = Component.exports ...@@ -21503,7 +21495,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(189), __webpack_require__(190),
/* template */ /* template */
__webpack_require__(226), __webpack_require__(226),
/* scopeId */ /* scopeId */
...@@ -21537,7 +21529,7 @@ module.exports = Component.exports ...@@ -21537,7 +21529,7 @@ module.exports = Component.exports
var Component = __webpack_require__(3)( var Component = __webpack_require__(3)(
/* script */ /* script */
__webpack_require__(190), __webpack_require__(191),
/* template */ /* template */
__webpack_require__(228), __webpack_require__(228),
/* scopeId */ /* scopeId */
......
web/resources/lang/zh.json
{"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册"},"dialog":{"confirm":"确认","cancel":"取消"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"},"failure":"登陆失败"},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注"},"opendoorRecord":{"noRecordTip":"暂无记录","mode_0":"APP开门","mode_1":"指纹开门","mode_2":"劫持指纹开门","mode_4":"IC卡开门"},"alarmInfo":{"noInfoTip":"暂无信息","mode_0":"禁示报警","mode_1":"防撬报警","mode_2":"欠电报警","mode_3":"假锁报警"},"remoteOpendoor":{"passwordInputTip":"请输入远程开门密码","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","mode_0":"劫持指纹开门"},"doorlockManage":{"noDeviceTip":"暂无设备","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗？","deleteSuccess":"删除成功","deleteFailue":"删除失败","defaultNickname":"门锁"},"editName":{"nameInputTip":"请输入门锁名称","editNameSuccess":"名字修改成功","editNameFailue":"名字修改失败","error":{}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","bindSuccess":"绑定成功","bindFailue":"绑定失败"},"wifiAddHelp":{"helpTitle":"配置Wi-Fi说明：","helpCont1":"1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态","helpCont2":"2.点击页面 “开始配置Wi-Fi” 按钮，进入Wi-Fi配网画面","helpCont3":"3.输入Wi-Fi密码，点击 “l连接” 按钮，等待锁端相应，直至配网成功","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1. 请确保Wi-Fi信号良好","remindCont2":"2. 本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"userList":{"name":"姓名：{0}","id":"指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>","noUserTip":"暂无用户"},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"request":{"error":"请求发送失败"}} {"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册"},"dialog":{"confirm":"确认","cancel":"取消"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"},"failure":"登陆失败"},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注","newMsgDoorlock":"门锁最新消息","doorLockRinging":"门铃响了"},"opendoorRecord":{"noRecordTip":"暂无记录","mode_0":"密码开门","mode_1":"指纹开门","mode_2":"IC卡开门","mode_3":"遥控器开门","mode_4":"钥匙开门","mode_5":"劫持报警","mode_6":"app远程开门"},"alarmInfo":{"noInfoTip":"暂无信息","mode_0":"防撬报警","mode_1":"试错报警","mode_2":"欠电报警","mode_3":"假锁报警"},"remoteOpendoor":{"passwordInputTip":"请输入远程开门密码","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","mode_5":"劫持指纹报警"},"doorlockManage":{"noDeviceTip":"暂无设备","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗？","deleteSuccess":"删除成功","deleteFailue":"删除失败","defaultNickname":"门锁"},"editName":{"nameInputTip":"请输入门锁名称","editNameSuccess":"名字修改成功","editNameFailue":"名字修改失败","error":{}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","bindSuccess":"绑定成功","bindFailue":"绑定失败"},"wifiAddHelp":{"helpTitle":"配置Wi-Fi说明：","helpCont1":"1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态","helpCont2":"2.点击页面 “开始配置Wi-Fi” 按钮，进入Wi-Fi配网画面","helpCont3":"3.输入Wi-Fi密码，点击 “l连接” 按钮，等待锁端相应，直至配网成功","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1. 请确保Wi-Fi信号良好","remindCont2":"2. 本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"userList":{"name":"姓名：{0}","id":"指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>","noUserTip":"暂无用户"},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"request":{"error":"请求发送失败"}}
\ No newline at end of file \ No newline at end of file
web/view/addDevice/wifiAdd.html
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</ul> </ul>
<u-button :init-param="componentsConfig.connectButton.initParam" v-on:u-button-tap="onConnectButtonTap"></u-button> <u-button :init-param="componentsConfig.connectButton.initParam" v-on:u-button-tap="onConnectButtonTap"></u-button>
</div> </div>
<u-comm-loading ref="ucommstatusloading" :init-param="componentsConfig.ucommloading.initParam" v-on:u-commstatus-loading-tap="onCommstatusLoadingButtonTap()"> <u-comm-loading ref="ucommloading" :init-param="componentsConfig.ucommloading.initParam" v-on:u-comm-loading-tap="onCommLoadingButtonTap()">
<p class="loader"></p> <p class="loader"></p>
<p class="icon"></p> <p class="icon"></p>
</u-comm-loading> </u-comm-loading>
......
web/view/device/alarmInfo.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch> <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.alarmInfo') }}</p> <p>{{ $t('title.alarmInfo') }}</p>
</div> </div>
<u-list ref="ulist" :init-param="componentsConfig.alarmInfoList.initParam"></u-list> <u-list ref="ulist" :init-param="componentsConfig.alarmInfoList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading> <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div> </div>
......
web/view/device/hijackRecord.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch> <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.hijackRecord') }}</p> <p>{{ $t('title.hijackRecord') }}</p>
</div> </div>
<u-list ref="ulist" :init-param="componentsConfig.hijackRecordList.initParam"></u-list> <u-list ref="ulist" :init-param="componentsConfig.hijackRecordList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading> <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div> </div>
......
web/view/device/index.html
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<script type="text/javascript" src="../../lib/js/UIOT.js"></script> <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
</head> </head>
<body ontouchstart=""> <body ontouchstart="">
<div id="app" v-cloak> <div id="app" v-cloak>
<div class="header"> <div class="header">
<v-touch tag="span" class="header-left icon" v-on:tap="onDoorlockManageTap">&#xe66f;</v-touch> <v-touch tag="span" class="header-left icon" v-on:tap="onDoorlockManageTap">&#xe66f;</v-touch>
...@@ -32,13 +31,13 @@ ...@@ -32,13 +31,13 @@
<p></p> <p></p>
</div> </div>
</div> </div>
<div class="doorbellTip"><span>17:30</span>门铃响了</div> <div class="doorbellTip" v-bind:class="[{active: doorbellRingingFlag}]"><span>{{ ringingTime }}</span>{{ $t('device.doorLockRinging') }}</div>
</div> </div>
<p class="batteryState"><span>&#xe629;</span>100%</p> <p class="batteryState"><span v-html="batteryState"></span>{{ batteryPercent }}%</p>
</div> </div>
<div class="deviceHandle"> <div class="deviceHandle">
<p class="title">门锁最新消息</p> <p class="title">{{ $t('device.newMsgDoorlock') }}</p>
<u-marquee :init-param="componentsConfig.marquee.initParam" :active="activeFlag"></u-marquee> <u-marquee ref="umarquee" :init-param="componentsConfig.marquee.initParam" :active="activeFlag"></u-marquee>
<div class="switchGroup"> <div class="switchGroup">
<div class="guoupRow"> <div class="guoupRow">
<!-- 开门记录 --> <!-- 开门记录 -->
...@@ -62,7 +61,7 @@ ...@@ -62,7 +61,7 @@
</div> </div>
<div class="guoupRow"> <div class="guoupRow">
<!-- 远程开门 --> <!-- 远程开门 -->
<div class="col-xs-6 remoteOpendoor"> <div class="col-xs-6 remoteOpendoor" :class="[{newMsg: remoteOpendoorFlag}]">
<u-switch :value="valueRemoteOpendoor" :init-param="componentsConfig.remoteOpendoorSwitch.initParam" v-on:u-switch-tap="onRemoteOpendoorTap"></u-switch> <u-switch :value="valueRemoteOpendoor" :init-param="componentsConfig.remoteOpendoorSwitch.initParam" v-on:u-switch-tap="onRemoteOpendoorTap"></u-switch>
</div> </div>
<!-- 门锁管理 --> <!-- 门锁管理 -->
......
web/view/device/opendoorRecord.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch> <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.opendoorRecord') }}</p> <p>{{ $t('title.opendoorRecord') }}</p>
</div> </div>
<u-list ref="ulist" :init-param="componentsConfig.opendoorRecordList.initParam"></u-list> <u-list ref="ulist" :init-param="componentsConfig.opendoorRecordList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading> <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div> </div>
......
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