Skip to content

D
DoorLock
Commit 3d49faac by 朱建香
Options

1012

parent 803870aa
Showing with 74 additions and 69 deletions
dev/src/public/public.js
......@@ -16,11 +16,11 @@ const iot = new UIOT({
appId: ''
},
cloud: {
url: 'http://192.168.2.96:20000'
url: 'http://wx.iotface.com'
},
plugin: {
log: {
url: 'http://192.168.2.213:3302/log'
url: 'http://admin.iot.u-gen.net/admin/view/debug'
}
}
});
......
dev/src/view/device/v_index.js
......@@ -270,7 +270,7 @@ function init() {
},
//tap 门锁用户
onDoorlockUserTap(){
doorlockUserTap();
doorlockUserTap(this);
},
//tap 远程开门
onRemoteOpendoorTap(){
......@@ -435,8 +435,6 @@ function setDevceInfo(self, data) {
}
}
//tap 个人信息
function myInfoTap(self){
iot.navigator.openWindow({
......@@ -496,12 +494,15 @@ function securityAlarmTap(self){
}
//tap 门锁用户
function doorlockUserTap(){
// if(self.getValueDoorlockUser == 1){
function doorlockUserTap(self){
// if(self.getValueDoorlockUser() == 1){
// iot.navigator.openWindow({
// url: '../doorlockUsers/',
// id: 'doorlockUsers',
// });
// url: '../doorlockUsers/',
// id: 'doorlockUsers',
// extras: {
// deviceId: self.deviceId
// }
// });
// }
}
......
dev/src/view/doorlockUsers/v_addUser.js
......@@ -94,41 +94,42 @@ function nameChange(self,text){
//tap 确定
function confirmButtonTap(self){
if(self.getTextName() == null || self.getTextName().trim() == ''){
self.setTextErrorTip(Vue.t('addUser.nameCanNotEmpty'));
self.setTextErrorTip(Vue.t('addUser.error.nameCanNotEmpty'));
}else{
uComponents.showLoading(self);
iot.business.api.sendCustom('lock/addUser',{
data: {
device_id: self.extras.deviceId
},
success: (response) => {
console.log(response);
uComponents.openAlert(self, Vue.t('addUser.addUserSuccess'), {
text: Vue.t('btn.confirm'), callback: function () {
console.log("添加用户成功");
//跳转到门锁用户界面
iot.storage.setMap('lock_id', data.lock_id, () => {
self.$router.replace({path: '/myDoorlock'});
}, () => {
error();
});
iot.navigator.openWindow({
url: './doorlockUser.html',
id: 'doorlockUser'
});
}
});
},
error: (error) => {
console.log(error);
uComponents.openAlert(self, Vue.t('addUser.addUserFailure'), {
text: Vue.t('btn.confirm'), callback: function () {
console.log("添加用户失败");
}
});
},
complete: () => {
uComponents.hideLoading(self);
}
});
}
iot.business.api.sendCustom('lock/addUser',{
data: {
device_id: self.extras.deviceId
},
success: (response) => {
console.log(response);
uComponents.openAlert(self, Vue.t('addUser.addUserSuccess'), {
text: Vue.t('btn.confirm'), callback: function () {
console.log("添加用户成功");
//跳转到门锁用户界面
iot.navigator.openWindow({
url: '../doorlockUsers/addUser.',
id: 'addUser',
});
}
});
},
error: (error) => {
console.log(error);
uComponents.openAlert(self, Vue.t('addUser.addUserFailure'), {
text: Vue.t('btn.confirm'), callback: function () {
console.log("添加用户失败");
}
});
},
complete: () => {
uComponents.hideLoading(self);
}
});
iot.navigator.openWindow({
url: './doorlockUser.html',
id: 'doorlockUser'
});
}
\ No newline at end of file
dev/src/view/doorlockUsers/v_index.js
......@@ -28,11 +28,10 @@ function init() {
extras: {}
},
mounted(){
self.extras = iot.navigator.getExtras();
this.extras = iot.navigator.getExtras();
//获取用户列表
getUserList();
// this.userList = [{value: 1, role: 0, image: '../../resources/image/green_admin_icon.png', title: '我是用户', subtitle: "MM"},
// {value: 1, role: 1, image: '../../resources/image/green_bindhead_icon.png', title: '我是用户', subtitle: "MM"}]
getUserList(this);
//
},
methods:{
getUserList(){
......@@ -91,6 +90,7 @@ function initComponentsConfig() {
//获取用户列表
function getUserList(self){
console.log(self.extras);
uComponents.showLoading(self);
iot.business.device.getUsers({
data: {
......@@ -98,23 +98,27 @@ function getUserList(self){
},
success: (response) => {
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(data){
let list = [];
for(let i = 0; i < data.length ; i++){
list[i] = {
value: data.userId,
role: data.role,
image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.name == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindhead_icon.png',
title: data.nickname,
subTitle: data.name
}
}
// let data = uPublic.checkResponseData(response.data);
// if(data){
// let list = [];
// for(let i = 0; i < data.length ; i++){
// list[i] = {
// value: data.userId,
// role: data.role,
// image: data.role == 0 ? '../../resources/image/green_admin_icon.png' : data.name == null ? '../../resources/image/gray_unbindHead_icon.png' : '../../resources/image/green_bindhead_icon.png',
// title: data.nickname,
// subTitle: data.name
// }
// }
let list = [{value: 1, role: 0, image: '../../resources/image/green_admin_icon.png', title: '我是用户', subtitle: "MM"},
{value: 1, role: 1, image: '../../resources/image/green_bindhead_icon.png', title: '我是用户', subtitle: "MM"}];
self.setUserList(self.getUserList().concat(list));
if(data.length > 0){
self.setStartId(data[data.length-1].id);
}
}
console.log(self.getUserList());
// if(data.length > 0){
// self.setStartId(data[data.length-1].id);
// }
// }
},
error: (error) => {
console.log(error);
......@@ -150,8 +154,8 @@ function swipeRightRow(self) {
// 点击组件列表 通知事件和当前点击列表下标
function onTapUserList(self, listIndex) {
iot.navigator.openWindow({
url: '../doorlockUsers/doorlockUsers.html',
id: 'doorlockUsers',
url: './doorlockUser.html',
id: 'doorlockUser',
});
if (self.userListIndex != null) {
self.userListIndex = null;
......
web/lib/js/p.js
......@@ -9519,11 +9519,11 @@ var iot = new UIOT({
appId: ''
},
cloud: {
url: 'http://192.168.2.96:20000'
url: 'http://wx.iotface.com'
},
plugin: {
log: {
url: 'http://192.168.2.213:3302/log'
url: 'http://admin.iot.u-gen.net/admin/view/debug'
}
}
});
......
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