From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug
---
WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js
index 046dd1c..54d27f4 100644
--- a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js
+++ b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js
@@ -1,88 +1,89 @@
/**
- 鍏ラ┗灏忓尯
-**/
-(function(vc){
+ 鍏ラ┗灏忓尯
+ **/
+(function (vc) {
var DEFAULT_PAGE = 1;
var DEFAULT_ROWS = 10;
vc.extends({
- data:{
- machineManageInfo:{
- machines:[],
- total:0,
- records:1,
- moreCondition:false,
- machineName:'',
- conditions:{
- machineCode:'',
-machineTypeCd:'',
-machineName:'',
-machineIp:'',
-machineMac:'',
+ data: {
+ machineManageInfo: {
+ machines: [],
+ total: 0,
+ records: 1,
+ moreCondition: false,
+ machineName: '',
+ conditions: {
+ machineCode: '',
+ machineTypeCd: '',
+ machineName: '',
+ machineIp: '',
+ machineMac: '',
+ communityId:vc.getCurrentCommunity().communityId
}
}
},
- _initMethod:function(){
+ _initMethod: function () {
vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
},
- _initEvent:function(){
-
- vc.on('machineManage','listMachine',function(_param){
- vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
+ _initEvent: function () {
+
+ vc.on('machineManage', 'listMachine', function (_param) {
+ vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
});
- vc.on('pagination','page_event',function(_currentPage){
- vc.component._listMachines(_currentPage,DEFAULT_ROWS);
+ vc.on('pagination', 'page_event', function (_currentPage) {
+ vc.component._listMachines(_currentPage, DEFAULT_ROWS);
});
},
- methods:{
- _listMachines:function(_page, _rows){
+ methods: {
+ _listMachines: function (_page, _rows) {
vc.component.machineManageInfo.conditions.page = _page;
vc.component.machineManageInfo.conditions.row = _rows;
var param = {
- params:vc.component.machineManageInfo.conditions
- };
+ params: vc.component.machineManageInfo.conditions
+ };
- //鍙戦�乬et璇锋眰
- vc.http.get('machineManage',
- 'list',
- param,
- function(json,res){
- var _machineManageInfo=JSON.parse(json);
- vc.component.machineManageInfo.total = _machineManageInfo.total;
- vc.component.machineManageInfo.records = _machineManageInfo.records;
- vc.component.machineManageInfo.machines = _machineManageInfo.machines;
- vc.emit('pagination','init',{
- total:vc.component.machineManageInfo.records,
- currentPage:_page
- });
- },function(errInfo,error){
- console.log('璇锋眰澶辫触澶勭悊');
- }
- );
+ //鍙戦�乬et璇锋眰
+ vc.http.get('machineManage',
+ 'list',
+ param,
+ function (json, res) {
+ var _machineManageInfo = JSON.parse(json);
+ vc.component.machineManageInfo.total = _machineManageInfo.total;
+ vc.component.machineManageInfo.records = _machineManageInfo.records;
+ vc.component.machineManageInfo.machines = _machineManageInfo.machines;
+ vc.emit('pagination', 'init', {
+ total: vc.component.machineManageInfo.records,
+ currentPage: _page
+ });
+ }, function (errInfo, error) {
+ console.log('璇锋眰澶辫触澶勭悊');
+ }
+ );
},
- _openAddMachineModal:function(){
- vc.emit('addMachine','openAddMachineModal',{});
+ _openAddMachineModal: function () {
+ vc.emit('addMachine', 'openAddMachineModal', {});
},
- _openEditMachineModel:function(_machine){
- vc.emit('editMachine','openEditMachineModal',_machine);
+ _openEditMachineModel: function (_machine) {
+ vc.emit('editMachine', 'openEditMachineModal', _machine);
},
- _openDeleteMachineModel:function(_machine){
- vc.emit('deleteMachine','openDeleteMachineModal',_machine);
+ _openDeleteMachineModel: function (_machine) {
+ vc.emit('deleteMachine', 'openDeleteMachineModal', _machine);
},
- _queryMachineMethod:function(){
+ _queryMachineMethod: function () {
vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
},
- _moreCondition:function(){
- if(vc.component.machineManageInfo.moreCondition){
+ _moreCondition: function () {
+ if (vc.component.machineManageInfo.moreCondition) {
vc.component.machineManageInfo.moreCondition = false;
- }else{
+ } else {
vc.component.machineManageInfo.moreCondition = true;
}
}
-
+
}
});
})(window.vc);
--
Gitblit v1.8.0