diff --git a/public/components/machine/addAccessControlWhite/addAccessControlWhite.html b/public/components/machine/addAccessControlWhite/addAccessControlWhite.html deleted file mode 100644 index aa8cb0308..000000000 --- a/public/components/machine/addAccessControlWhite/addAccessControlWhite.html +++ /dev/null @@ -1,126 +0,0 @@ - \ No newline at end of file diff --git a/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.html b/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.html new file mode 100644 index 000000000..5ff535648 --- /dev/null +++ b/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.html @@ -0,0 +1,30 @@ + diff --git a/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.js b/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.js new file mode 100644 index 000000000..9faabf591 --- /dev/null +++ b/public/components/machine/addAccessControlWhiteAuth/addAccessControlWhiteAuth.js @@ -0,0 +1,97 @@ +(function(vc){ + + vc.extends({ + propTypes: { + callBackListener:vc.propTypes.string, //父组件名称 + callBackFunction:vc.propTypes.string //父组件监听方法 + }, + data:{ + addAccessControlWhiteAuthInfo:{ + acwaId:'', + machineId:'', + + } + }, + _initMethod:function(){ + + }, + _initEvent:function(){ + vc.on('addAccessControlWhiteAuth','openAddAccessControlWhiteAuthModal',function(){ + $('#addAccessControlWhiteAuthModel').modal('show'); + }); + }, + methods:{ + addAccessControlWhiteAuthValidate(){ + return vc.validate.validate({ + addAccessControlWhiteAuthInfo:vc.component.addAccessControlWhiteAuthInfo + },{ + 'addAccessControlWhiteAuthInfo.machineId':[ +{ + limit:"required", + param:"", + errInfo:"设备ID不能为空" + }, + { + limit:"maxLength", + param:"30", + errInfo:"设备ID不能超过30" + }, + ], + + + + + }); + }, + saveAccessControlWhiteAuthInfo:function(){ + if(!vc.component.addAccessControlWhiteAuthValidate()){ + vc.toast(vc.validate.errInfo); + + return ; + } + + vc.component.addAccessControlWhiteAuthInfo.communityId = vc.getCurrentCommunity().communityId; + //不提交数据将数据 回调给侦听处理 + if(vc.notNull($props.callBackListener)){ + vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addAccessControlWhiteAuthInfo); + $('#addAccessControlWhiteAuthModel').modal('hide'); + return ; + } + + vc.http.apiPost( + 'accessControlWhiteAuth.saveAccessControlWhiteAuth', + JSON.stringify(vc.component.addAccessControlWhiteAuthInfo), + { + emulateJSON:true + }, + function(json,res){ + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + let _json = JSON.parse(json); + if (_json.code == 0) { + //关闭model + $('#addAccessControlWhiteAuthModel').modal('hide'); + vc.component.clearAddAccessControlWhiteAuthInfo(); + vc.emit('accessControlWhiteAuthManage','listAccessControlWhiteAuth',{}); + + return ; + } + vc.message(_json.msg); + + }, + function(errInfo,error){ + console.log('请求失败处理'); + + vc.message(errInfo); + + }); + }, + clearAddAccessControlWhiteAuthInfo:function(){ + vc.component.addAccessControlWhiteAuthInfo = { + machineId:'', + + }; + } + } + }); + +})(window.vc); diff --git a/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.html b/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.html new file mode 100644 index 000000000..f5f5adb53 --- /dev/null +++ b/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.html @@ -0,0 +1,19 @@ + diff --git a/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.js b/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.js new file mode 100644 index 000000000..99dd3bb21 --- /dev/null +++ b/public/components/machine/deleteAccessControlWhiteAuth/deleteAccessControlWhiteAuth.js @@ -0,0 +1,52 @@ +(function(vc,vm){ + + vc.extends({ + data:{ + deleteAccessControlWhiteAuthInfo:{ + + } + }, + _initMethod:function(){ + + }, + _initEvent:function(){ + vc.on('deleteAccessControlWhiteAuth','openDeleteAccessControlWhiteAuthModal',function(_params){ + + vc.component.deleteAccessControlWhiteAuthInfo = _params; + $('#deleteAccessControlWhiteAuthModel').modal('show'); + + }); + }, + methods:{ + deleteAccessControlWhiteAuth:function(){ + vc.component.deleteAccessControlWhiteAuthInfo.communityId=vc.getCurrentCommunity().communityId; + vc.http.apiPost( + 'accessControlWhiteAuth.deleteAccessControlWhiteAuth', + JSON.stringify(vc.component.deleteAccessControlWhiteAuthInfo), + { + emulateJSON:true + }, + function(json,res){ + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + let _json = JSON.parse(json); + if (_json.code == 0) { + //关闭model + $('#deleteAccessControlWhiteAuthModel').modal('hide'); + vc.emit('accessControlWhiteAuthManage','listAccessControlWhiteAuth',{}); + return ; + } + vc.message(_json.msg); + }, + function(errInfo,error){ + console.log('请求失败处理'); + vc.message(json); + + }); + }, + closeDeleteAccessControlWhiteAuthModel:function(){ + $('#deleteAccessControlWhiteAuthModel').modal('hide'); + } + } + }); + +})(window.vc,window.vc.component); diff --git a/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.html b/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.html new file mode 100644 index 000000000..cee8df06a --- /dev/null +++ b/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.html @@ -0,0 +1,101 @@ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+ +
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
{{accessControlWhiteAuth.acwaId}}{{accessControlWhiteAuth.machineId}}
+ +
+
+ +
+
    +
    + + +
    +
    +
    +
    + + + + + + + +
    diff --git a/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.js b/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.js new file mode 100644 index 000000000..35293cf86 --- /dev/null +++ b/public/pages/machine/accessControlWhiteAuthManage/accessControlWhiteAuthManage.js @@ -0,0 +1,86 @@ +/** + 入驻小区 +**/ +(function(vc){ + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data:{ + accessControlWhiteAuthManageInfo:{ + accessControlWhiteAuths:[], + total:0, + records:1, + moreCondition:false, + acwaId:'', + conditions:{ + acwaId:'', +acwId:'', +machineId:'', +communityId:'', + + } + } + }, + _initMethod:function(){ + vc.component._listAccessControlWhiteAuths(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent:function(){ + + vc.on('accessControlWhiteAuthManage','listAccessControlWhiteAuth',function(_param){ + vc.component._listAccessControlWhiteAuths(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination','page_event',function(_currentPage){ + vc.component._listAccessControlWhiteAuths(_currentPage,DEFAULT_ROWS); + }); + }, + methods:{ + _listAccessControlWhiteAuths:function(_page, _rows){ + + vc.component.accessControlWhiteAuthManageInfo.conditions.page = _page; + vc.component.accessControlWhiteAuthManageInfo.conditions.row = _rows; + var param = { + params:vc.component.accessControlWhiteAuthManageInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('accessControlWhiteAuth.listAccessControlWhiteAuths', + param, + function(json,res){ + var _accessControlWhiteAuthManageInfo=JSON.parse(json); + vc.component.accessControlWhiteAuthManageInfo.total = _accessControlWhiteAuthManageInfo.total; + vc.component.accessControlWhiteAuthManageInfo.records = _accessControlWhiteAuthManageInfo.records; + vc.component.accessControlWhiteAuthManageInfo.accessControlWhiteAuths = _accessControlWhiteAuthManageInfo.data; + vc.emit('pagination','init',{ + total:vc.component.accessControlWhiteAuthManageInfo.records, + currentPage:_page + }); + },function(errInfo,error){ + console.log('请求失败处理'); + } + ); + }, + _openAddAccessControlWhiteAuthModal:function(){ + vc.emit('addAccessControlWhiteAuth','openAddAccessControlWhiteAuthModal',{}); + }, + _openEditAccessControlWhiteAuthModel:function(_accessControlWhiteAuth){ + vc.emit('editAccessControlWhiteAuth','openEditAccessControlWhiteAuthModal',_accessControlWhiteAuth); + }, + _openDeleteAccessControlWhiteAuthModel:function(_accessControlWhiteAuth){ + vc.emit('deleteAccessControlWhiteAuth','openDeleteAccessControlWhiteAuthModal',_accessControlWhiteAuth); + }, + _queryAccessControlWhiteAuthMethod:function(){ + vc.component._listAccessControlWhiteAuths(DEFAULT_PAGE, DEFAULT_ROWS); + + }, + _moreCondition:function(){ + if(vc.component.accessControlWhiteAuthManageInfo.moreCondition){ + vc.component.accessControlWhiteAuthManageInfo.moreCondition = false; + }else{ + vc.component.accessControlWhiteAuthManageInfo.moreCondition = true; + } + } + + + } + }); +})(window.vc); diff --git a/public/pages/machine/accessControlWhiteManage/accessControlWhiteManage.js b/public/pages/machine/accessControlWhiteManage/accessControlWhiteManage.js index 776706ba9..6288c6f37 100644 --- a/public/pages/machine/accessControlWhiteManage/accessControlWhiteManage.js +++ b/public/pages/machine/accessControlWhiteManage/accessControlWhiteManage.js @@ -74,7 +74,8 @@ ); }, _openAddAccessControlWhiteModal: function () { - vc.emit('addAccessControlWhite', 'openAddAccessControlWhiteModal', {}); + //vc.emit('addAccessControlWhite', 'openAddAccessControlWhiteModal', {}); + vc.jumpToPage('/#/pages/machine/addAccessControlWhite') }, _openEditAccessControlWhiteModel: function (_accessControlWhite) { vc.emit('editAccessControlWhite', 'openEditAccessControlWhiteModal', _accessControlWhite); diff --git a/public/pages/machine/addAccessControlWhite/addAccessControlWhite.html b/public/pages/machine/addAccessControlWhite/addAccessControlWhite.html new file mode 100644 index 000000000..9be31fab9 --- /dev/null +++ b/public/pages/machine/addAccessControlWhite/addAccessControlWhite.html @@ -0,0 +1,126 @@ +
    +
    +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/public/components/machine/addAccessControlWhite/addAccessControlWhite.js b/public/pages/machine/addAccessControlWhite/addAccessControlWhite.js similarity index 100% rename from public/components/machine/addAccessControlWhite/addAccessControlWhite.js rename to public/pages/machine/addAccessControlWhite/addAccessControlWhite.js