Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DoorLock
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
朱建香
DoorLock
Commits
c897678b
Commit
c897678b
authored
Nov 08, 2017
by
朱建香
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1108
parent
ef7f1188
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
162 additions
and
132 deletions
+162
-132
dev/src/view/device/v_index.js
+81
-66
dev/src/view/doorlockUsers/v_doorlockUser.js
+1
-1
dev/src/view/doorlockUsers/v_index.js
+1
-1
web/view/device/index.html
+7
-7
web/view/device/index.js
+69
-54
web/view/doorlockUsers/doorlockUser.js
+1
-1
web/view/doorlockUsers/index.js
+1
-1
web/view/doorlockUsers/unlockInfo.html
+1
-1
No files found.
dev/src/view/device/v_index.js
View file @
c897678b
...
@@ -21,17 +21,29 @@ function init() {
...
@@ -21,17 +21,29 @@ function init() {
const
app
=
new
Vue
({
const
app
=
new
Vue
({
data
:{
data
:{
//开门记录
//开门记录
valueOpendoorRecord
:
0
,
valueOpendoorRecord
:
1
,
//安全报警
//安全报警
valueSecurityAlarm
:
0
,
valueSecurityAlarm
:
1
,
//门锁用户
//门锁用户
valueDoorlockUser
:
0
,
valueDoorlockUser
:
1
,
//劫持报警
valueHijackAlarm
:
1
,
//远程开门
//远程开门
valueRemoteOpendoor
:
0
,
valueRemoteOpendoor
:
0
,
//门锁管理
valueDoorlockManage
:
1
,
//开门记录
opendoorRecordDisabledFlag
:
false
,
//安全报警
securityAlarmDisabledFlag
:
false
,
//门锁用户
doorlockUserDisabledFlag
:
false
,
//劫持报警
//劫持报警
valueHijackAlarm
:
0
,
hijackAlarmDisabledFlag
:
false
,
//远程开门
remoteOpendoorDisabledFlag
:
true
,
//门锁管理
//门锁管理
valueDoorlockManage
:
0
,
doorlockManageDisabledFlag
:
false
,
//门锁最新消息是否滚动
//门锁最新消息是否滚动
activeFlag
:
true
,
activeFlag
:
true
,
//配置组件
//配置组件
...
@@ -86,7 +98,7 @@ function init() {
...
@@ -86,7 +98,7 @@ function init() {
console
.
log
(
response
);
console
.
log
(
response
);
let
data
=
uPublic
.
checkResponseData
(
response
.
data
);
let
data
=
uPublic
.
checkResponseData
(
response
.
data
);
if
(
response
.
data
==
'success'
){
if
(
response
.
data
==
'success'
){
setValueOfSwitch
(
self
,
0
);
setValueOfSwitch
(
self
,
1
);
}
else
if
(
data
){
}
else
if
(
data
){
self
.
mac
=
data
[
0
].
mac
;
self
.
mac
=
data
[
0
].
mac
;
self
.
deviceId
=
data
[
0
].
sn
;
self
.
deviceId
=
data
[
0
].
sn
;
...
@@ -113,41 +125,44 @@ function init() {
...
@@ -113,41 +125,44 @@ function init() {
},
},
methods
:{
methods
:{
getValueOpendoorRecord
(){
setValueRemoteOpendoor
(
value
){
return
this
.
valueOpendoorRecord
;
this
.
valueRemoteOpendoor
=
value
;
},
getOpendoorRecordDisabledFlag
(){
return
this
.
opendoorRecordDisabledFlag
;
},
},
set
ValueOpendoorRecord
(
value
){
set
OpendoorRecordDisabledFlag
(
flag
){
this
.
valueOpendoorRecord
=
value
;
this
.
opendoorRecordDisabledFlag
=
flag
;
},
},
get
ValueSecurityAlarm
(){
get
SecurityAlarmDisabledFlag
(){
return
this
.
valueSecurityAlarm
;
return
this
.
securityAlarmDisabledFlag
;
},
},
set
ValueSecurityAlarm
(
value
){
set
SecurityAlarmDisabledFlag
(
flag
){
this
.
valueSecurityAlarm
=
value
;
this
.
securityAlarmDisabledFlag
=
flag
;
},
},
get
ValueRemoteOpendoor
(){
get
DoorlockUserDisabledFlag
(){
return
this
.
valueRemoteOpendoor
;
return
this
.
doorlockUserDisabledFlag
;
},
},
set
ValueRemoteOpendoor
(
value
){
set
DoorlockUserDisabledFlag
(
flag
){
this
.
valueRemoteOpendoor
=
value
;
this
.
doorlockUserDisabledFlag
=
flag
;
},
},
get
ValueHijackAlarm
(){
get
HijackAlarmDisabledFlag
(){
return
this
.
valueHijackAlarm
;
return
this
.
hijackAlarmDisabledFlag
;
},
},
set
ValueHijackAlarm
(
value
){
set
HijackAlarmDisabledFlag
(
flag
){
this
.
valueHijackAlarm
=
value
;
this
.
hijackAlarmDisabledFlag
=
flag
;
},
},
get
ValueDoorlockUser
(){
get
RemoteOpendoorDisabledFlag
(){
return
this
.
valueDoorlockUser
;
return
this
.
remoteOpendoorDisabledFlag
;
},
},
set
ValueDoorlockUser
(
value
){
set
RemoteOpendoorDisabledFlag
(
flag
){
this
.
valueDoorlockUser
=
value
;
this
.
remoteOpendoorDisabledFlag
=
flag
;
},
},
get
ValueDoorlockManage
(){
get
DoorlockManageDisabledFlag
(){
return
this
.
valueDoorlockManage
;
return
this
.
doorlockManageDisabledFlag
;
},
},
set
ValueDoorlockManage
(
value
){
set
DoorlockManageDisabledFlag
(
flag
){
this
.
valueDoorlockManage
=
value
;
this
.
doorlockManageDisabledFlag
=
flag
;
},
},
getFollowShowFlag
(){
getFollowShowFlag
(){
return
this
.
followShowFlag
;
return
this
.
followShowFlag
;
...
@@ -492,12 +507,11 @@ function getRecordTimeMap(time) {
...
@@ -492,12 +507,11 @@ function getRecordTimeMap(time) {
}
}
function
setValueOfSwitch
(
self
,
flag
){
function
setValueOfSwitch
(
self
,
flag
){
self
.
setValueOpendoorRecord
(
flag
);
self
.
setOpendoorRecordDisabledFlag
(
flag
);
self
.
setValueSecurityAlarm
(
flag
);
self
.
setSecurityAlarmDisabledFlag
(
flag
);
self
.
setValueRemoteOpendoor
(
false
);
self
.
setDoorlockUserDisabledFlag
(
flag
);
self
.
setValueHijackAlarm
(
flag
);
self
.
setHijackAlarmDisabledFlag
(
flag
);
self
.
setValueDoorlockUser
(
flag
);
self
.
setDoorlockManageDisabledFlag
(
flag
);
self
.
setValueDoorlockManage
(
flag
);
}
}
function
getDeviceStatus
(
self
){
function
getDeviceStatus
(
self
){
...
@@ -531,7 +545,7 @@ function getLockInfo(self){
...
@@ -531,7 +545,7 @@ function getLockInfo(self){
getRecordTime
(
self
,
data
);
getRecordTime
(
self
,
data
);
//判断云端是否绑定
//判断云端是否绑定
if
(
data
.
lock_id
){
if
(
data
.
lock_id
){
setValueOfSwitch
(
self
,
1
);
setValueOfSwitch
(
self
,
false
);
self
.
setLockId
(
data
.
lock_id
);
self
.
setLockId
(
data
.
lock_id
);
self
.
setRole
(
data
.
role
);
self
.
setRole
(
data
.
role
);
if
(
self
.
isFirstGetLockInfo
){
if
(
self
.
isFirstGetLockInfo
){
...
@@ -599,6 +613,7 @@ function setDevceInfo(self, data) {
...
@@ -599,6 +613,7 @@ function setDevceInfo(self, data) {
//请求远程开门
//请求远程开门
// self.setRemoteOpendoorFlag(true);
// self.setRemoteOpendoorFlag(true);
self
.
setValueRemoteOpendoor
(
true
);
self
.
setValueRemoteOpendoor
(
true
);
self
.
setRemoteOpendoorDisabledFlag
(
false
);
}
else
if
(
data
.
notify_type
.
value
==
2
){
}
else
if
(
data
.
notify_type
.
value
==
2
){
getLockInfo
(
self
);
getLockInfo
(
self
);
}
}
...
@@ -736,32 +751,32 @@ function doorlockManageTap(self){
...
@@ -736,32 +751,32 @@ function doorlockManageTap(self){
//tap 开门记录
//tap 开门记录
function
opendoorRecordTap
(
self
){
function
opendoorRecordTap
(
self
){
// if(self.getValueOpendoorRecord() == 1
){
if
(
self
.
openTime
!=
null
){
self
.
opendoorRecordFlag
=
false
;
self
.
opendoorRecordFlag
=
false
;
//
setRecordTime('openTime', self.openTime.toISOString());
setRecordTime
(
'openTime'
,
self
.
openTime
.
toISOString
());
iot
.
navigator
.
openWindow
({
}
url
:
'./opendoorRecord.html'
,
iot
.
navigator
.
openWindow
({
id
:
'opendoorRecord
'
,
url
:
'./opendoorRecord.html
'
,
extras
:
{
id
:
'opendoorRecord'
,
deviceId
:
self
.
deviceId
extras
:
{
}
deviceId
:
self
.
deviceId
});
}
// }
});
}
}
//tap 安全报警
//tap 安全报警
function
securityAlarmTap
(
self
){
function
securityAlarmTap
(
self
){
// if(self.getValueSecurityAlarm()
== 1){
if
(
self
.
notifyTime
==
1
){
self
.
securityAlarmFlag
=
false
;
self
.
securityAlarmFlag
=
false
;
//
setRecordTime('notifyTime', self.notifyTime.toISOString());
setRecordTime
(
'notifyTime'
,
self
.
notifyTime
.
toISOString
());
iot
.
navigator
.
openWindow
({
}
url
:
'./alarmInfo.html'
,
iot
.
navigator
.
openWindow
({
id
:
'alarmInfo
'
,
url
:
'./alarmInfo.html
'
,
extras
:
{
id
:
'alarmInfo'
,
deviceId
:
self
.
deviceId
extras
:
{
}
deviceId
:
self
.
deviceId
});
}
// }
});
}
}
//tap 门锁用户
//tap 门锁用户
...
@@ -798,17 +813,17 @@ function remoteOpendoorTap(self){
...
@@ -798,17 +813,17 @@ function remoteOpendoorTap(self){
//tap 劫持报警
//tap 劫持报警
function
hijackAlarmTap
(
self
){
function
hijackAlarmTap
(
self
){
if
(
self
.
getValueHijackAlarm
()
==
1
){
if
(
self
.
alarmTime
==
1
){
self
.
hijackAlarmFlag
=
false
;
self
.
hijackAlarmFlag
=
false
;
// setRecordTime('alarmTime', self.alarmTime.toISOString());
setRecordTime
(
'alarmTime'
,
self
.
alarmTime
.
toISOString
());
iot
.
navigator
.
openWindow
({
url
:
'./hijackRecord.html'
,
id
:
'hijackRecord'
,
extras
:
{
deviceId
:
self
.
deviceId
}
});
}
}
iot
.
navigator
.
openWindow
({
url
:
'./hijackRecord.html'
,
id
:
'hijackRecord'
,
extras
:
{
deviceId
:
self
.
deviceId
}
});
}
}
//tap 保存二维码到相册
//tap 保存二维码到相册
...
...
dev/src/view/doorlockUsers/v_doorlockUser.js
View file @
c897678b
...
@@ -275,7 +275,7 @@ function getUserInfo(self){
...
@@ -275,7 +275,7 @@ function getUserInfo(self){
//设置用户信息
//设置用户信息
function
setUserInfo
(
self
,
data
){
function
setUserInfo
(
self
,
data
){
self
.
userInfo
=
{
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_bind
h
ead_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_bind
H
ead_icon.png'
,
role
:
data
.
role
,
role
:
data
.
role
,
title
:
data
.
nickname
,
title
:
data
.
nickname
,
subtitle
:
data
.
username
subtitle
:
data
.
username
...
...
dev/src/view/doorlockUsers/v_index.js
View file @
c897678b
...
@@ -187,7 +187,7 @@ function setUserData(self, data){
...
@@ -187,7 +187,7 @@ function setUserData(self, data){
list
[
i
]
=
{
list
[
i
]
=
{
value
:
data
[
i
].
id
,
value
:
data
[
i
].
id
,
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_bind
h
ead_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_bind
H
ead_icon.png'
,
title
:
data
[
i
].
nickname
,
title
:
data
[
i
].
nickname
,
subtitle
:
data
[
i
].
username
subtitle
:
data
[
i
].
username
}
}
...
...
web/view/device/index.html
View file @
c897678b
...
@@ -48,31 +48,31 @@
...
@@ -48,31 +48,31 @@
<div
class=
"guoupRow"
>
<div
class=
"guoupRow"
>
<!-- 开门记录 -->
<!-- 开门记录 -->
<div
class=
"col-xs-6 opendoorRecord"
v-bind:class=
"{newMsg: opendoorRecordFlag}"
>
<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>
<!-- 安全报警 -->
<!-- 安全报警 -->
<div
class=
"col-xs-6 securityAlarm"
v-bind:class=
"{newMsg: securityAlarmFlag}"
>
<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>
</div>
<div
class=
"guoupRow"
>
<div
class=
"guoupRow"
>
<!-- 门锁用户 -->
<!-- 门锁用户 -->
<div
class=
"col-xs-6 doorlockUser"
>
<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>
<!-- 劫持报警 -->
<!-- 劫持报警 -->
<div
class=
"col-xs-6 hijackAlarm"
v-bind:class=
"{newMsg: hijackAlarmFlag}"
>
<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>
</div>
<div
class=
"guoupRow"
>
<div
class=
"guoupRow"
>
<!-- 远程开门 -->
<!-- 远程开门 -->
<div
class=
"col-xs-6 remoteOpendoor"
v-bind:class=
"{newMsg: remoteOpendoorFlag}"
>
<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>
<!-- 门锁管理 -->
<!-- 门锁管理 -->
<div
class=
"col-xs-6 doorlockManage"
>
<div
class=
"col-xs-6 doorlockManage"
>
<u-switch
:value=
"valueDoorlockManage"
:init-param=
"componentsConfig.doorlockManageSwitch.initParam"
v-on:u-switch-tap=
"onDoorlockManageTap"
></u-switch>
<u-switch
:value=
"valueDoorlockManage"
:
disabled=
"doorlockManageDisabledFlag"
:
init-param=
"componentsConfig.doorlockManageSwitch.initParam"
v-on:u-switch-tap=
"onDoorlockManageTap"
></u-switch>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
web/view/device/index.js
View file @
c897678b
...
@@ -23861,17 +23861,29 @@ function init() {
...
@@ -23861,17 +23861,29 @@ function init() {
var
app
=
new
Vue
({
var
app
=
new
Vue
({
data
:
{
data
:
{
//开门记录
//开门记录
valueOpendoorRecord
:
0
,
valueOpendoorRecord
:
1
,
//安全报警
//安全报警
valueSecurityAlarm
:
0
,
valueSecurityAlarm
:
1
,
//门锁用户
//门锁用户
valueDoorlockUser
:
0
,
valueDoorlockUser
:
1
,
//劫持报警
valueHijackAlarm
:
1
,
//远程开门
//远程开门
valueRemoteOpendoor
:
0
,
valueRemoteOpendoor
:
0
,
//门锁管理
valueDoorlockManage
:
1
,
//开门记录
opendoorRecordDisabledFlag
:
false
,
//安全报警
securityAlarmDisabledFlag
:
false
,
//门锁用户
doorlockUserDisabledFlag
:
false
,
//劫持报警
//劫持报警
valueHijackAlarm
:
0
,
hijackAlarmDisabledFlag
:
false
,
//远程开门
remoteOpendoorDisabledFlag
:
true
,
//门锁管理
//门锁管理
valueDoorlockManage
:
0
,
doorlockManageDisabledFlag
:
false
,
//门锁最新消息是否滚动
//门锁最新消息是否滚动
activeFlag
:
true
,
activeFlag
:
true
,
//配置组件
//配置组件
...
@@ -23926,7 +23938,7 @@ function init() {
...
@@ -23926,7 +23938,7 @@ function init() {
console
.
log
(
response
);
console
.
log
(
response
);
var
data
=
_public
.
uPublic
.
checkResponseData
(
response
.
data
);
var
data
=
_public
.
uPublic
.
checkResponseData
(
response
.
data
);
if
(
response
.
data
==
'success'
)
{
if
(
response
.
data
==
'success'
)
{
setValueOfSwitch
(
self
,
0
);
setValueOfSwitch
(
self
,
1
);
}
else
if
(
data
)
{
}
else
if
(
data
)
{
self
.
mac
=
data
[
0
].
mac
;
self
.
mac
=
data
[
0
].
mac
;
self
.
deviceId
=
data
[
0
].
sn
;
self
.
deviceId
=
data
[
0
].
sn
;
...
@@ -23953,41 +23965,44 @@ function init() {
...
@@ -23953,41 +23965,44 @@ function init() {
},
},
methods
:
{
methods
:
{
getValueOpendoorRecord
:
function
getValueOpendoorRecord
(
)
{
setValueRemoteOpendoor
:
function
setValueRemoteOpendoor
(
value
)
{
return
this
.
valueOpendoorRecord
;
this
.
valueRemoteOpendoor
=
value
;
},
},
setValueOpendoorRecord
:
function
setValueOpendoorRecord
(
value
)
{
getOpendoorRecordDisabledFlag
:
function
getOpendoorRecordDisabledFlag
(
)
{
this
.
valueOpendoorRecord
=
value
;
return
this
.
opendoorRecordDisabledFlag
;
},
},
getValueSecurityAlarm
:
function
getValueSecurityAlarm
(
)
{
setOpendoorRecordDisabledFlag
:
function
setOpendoorRecordDisabledFlag
(
flag
)
{
return
this
.
valueSecurityAlarm
;
this
.
opendoorRecordDisabledFlag
=
flag
;
},
},
setValueSecurityAlarm
:
function
setValueSecurityAlarm
(
value
)
{
getSecurityAlarmDisabledFlag
:
function
getSecurityAlarmDisabledFlag
(
)
{
this
.
valueSecurityAlarm
=
value
;
return
this
.
securityAlarmDisabledFlag
;
},
},
getValueRemoteOpendoor
:
function
getValueRemoteOpendoor
(
)
{
setSecurityAlarmDisabledFlag
:
function
setSecurityAlarmDisabledFlag
(
flag
)
{
return
this
.
valueRemoteOpendoor
;
this
.
securityAlarmDisabledFlag
=
flag
;
},
},
setValueRemoteOpendoor
:
function
setValueRemoteOpendoor
(
value
)
{
getDoorlockUserDisabledFlag
:
function
getDoorlockUserDisabledFlag
(
)
{
this
.
valueRemoteOpendoor
=
value
;
return
this
.
doorlockUserDisabledFlag
;
},
},
getValueHijackAlarm
:
function
getValueHijackAlarm
(
)
{
setDoorlockUserDisabledFlag
:
function
setDoorlockUserDisabledFlag
(
flag
)
{
return
this
.
valueHijackAlarm
;
this
.
doorlockUserDisabledFlag
=
flag
;
},
},
setValueHijackAlarm
:
function
setValueHijackAlarm
(
value
)
{
getHijackAlarmDisabledFlag
:
function
getHijackAlarmDisabledFlag
(
)
{
this
.
valueHijackAlarm
=
value
;
return
this
.
hijackAlarmDisabledFlag
;
},
},
getValueDoorlockUser
:
function
getValueDoorlockUser
(
)
{
setHijackAlarmDisabledFlag
:
function
setHijackAlarmDisabledFlag
(
flag
)
{
return
this
.
valueDoorlockUser
;
this
.
hijackAlarmDisabledFlag
=
flag
;
},
},
setValueDoorlockUser
:
function
setValueDoorlockUser
(
value
)
{
getRemoteOpendoorDisabledFlag
:
function
getRemoteOpendoorDisabledFlag
(
)
{
this
.
valueDoorlockUser
=
value
;
return
this
.
remoteOpendoorDisabledFlag
;
},
},
getValueDoorlockManage
:
function
getValueDoorlockManage
(
)
{
setRemoteOpendoorDisabledFlag
:
function
setRemoteOpendoorDisabledFlag
(
flag
)
{
return
this
.
valueDoorlockManage
;
this
.
remoteOpendoorDisabledFlag
=
flag
;
},
},
setValueDoorlockManage
:
function
setValueDoorlockManage
(
value
)
{
getDoorlockManageDisabledFlag
:
function
getDoorlockManageDisabledFlag
()
{
this
.
valueDoorlockManage
=
value
;
return
this
.
doorlockManageDisabledFlag
;
},
setDoorlockManageDisabledFlag
:
function
setDoorlockManageDisabledFlag
(
flag
)
{
this
.
doorlockManageDisabledFlag
=
flag
;
},
},
getFollowShowFlag
:
function
getFollowShowFlag
()
{
getFollowShowFlag
:
function
getFollowShowFlag
()
{
return
this
.
followShowFlag
;
return
this
.
followShowFlag
;
...
@@ -24382,12 +24397,11 @@ function getRecordTimeMap(time) {
...
@@ -24382,12 +24397,11 @@ function getRecordTimeMap(time) {
}
}
function
setValueOfSwitch
(
self
,
flag
)
{
function
setValueOfSwitch
(
self
,
flag
)
{
self
.
setValueOpendoorRecord
(
flag
);
self
.
setOpendoorRecordDisabledFlag
(
flag
);
self
.
setValueSecurityAlarm
(
flag
);
self
.
setSecurityAlarmDisabledFlag
(
flag
);
self
.
setValueRemoteOpendoor
(
false
);
self
.
setDoorlockUserDisabledFlag
(
flag
);
self
.
setValueHijackAlarm
(
flag
);
self
.
setHijackAlarmDisabledFlag
(
flag
);
self
.
setValueDoorlockUser
(
flag
);
self
.
setDoorlockManageDisabledFlag
(
flag
);
self
.
setValueDoorlockManage
(
flag
);
}
}
function
getDeviceStatus
(
self
)
{
function
getDeviceStatus
(
self
)
{
...
@@ -24421,7 +24435,7 @@ function getLockInfo(self) {
...
@@ -24421,7 +24435,7 @@ function getLockInfo(self) {
getRecordTime
(
self
,
data
);
getRecordTime
(
self
,
data
);
//判断云端是否绑定
//判断云端是否绑定
if
(
data
.
lock_id
)
{
if
(
data
.
lock_id
)
{
setValueOfSwitch
(
self
,
1
);
setValueOfSwitch
(
self
,
false
);
self
.
setLockId
(
data
.
lock_id
);
self
.
setLockId
(
data
.
lock_id
);
self
.
setRole
(
data
.
role
);
self
.
setRole
(
data
.
role
);
if
(
self
.
isFirstGetLockInfo
)
{
if
(
self
.
isFirstGetLockInfo
)
{
...
@@ -24488,6 +24502,7 @@ function setDevceInfo(self, data) {
...
@@ -24488,6 +24502,7 @@ function setDevceInfo(self, data) {
//请求远程开门
//请求远程开门
// self.setRemoteOpendoorFlag(true);
// self.setRemoteOpendoorFlag(true);
self
.
setValueRemoteOpendoor
(
true
);
self
.
setValueRemoteOpendoor
(
true
);
self
.
setRemoteOpendoorDisabledFlag
(
false
);
}
else
if
(
data
.
notify_type
.
value
==
2
)
{
}
else
if
(
data
.
notify_type
.
value
==
2
)
{
getLockInfo
(
self
);
getLockInfo
(
self
);
}
}
...
@@ -24661,9 +24676,10 @@ function doorlockManageTap(self) {
...
@@ -24661,9 +24676,10 @@ function doorlockManageTap(self) {
//tap 开门记录
//tap 开门记录
function
opendoorRecordTap
(
self
)
{
function
opendoorRecordTap
(
self
)
{
// if(self.getValueOpendoorRecord() == 1){
if
(
self
.
openTime
!=
null
)
{
self
.
opendoorRecordFlag
=
false
;
self
.
opendoorRecordFlag
=
false
;
// setRecordTime('openTime', self.openTime.toISOString());
setRecordTime
(
'openTime'
,
self
.
openTime
.
toISOString
());
}
_public
.
iot
.
navigator
.
openWindow
({
_public
.
iot
.
navigator
.
openWindow
({
url
:
'./opendoorRecord.html'
,
url
:
'./opendoorRecord.html'
,
id
:
'opendoorRecord'
,
id
:
'opendoorRecord'
,
...
@@ -24671,14 +24687,14 @@ function opendoorRecordTap(self) {
...
@@ -24671,14 +24687,14 @@ function opendoorRecordTap(self) {
deviceId
:
self
.
deviceId
deviceId
:
self
.
deviceId
}
}
});
});
// }
}
}
//tap 安全报警
//tap 安全报警
function
securityAlarmTap
(
self
)
{
function
securityAlarmTap
(
self
)
{
// if(self.getValueSecurityAlarm() == 1){
if
(
self
.
notifyTime
==
1
)
{
self
.
securityAlarmFlag
=
false
;
self
.
securityAlarmFlag
=
false
;
// setRecordTime('notifyTime', self.notifyTime.toISOString());
setRecordTime
(
'notifyTime'
,
self
.
notifyTime
.
toISOString
());
}
_public
.
iot
.
navigator
.
openWindow
({
_public
.
iot
.
navigator
.
openWindow
({
url
:
'./alarmInfo.html'
,
url
:
'./alarmInfo.html'
,
id
:
'alarmInfo'
,
id
:
'alarmInfo'
,
...
@@ -24686,7 +24702,6 @@ function securityAlarmTap(self) {
...
@@ -24686,7 +24702,6 @@ function securityAlarmTap(self) {
deviceId
:
self
.
deviceId
deviceId
:
self
.
deviceId
}
}
});
});
// }
}
}
//tap 门锁用户
//tap 门锁用户
...
@@ -24723,17 +24738,17 @@ function remoteOpendoorTap(self) {
...
@@ -24723,17 +24738,17 @@ function remoteOpendoorTap(self) {
//tap 劫持报警
//tap 劫持报警
function
hijackAlarmTap
(
self
)
{
function
hijackAlarmTap
(
self
)
{
if
(
self
.
getValueHijackAlarm
()
==
1
)
{
if
(
self
.
alarmTime
==
1
)
{
self
.
hijackAlarmFlag
=
false
;
self
.
hijackAlarmFlag
=
false
;
// setRecordTime('alarmTime', self.alarmTime.toISOString());
setRecordTime
(
'alarmTime'
,
self
.
alarmTime
.
toISOString
());
_public
.
iot
.
navigator
.
openWindow
({
url
:
'./hijackRecord.html'
,
id
:
'hijackRecord'
,
extras
:
{
deviceId
:
self
.
deviceId
}
});
}
}
_public
.
iot
.
navigator
.
openWindow
({
url
:
'./hijackRecord.html'
,
id
:
'hijackRecord'
,
extras
:
{
deviceId
:
self
.
deviceId
}
});
}
}
//tap 保存二维码到相册
//tap 保存二维码到相册
...
...
web/view/doorlockUsers/doorlockUser.js
View file @
c897678b
...
@@ -1125,7 +1125,7 @@ function getUserInfo(self) {
...
@@ -1125,7 +1125,7 @@ function getUserInfo(self) {
//设置用户信息
//设置用户信息
function
setUserInfo
(
self
,
data
)
{
function
setUserInfo
(
self
,
data
)
{
self
.
userInfo
=
{
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_bind
h
ead_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_bind
H
ead_icon.png'
,
role
:
data
.
role
,
role
:
data
.
role
,
title
:
data
.
nickname
,
title
:
data
.
nickname
,
subtitle
:
data
.
username
subtitle
:
data
.
username
...
...
web/view/doorlockUsers/index.js
View file @
c897678b
...
@@ -1010,7 +1010,7 @@ function setUserData(self, data) {
...
@@ -1010,7 +1010,7 @@ function setUserData(self, data) {
list
[
i
]
=
{
list
[
i
]
=
{
value
:
data
[
i
].
id
,
value
:
data
[
i
].
id
,
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_bind
h
ead_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_bind
H
ead_icon.png'
,
title
:
data
[
i
].
nickname
,
title
:
data
[
i
].
nickname
,
subtitle
:
data
[
i
].
username
subtitle
:
data
[
i
].
username
};
};
...
...
web/view/doorlockUsers/unlockInfo.html
View file @
c897678b
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<div
class=
"header"
>
<div
class=
"header"
>
<v-touch
tag=
"span"
class=
"header-left icon"
v-on:tap=
"onBackTap"
>

</v-touch>
<v-touch
tag=
"span"
class=
"header-left icon"
v-on:tap=
"onBackTap"
>

</v-touch>
<p>
{{ $t('title.unlockInfo') }}
</p>
<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>
<div
class=
"content"
>
<div
class=
"content"
>
<p
class=
"title"
>
{{ $t('unlockInfo.bindUnlockInfo') }}
</p>
<p
class=
"title"
>
{{ $t('unlockInfo.bindUnlockInfo') }}
</p>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment