Skip to content

D
DoorLock
Commit ab4aa5fa by 朱建香
Options

Merge branch 'wangying' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx 

# Conflicts:
#	dev/src/lang/zh.json
#	dev/src/view/addDevice/v_scanCodeAdd.js
#	dev/src/view/doorlockManage/v_editName.js
#	dev/src/view/doorlockManage/v_index.js
#	dev/src/view/doorlockManage/v_qrcode.js
parents a83b18f2 1c44f093
Showing with 160 additions and 42 deletions
History.md
1.0.0 / 2017-09-13
1.0.4 / 2017-09-20
==================
* 1.上传项目开发环境
\ No newline at end of file
* 1.修改生成绑定二维码页面样式
1.0.3 / 2017-09-18
==================
* 1.上传用户列表、绑定用户、loading+成功/失败页面样式
1.0.2 / 2017-09-15
==================
* 1.上传设备控制、记录列表、门锁管理、修改名称页面样式
1.0.1 / 2017-09-15
==================
* 1.上传项目页面样式
1.0.0 / 2017-09-13
==================
* 1.上传项目开发环
\ No newline at end of file
dev/package.json
......@@ -9,7 +9,6 @@
"hammerjs": "2.0.8",
"iscroll": "5.2.0",
"moment": "^2.18.1",
"qrcode": "^0.9.0",
"ugen-components": "^0.1.0",
"underscore": "1.8.3",
"vue": "2.2.6",
......
dev/src/public/public.js
......@@ -16,7 +16,7 @@ const iot = new UIOT({
appId: ''
},
cloud: {
url: 'http://192.168.2.96:20000'
url: 'http://192.168.2.97:20007'
},
plugin: {
log: {
......
dev/src/view/addDevice/v_wifiAdd.js
......@@ -15,7 +15,6 @@ function init() {
uPublic.componentsInit(['u-text','u-button','u-commstatus-loading','u-dialog','u-loading']);
const app = new Vue({
data:{
textWiFiName: null,
textPassword: null,
textErrorTip: null,
textLoading: 'loading...',
......@@ -23,29 +22,9 @@ function init() {
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
iot.business.sds.findWifi({
data: {
// model: 'model',
// ssid: 'ssid',
wifiPwd: 'wifiPwd',
timeout: 20000
},
success: (response) => {
console.log(response);
},
error: (error) => {
console.log(error);
}
});
mounted(){
},
methods:{
getTextPassword(){
return this.textPassword;
},
setTextPassword(pwd){
this.textPassword = pwd;
},
getTextLoading(){
return this.textLoading;
},
......
dev/src/view/addDevice/v_wifiAddHelp.js
......@@ -63,18 +63,8 @@ function backTap(){
//tap 开始配置Wi-Fi
function wifiAddButtonTap(){
// iot.navigator.openWindow({
// url: './wifiAdd.html',
// id: 'wifiAdd'
// });
iot.business.sds.wifiDeviceConfig({
success: function (response) {
console.log('wifiDeviceConfig success');
console.log(response);
},
error: function (error) {
console.log('wifiDeviceConfig error');
console.log(error);
}
});
iot.navigator.openWindow({
url: './wifiAdd.html',
id: 'wifiAdd'
});
}
\ No newline at end of file
dev/src/view/c_grid-list.vue
......@@ -81,7 +81,6 @@
}
function changeList(self, list) {
console.log(list);
self.list = list;
self.setLoadShowFlag(list.length - self.list.length);
self.$nextTick(function () {
......
dev/src/view/device/v_hijackRecord.js 0 → 100644
/**
* v_hijackRecord.js
* Version: 0.1
* User: wy
* Date: 2017-09-06
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 劫持记录页面
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 list、dialog、loading组件
uPublic.componentsInit(['u-list','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
},
methods:{
//tap <
onBackTap(){
backTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
hijackRecordList:{
initParam: {
class: 'custom-list',
list: [
{value: 1, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.1306:10:10'},
{value: 2, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.0322:57:44'}
],
tip: Vue.t('hijackRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
}
}
//tap <
function backTap(){
iot.navigator.back();
}
\ No newline at end of file
dev/src/view/device/v_opendoorRecord.js 0 → 100644
/**
* v_opendoorRecord.js
* Version: 0.1
* User: wy
* Date: 2017-09-06
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 开门记录页面
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 list、dialog、loading组件
uPublic.componentsInit(['u-list','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
},
methods:{
//tap <
onBackTap(){
backTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
opendoorRecordList:{
initParam: {
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',}
],
tip: Vue.t('opendoorRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
}
}
//tap <
function backTap(){
iot.navigator.back();
}
\ No newline at end of file
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