Skip to content

D
DoorLock
Commit c897678b by 朱建香
Options

1108

parent ef7f1188
Showing with 134 additions and 104 deletions
dev/src/view/device/v_index.js
......@@ -21,17 +21,29 @@ function init() {
const app = new Vue({
data:{
//开门记录
valueOpendoorRecord: 0,
valueOpendoorRecord: 1,
//安全报警
valueSecurityAlarm: 0,
valueSecurityAlarm: 1,
//门锁用户
valueDoorlockUser: 0,
valueDoorlockUser: 1,
//劫持报警
valueHijackAlarm: 1,
//远程开门
valueRemoteOpendoor: 0,
//门锁管理
valueDoorlockManage: 1,
//开门记录
opendoorRecordDisabledFlag: false,
//安全报警
securityAlarmDisabledFlag: false,
//门锁用户
doorlockUserDisabledFlag: false,
//劫持报警
valueHijackAlarm: 0,
hijackAlarmDisabledFlag: false,
//远程开门
remoteOpendoorDisabledFlag: true,
//门锁管理
valueDoorlockManage: 0,
doorlockManageDisabledFlag: false,
//门锁最新消息是否滚动
activeFlag: true,
//配置组件
......@@ -86,7 +98,7 @@ function init() {
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(response.data == 'success'){
setValueOfSwitch(self, 0);
setValueOfSwitch(self, 1);
}else if(data){
self.mac = data[0].mac;
self.deviceId = data[0].sn;
......@@ -113,41 +125,44 @@ function init() {
},
methods:{
getValueOpendoorRecord(){
return this.valueOpendoorRecord;
setValueRemoteOpendoor(value){
this.valueRemoteOpendoor = value;
},
setValueOpendoorRecord(value){
this.valueOpendoorRecord = value;
getOpendoorRecordDisabledFlag(){
return this.opendoorRecordDisabledFlag;
},
getValueSecurityAlarm(){
return this.valueSecurityAlarm;
setOpendoorRecordDisabledFlag(flag){
this.opendoorRecordDisabledFlag = flag;
},
setValueSecurityAlarm(value){
this.valueSecurityAlarm = value;
getSecurityAlarmDisabledFlag(){
return this.securityAlarmDisabledFlag;
},
getValueRemoteOpendoor(){
return this.valueRemoteOpendoor;
setSecurityAlarmDisabledFlag(flag){
this.securityAlarmDisabledFlag = flag;
},
setValueRemoteOpendoor(value){
this.valueRemoteOpendoor = value;
getDoorlockUserDisabledFlag(){
return this.doorlockUserDisabledFlag;
},
setDoorlockUserDisabledFlag(flag){
this.doorlockUserDisabledFlag = flag;
},
getValueHijackAlarm(){
return this.valueHijackAlarm;
getHijackAlarmDisabledFlag(){
return this.hijackAlarmDisabledFlag;
},
setValueHijackAlarm(value){
this.valueHijackAlarm = value;
setHijackAlarmDisabledFlag(flag){
this.hijackAlarmDisabledFlag = flag;
},
getValueDoorlockUser(){
return this.valueDoorlockUser;
getRemoteOpendoorDisabledFlag(){
return this.remoteOpendoorDisabledFlag;
},
setValueDoorlockUser(value){
this.valueDoorlockUser = value;
setRemoteOpendoorDisabledFlag(flag){
this.remoteOpendoorDisabledFlag = flag;
},
getValueDoorlockManage(){
return this.valueDoorlockManage;
getDoorlockManageDisabledFlag(){
return this.doorlockManageDisabledFlag;
},
setValueDoorlockManage(value){
this.valueDoorlockManage = value;
setDoorlockManageDisabledFlag(flag){
this.doorlockManageDisabledFlag = flag;
},
getFollowShowFlag(){
return this.followShowFlag;
......@@ -492,12 +507,11 @@ function getRecordTimeMap(time) {
}
function setValueOfSwitch(self, flag){
self.setValueOpendoorRecord(flag);
self.setValueSecurityAlarm(flag);
self.setValueRemoteOpendoor(false);
self.setValueHijackAlarm(flag);
self.setValueDoorlockUser(flag);
self.setValueDoorlockManage(flag);
self.setOpendoorRecordDisabledFlag(flag);
self.setSecurityAlarmDisabledFlag(flag);
self.setDoorlockUserDisabledFlag(flag);
self.setHijackAlarmDisabledFlag(flag);
self.setDoorlockManageDisabledFlag(flag);
}
function getDeviceStatus(self){
......@@ -531,7 +545,7 @@ function getLockInfo(self){
getRecordTime(self, data);
//判断云端是否绑定
if(data.lock_id){
setValueOfSwitch(self, 1);
setValueOfSwitch(self, false);
self.setLockId(data.lock_id);
self.setRole(data.role);
if(self.isFirstGetLockInfo){
......@@ -599,6 +613,7 @@ function setDevceInfo(self, data) {
//请求远程开门
// self.setRemoteOpendoorFlag(true);
self.setValueRemoteOpendoor(true);
self.setRemoteOpendoorDisabledFlag(false);
}else if(data.notify_type.value == 2){
getLockInfo(self);
}
......@@ -736,9 +751,10 @@ function doorlockManageTap(self){
//tap 开门记录
function opendoorRecordTap(self){
// if(self.getValueOpendoorRecord() == 1){
if(self.openTime != null){
self.opendoorRecordFlag = false;
// setRecordTime('openTime', self.openTime.toISOString());
setRecordTime('openTime', self.openTime.toISOString());
}
iot.navigator.openWindow({
url: './opendoorRecord.html',
id: 'opendoorRecord',
......@@ -746,14 +762,14 @@ function opendoorRecordTap(self){
deviceId: self.deviceId
}
});
// }
}
//tap 安全报警
function securityAlarmTap(self){
// if(self.getValueSecurityAlarm() == 1){
if(self.notifyTime == 1){
self.securityAlarmFlag = false;
// setRecordTime('notifyTime', self.notifyTime.toISOString());
setRecordTime('notifyTime', self.notifyTime.toISOString());
}
iot.navigator.openWindow({
url: './alarmInfo.html',
id: 'alarmInfo',
......@@ -761,7 +777,6 @@ function securityAlarmTap(self){
deviceId: self.deviceId
}
});
// }
}
//tap 门锁用户
......@@ -798,9 +813,10 @@ function remoteOpendoorTap(self){
//tap 劫持报警
function hijackAlarmTap(self){
if(self.getValueHijackAlarm() == 1){
if(self.alarmTime == 1){
self.hijackAlarmFlag = false;
// setRecordTime('alarmTime', self.alarmTime.toISOString());
setRecordTime('alarmTime', self.alarmTime.toISOString());
}
iot.navigator.openWindow({
url: './hijackRecord.html',
id: 'hijackRecord',
......@@ -808,7 +824,6 @@ function hijackAlarmTap(self){
deviceId: self.deviceId
}
});
}
}
//tap 保存二维码到相册
......
dev/src/view/doorlockUsers/v_doorlockUser.js
......@@ -275,7 +275,7 @@ function getUserInfo(self){
//设置用户信息
function setUserInfo(self, data){
self.userInfo = {
image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindhead_icon.png',
image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindHead_icon.png',
role: data.role,
title: data.nickname,
subtitle: data.username
......
dev/src/view/doorlockUsers/v_index.js
......@@ -187,7 +187,7 @@ function setUserData(self, data){
list[i] = {
value: data[i].id,
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,
subtitle: data[i].username
}
......
web/view/device/index.html
......@@ -48,31 +48,31 @@
<div class="guoupRow">
<!-- 开门记录 -->
<div class="col-xs-6 opendoorRecord" v-bind:class="{newMsg: opendoorRecordFlag}">
<u-switch :value="valueOpendoorRecord" :init-param="componentsConfig.opendoorRecordSwitch.initParam" v-on:u-switch-tap="onOpendoorRecordTap"></u-switch>
<u-switch :value="valueOpendoorRecord" :disabled="opendoorRecordDisabledFlag" :init-param="componentsConfig.opendoorRecordSwitch.initParam" v-on:u-switch-tap="onOpendoorRecordTap"></u-switch>
</div>
<!-- 安全报警 -->
<div class="col-xs-6 securityAlarm" v-bind:class="{newMsg: securityAlarmFlag}">
<u-switch :value="valueSecurityAlarm" :init-param="componentsConfig.securityAlarmSwitch.initParam" v-on:u-switch-tap="onSecurityAlarmTap"></u-switch>
<u-switch :value="valueSecurityAlarm" :disabled="securityAlarmDisabledFlag" :init-param="componentsConfig.securityAlarmSwitch.initParam" v-on:u-switch-tap="onSecurityAlarmTap"></u-switch>
</div>
</div>
<div class="guoupRow">
<!-- 门锁用户 -->
<div class="col-xs-6 doorlockUser">
<u-switch :value="valueDoorlockUser" :init-param="componentsConfig.doorlockUserSwitch.initParam" v-on:u-switch-tap="onDoorlockUserTap"></u-switch>
<u-switch :value="valueDoorlockUser" :disabled="doorlockUserDisabledFlag" :init-param="componentsConfig.doorlockUserSwitch.initParam" v-on:u-switch-tap="onDoorlockUserTap"></u-switch>
</div>
<!-- 劫持报警 -->
<div class="col-xs-6 hijackAlarm" v-bind:class="{newMsg: hijackAlarmFlag}">
<u-switch :value="valueHijackAlarm" :init-param="componentsConfig.hijackAlarmSwitch.initParam" v-on:u-switch-tap="onHijackAlarmTap"></u-switch>
<u-switch :value="valueHijackAlarm" :disabled="hijackAlarmDisabledFlag" :init-param="componentsConfig.hijackAlarmSwitch.initParam" v-on:u-switch-tap="onHijackAlarmTap"></u-switch>
</div>
</div>
<div class="guoupRow">
<!-- 远程开门 -->
<div class="col-xs-6 remoteOpendoor" v-bind:class="{newMsg: remoteOpendoorFlag}">
<u-switch :value="valueRemoteOpendoor" :init-param="componentsConfig.remoteOpendoorSwitch.initParam" v-on:u-switch-tap="onRemoteOpendoorTap"></u-switch>
<u-switch :value="valueRemoteOpendoor" :disabled="remoteOpendoorDisabledFlag" :init-param="componentsConfig.remoteOpendoorSwitch.initParam" v-on:u-switch-tap="onRemoteOpendoorTap"></u-switch>
</div>
<!-- 门锁管理 -->
<div class="col-xs-6 doorlockManage">
<u-switch :value="valueDoorlockManage" :init-param="componentsConfig.doorlockManageSwitch.initParam" v-on:u-switch-tap="onDoorlockManageTap"></u-switch>
<div class="col-xs-6 doorlockManage" >
<u-switch :value="valueDoorlockManage" :disabled="doorlockManageDisabledFlag" :init-param="componentsConfig.doorlockManageSwitch.initParam" v-on:u-switch-tap="onDoorlockManageTap"></u-switch>
</div>
</div>
</div>
......
web/view/device/index.js
......@@ -23861,17 +23861,29 @@ function init() {
var app = new Vue({
data: {
//开门记录
valueOpendoorRecord: 0,
valueOpendoorRecord: 1,
//安全报警
valueSecurityAlarm: 0,
valueSecurityAlarm: 1,
//门锁用户
valueDoorlockUser: 0,
valueDoorlockUser: 1,
//劫持报警
valueHijackAlarm: 1,
//远程开门
valueRemoteOpendoor: 0,
//门锁管理
valueDoorlockManage: 1,
//开门记录
opendoorRecordDisabledFlag: false,
//安全报警
securityAlarmDisabledFlag: false,
//门锁用户
doorlockUserDisabledFlag: false,
//劫持报警
valueHijackAlarm: 0,
hijackAlarmDisabledFlag: false,
//远程开门
remoteOpendoorDisabledFlag: true,
//门锁管理
valueDoorlockManage: 0,
doorlockManageDisabledFlag: false,
//门锁最新消息是否滚动
activeFlag: true,
//配置组件
......@@ -23926,7 +23938,7 @@ function init() {
console.log(response);
var data = _public.uPublic.checkResponseData(response.data);
if (response.data == 'success') {
setValueOfSwitch(self, 0);
setValueOfSwitch(self, 1);
} else if (data) {
self.mac = data[0].mac;
self.deviceId = data[0].sn;
......@@ -23953,41 +23965,44 @@ function init() {
},
methods: {
getValueOpendoorRecord: function getValueOpendoorRecord() {
return this.valueOpendoorRecord;
setValueRemoteOpendoor: function setValueRemoteOpendoor(value) {
this.valueRemoteOpendoor = value;
},
setValueOpendoorRecord: function setValueOpendoorRecord(value) {
this.valueOpendoorRecord = value;
getOpendoorRecordDisabledFlag: function getOpendoorRecordDisabledFlag() {
return this.opendoorRecordDisabledFlag;
},
getValueSecurityAlarm: function getValueSecurityAlarm() {
return this.valueSecurityAlarm;
setOpendoorRecordDisabledFlag: function setOpendoorRecordDisabledFlag(flag) {
this.opendoorRecordDisabledFlag = flag;
},
setValueSecurityAlarm: function setValueSecurityAlarm(value) {
this.valueSecurityAlarm = value;
getSecurityAlarmDisabledFlag: function getSecurityAlarmDisabledFlag() {
return this.securityAlarmDisabledFlag;
},
getValueRemoteOpendoor: function getValueRemoteOpendoor() {
return this.valueRemoteOpendoor;
setSecurityAlarmDisabledFlag: function setSecurityAlarmDisabledFlag(flag) {
this.securityAlarmDisabledFlag = flag;
},
setValueRemoteOpendoor: function setValueRemoteOpendoor(value) {
this.valueRemoteOpendoor = value;
getDoorlockUserDisabledFlag: function getDoorlockUserDisabledFlag() {
return this.doorlockUserDisabledFlag;
},
setDoorlockUserDisabledFlag: function setDoorlockUserDisabledFlag(flag) {
this.doorlockUserDisabledFlag = flag;
},
getValueHijackAlarm: function getValueHijackAlarm() {
return this.valueHijackAlarm;
getHijackAlarmDisabledFlag: function getHijackAlarmDisabledFlag() {
return this.hijackAlarmDisabledFlag;
},
setValueHijackAlarm: function setValueHijackAlarm(value) {
this.valueHijackAlarm = value;
setHijackAlarmDisabledFlag: function setHijackAlarmDisabledFlag(flag) {
this.hijackAlarmDisabledFlag = flag;
},
getValueDoorlockUser: function getValueDoorlockUser() {
return this.valueDoorlockUser;
getRemoteOpendoorDisabledFlag: function getRemoteOpendoorDisabledFlag() {
return this.remoteOpendoorDisabledFlag;
},
setValueDoorlockUser: function setValueDoorlockUser(value) {
this.valueDoorlockUser = value;
setRemoteOpendoorDisabledFlag: function setRemoteOpendoorDisabledFlag(flag) {
this.remoteOpendoorDisabledFlag = flag;
},
getValueDoorlockManage: function getValueDoorlockManage() {
return this.valueDoorlockManage;
getDoorlockManageDisabledFlag: function getDoorlockManageDisabledFlag() {
return this.doorlockManageDisabledFlag;
},
setValueDoorlockManage: function setValueDoorlockManage(value) {
this.valueDoorlockManage = value;
setDoorlockManageDisabledFlag: function setDoorlockManageDisabledFlag(flag) {
this.doorlockManageDisabledFlag = flag;
},
getFollowShowFlag: function getFollowShowFlag() {
return this.followShowFlag;
......@@ -24382,12 +24397,11 @@ function getRecordTimeMap(time) {
}
function setValueOfSwitch(self, flag) {
self.setValueOpendoorRecord(flag);
self.setValueSecurityAlarm(flag);
self.setValueRemoteOpendoor(false);
self.setValueHijackAlarm(flag);
self.setValueDoorlockUser(flag);
self.setValueDoorlockManage(flag);
self.setOpendoorRecordDisabledFlag(flag);
self.setSecurityAlarmDisabledFlag(flag);
self.setDoorlockUserDisabledFlag(flag);
self.setHijackAlarmDisabledFlag(flag);
self.setDoorlockManageDisabledFlag(flag);
}
function getDeviceStatus(self) {
......@@ -24421,7 +24435,7 @@ function getLockInfo(self) {
getRecordTime(self, data);
//判断云端是否绑定
if (data.lock_id) {
setValueOfSwitch(self, 1);
setValueOfSwitch(self, false);
self.setLockId(data.lock_id);
self.setRole(data.role);
if (self.isFirstGetLockInfo) {
......@@ -24488,6 +24502,7 @@ function setDevceInfo(self, data) {
//请求远程开门
// self.setRemoteOpendoorFlag(true);
self.setValueRemoteOpendoor(true);
self.setRemoteOpendoorDisabledFlag(false);
} else if (data.notify_type.value == 2) {
getLockInfo(self);
}
......@@ -24661,9 +24676,10 @@ function doorlockManageTap(self) {
//tap 开门记录
function opendoorRecordTap(self) {
// if(self.getValueOpendoorRecord() == 1){
if (self.openTime != null) {
self.opendoorRecordFlag = false;
// setRecordTime('openTime', self.openTime.toISOString());
setRecordTime('openTime', self.openTime.toISOString());
}
_public.iot.navigator.openWindow({
url: './opendoorRecord.html',
id: 'opendoorRecord',
......@@ -24671,14 +24687,14 @@ function opendoorRecordTap(self) {
deviceId: self.deviceId
}
});
// }
}
//tap 安全报警
function securityAlarmTap(self) {
// if(self.getValueSecurityAlarm() == 1){
if (self.notifyTime == 1) {
self.securityAlarmFlag = false;
// setRecordTime('notifyTime', self.notifyTime.toISOString());
setRecordTime('notifyTime', self.notifyTime.toISOString());
}
_public.iot.navigator.openWindow({
url: './alarmInfo.html',
id: 'alarmInfo',
......@@ -24686,7 +24702,6 @@ function securityAlarmTap(self) {
deviceId: self.deviceId
}
});
// }
}
//tap 门锁用户
......@@ -24723,9 +24738,10 @@ function remoteOpendoorTap(self) {
//tap 劫持报警
function hijackAlarmTap(self) {
if (self.getValueHijackAlarm() == 1) {
if (self.alarmTime == 1) {
self.hijackAlarmFlag = false;
// setRecordTime('alarmTime', self.alarmTime.toISOString());
setRecordTime('alarmTime', self.alarmTime.toISOString());
}
_public.iot.navigator.openWindow({
url: './hijackRecord.html',
id: 'hijackRecord',
......@@ -24733,7 +24749,6 @@ function hijackAlarmTap(self) {
deviceId: self.deviceId
}
});
}
}
//tap 保存二维码到相册
......
web/view/doorlockUsers/doorlockUser.js
......@@ -1125,7 +1125,7 @@ function getUserInfo(self) {
//设置用户信息
function setUserInfo(self, data) {
self.userInfo = {
image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindhead_icon.png',
image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.user_id == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindHead_icon.png',
role: data.role,
title: data.nickname,
subtitle: data.username
......
web/view/doorlockUsers/index.js
......@@ -1010,7 +1010,7 @@ function setUserData(self, data) {
list[i] = {
value: data[i].id,
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,
subtitle: data[i].username
};
......
web/view/doorlockUsers/unlockInfo.html
......@@ -23,7 +23,7 @@
<div class="header">
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.unlockInfo') }}</p>
<v-touch tag="span" class="header-right" v-on:tap="onAddTap">{{ $t('btn.add') }}</v-touch>
<v-touch tag="span" class="header-right" v-on:tap="onAddTap" v-show="!role">{{ $t('btn.add') }}</v-touch>
</div>
<div class="content">
<p class="title">{{ $t('unlockInfo.bindUnlockInfo') }}</p>
......
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