From b4fad0d5ffa20ce43e6fb786c0398465ab378fe7 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 20 Oct 2021 00:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/addLocation/addLocation.html | 2 +- .../property/addMachine/addMachine.html | 4 +- .../property/addMachine/addMachine.js | 10 +- .../property/editLocation/editLocation.html | 2 +- .../parkingAreaControlBlackCar.js | 6 +- .../parkingAreaControlCarInouts.js | 6 +- .../parkingAreaControlFee.js | 6 +- .../parkingAreaControlInCar.js | 6 +- .../parkingAreaControlOwnerCar.js | 6 +- .../parkingAreaControlPayment.js | 6 +- .../parkingAreaControlRemaining.js | 6 +- .../parkingAreaControlTempCar.js | 6 +- .../parkingAreaControlVideo.js | 10 +- .../parkingAreaControlWhiteCar.js | 6 +- .../parkingBoxSelect2/parkingBoxSelect2.html | 5 + .../parkingBoxSelect2/parkingBoxSelect2.js | 119 ++++++++++++++++++ .../locationManage/locationManage.html | 2 +- .../parkingAreaControl/parkingAreaControl.js | 12 +- .../parkingAreaManage/parkingAreaManage.html | 6 +- .../parkingAreaManage/parkingAreaManage.js | 4 +- .../parkingBoxManage/parkingBoxManage.html | 5 + .../parkingBoxManage/parkingBoxManage.js | 3 + 22 files changed, 182 insertions(+), 56 deletions(-) create mode 100644 public/components/property/parkingBoxSelect2/parkingBoxSelect2.html create mode 100644 public/components/property/parkingBoxSelect2/parkingBoxSelect2.js diff --git a/public/components/property/addLocation/addLocation.html b/public/components/property/addLocation/addLocation.html index f3310dfe5..1951c432e 100755 --- a/public/components/property/addLocation/addLocation.html +++ b/public/components/property/addLocation/addLocation.html @@ -23,7 +23,7 @@ - + diff --git a/public/components/property/addMachine/addMachine.html b/public/components/property/addMachine/addMachine.html index 2e921bc3e..e31b8f4cf 100755 --- a/public/components/property/addMachine/addMachine.html +++ b/public/components/property/addMachine/addMachine.html @@ -95,9 +95,9 @@
- +
-
diff --git a/public/components/property/addMachine/addMachine.js b/public/components/property/addMachine/addMachine.js index 2f3ca96e7..3e607c17d 100755 --- a/public/components/property/addMachine/addMachine.js +++ b/public/components/property/addMachine/addMachine.js @@ -21,7 +21,7 @@ unitId: '', unitName: '', roomId: '', - paId: '', + boxId: '', orgId: '', locationTypeCd: '', locationObjId: '', @@ -60,8 +60,8 @@ vc.component.addMachineInfo.roomId = _param.roomId; } - if (_param.hasOwnProperty("paId")) { - vc.component.addMachineInfo.paId = _param.paId; + if (_param.hasOwnProperty("boxId")) { + vc.component.addMachineInfo.boxId = _param.boxId; } }); @@ -188,7 +188,7 @@ } else if (vc.component.addMachineInfo.locationType == '3000') { vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId; } else if (vc.component.addMachineInfo.locationType == '4000') { - vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.paId; + vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.boxId; } else if (vc.component.addMachineInfo.locationType == '5000') { vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.orgId; } else if (vc.component.addMachineInfo.locationType == '6000') { @@ -279,7 +279,7 @@ unitId: '', unitName: '', roomId: '', - paId: '', + boxId: '', orgId: '', typeId: '', isShow: 'true', diff --git a/public/components/property/editLocation/editLocation.html b/public/components/property/editLocation/editLocation.html index 219829443..f71a26fb0 100755 --- a/public/components/property/editLocation/editLocation.html +++ b/public/components/property/editLocation/editLocation.html @@ -23,7 +23,7 @@ - +
diff --git a/public/components/property/parkingAreaControlBlackCar/parkingAreaControlBlackCar.js b/public/components/property/parkingAreaControlBlackCar/parkingAreaControlBlackCar.js index c6599cd11..ec116fd82 100644 --- a/public/components/property/parkingAreaControlBlackCar/parkingAreaControlBlackCar.js +++ b/public/components/property/parkingAreaControlBlackCar/parkingAreaControlBlackCar.js @@ -8,7 +8,7 @@ data: { parkingAreaControlBlackCar: { cars: [], - paId: '', + boxId: '', carNum:'' } }, @@ -17,7 +17,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlBlackCar', 'switch', function (_data) { - $that.parkingAreaControlBlackCar.paId = _data.paId; + $that.parkingAreaControlBlackCar.boxId = _data.boxId; $that._loadParkingAreaControlBlackCars(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlBlackCar', 'paginationPlus', 'page_event', @@ -33,7 +33,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlBlackCar.paId, + boxId: $that.parkingAreaControlBlackCar.boxId, blackWhite: '1111', carNum: $that.parkingAreaControlBlackCar.carNum, diff --git a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js index 272900892..54117db30 100644 --- a/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js +++ b/public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js @@ -8,7 +8,7 @@ data: { parkingAreaControlCarInoutsInfo: { carIns: [], - paId: '', + boxId: '', state: '', carNum: '' } @@ -18,7 +18,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlCarInouts', 'switch', function (_data) { - $that.parkingAreaControlCarInoutsInfo.paId = _data.paId; + $that.parkingAreaControlCarInoutsInfo.boxId = _data.boxId; $that._loadParkingAreaControlCarInouts(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlCarInouts', 'paginationPlus', 'page_event', @@ -34,7 +34,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlCarInoutsInfo.paId, + boxId: $that.parkingAreaControlCarInoutsInfo.boxId, state: $that.parkingAreaControlCarInoutsInfo.state, carNum: $that.parkingAreaControlCarInoutsInfo.carNum } diff --git a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js index 5a9210e4f..dcb010d63 100644 --- a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js +++ b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.js @@ -14,11 +14,11 @@ openMsg: "", machineId: '-1', showRefresh:'', - paId:'' + boxId:'' } }, _initMethod: function () { - $that.parkingAreaControlFeeInfo.paId = vc.getParam('paId'); + $that.parkingAreaControlFeeInfo.boxId = vc.getParam('boxId'); $that._loadQrCodeUrl(); }, _initEvent: function () { @@ -47,7 +47,7 @@ var param = { params: { communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlFeeInfo.paId, + boxId: $that.parkingAreaControlFeeInfo.boxId, machineId: $that.parkingAreaControlFeeInfo.machineId, } }; diff --git a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js index af18b3edb..7b2f9cad3 100644 --- a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js +++ b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js @@ -8,7 +8,7 @@ data: { parkingAreaControlInCarInfo: { carIns: [], - paId: '', + boxId: '', state: '', carNum: '' } @@ -18,7 +18,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlInCar', 'switch', function (_data) { - $that.parkingAreaControlInCarInfo.paId = _data.paId; + $that.parkingAreaControlInCarInfo.boxId = _data.boxId; $that._loadParkingAreaControlInCarData(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlInCar', 'paginationPlus', 'page_event', @@ -33,7 +33,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlInCarInfo.paId, + boxId: $that.parkingAreaControlInCarInfo.boxId, carNum: $that.parkingAreaControlInCarInfo.carNum, state: $that.parkingAreaControlInCarInfo.carNum } diff --git a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js index a9fdd0c37..1a409f9e5 100644 --- a/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js +++ b/public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js @@ -8,7 +8,7 @@ data: { parkingAreaControlOwnerCar: { cars: [], - paId: '', + boxId: '', carNum: '' } }, @@ -17,7 +17,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlOwnerCar', 'switch', function (_data) { - $that.parkingAreaControlOwnerCar.paId = _data.paId; + $that.parkingAreaControlOwnerCar.boxId = _data.boxId; $that._loadParkingAreaControlOwnerCars(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlOwnerCar', 'paginationPlus', 'page_event', @@ -33,7 +33,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlOwnerCar.paId, + boxId: $that.parkingAreaControlOwnerCar.boxId, carTypeCds: '1001,1002', carNum: $that.parkingAreaControlOwnerCar.carNum } diff --git a/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.js b/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.js index abe15419c..0c8cf83ba 100644 --- a/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.js +++ b/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.js @@ -8,7 +8,7 @@ data: { parkingAreaControlPaymentInfo: { payments: [], - paId: '', + boxId: '', state: '', carNum: '' } @@ -18,7 +18,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlPayment', 'switch', function (_data) { - $that.parkingAreaControlPaymentInfo.paId = _data.paId; + $that.parkingAreaControlPaymentInfo.boxId = _data.boxId; $that._loadParkingAreaControlPayments(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlPayment', 'paginationPlus', 'page_event', @@ -34,7 +34,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlPaymentInfo.paId, + boxId: $that.parkingAreaControlPaymentInfo.boxId, state: $that.parkingAreaControlPaymentInfo.state, carNum: $that.parkingAreaControlPaymentInfo.carNum } diff --git a/public/components/property/parkingAreaControlRemaining/parkingAreaControlRemaining.js b/public/components/property/parkingAreaControlRemaining/parkingAreaControlRemaining.js index 333e42979..7643fa5e1 100644 --- a/public/components/property/parkingAreaControlRemaining/parkingAreaControlRemaining.js +++ b/public/components/property/parkingAreaControlRemaining/parkingAreaControlRemaining.js @@ -10,7 +10,7 @@ total: 0, freeCount: 0, createTime: '', - paId: '', + boxId: '', } }, _initMethod: function () { @@ -18,7 +18,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlRemaining', 'switch', function (_data) { - $that.parkingAreaControlRemaining.paId = _data.paId; + $that.parkingAreaControlRemaining.boxId = _data.boxId; $that._loadParkingAreaControlRemaining(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlRemaining', 'paginationPlus', 'page_event', @@ -32,7 +32,7 @@ let param = { params: { communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlRemaining.paId, + boxId: $that.parkingAreaControlRemaining.boxId, } }; //发送get请求 diff --git a/public/components/property/parkingAreaControlTempCar/parkingAreaControlTempCar.js b/public/components/property/parkingAreaControlTempCar/parkingAreaControlTempCar.js index 82f6a05f4..30492169e 100644 --- a/public/components/property/parkingAreaControlTempCar/parkingAreaControlTempCar.js +++ b/public/components/property/parkingAreaControlTempCar/parkingAreaControlTempCar.js @@ -8,7 +8,7 @@ data: { parkingAreaControlTempCar: { cars: [], - paId: '', + boxId: '', carNum:'' } }, @@ -17,7 +17,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlTempCar', 'switch', function (_data) { - $that.parkingAreaControlTempCar.paId = _data.paId; + $that.parkingAreaControlTempCar.boxId = _data.boxId; $that._loadParkingAreaControlTempCars(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlTempCar', 'paginationPlus', 'page_event', @@ -33,7 +33,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlTempCar.paId, + boxId: $that.parkingAreaControlTempCar.boxId, carTypeCd:'1003', carNum:$that.parkingAreaControlTempCar.carNum, } diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js index 9fc1c6bf8..a669f73f3 100644 --- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js +++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js @@ -5,7 +5,7 @@ vc.extends({ data: { parkingAreaControlVideoInfo: { - paId: '', + boxId: '', inMachineId: '', outMachineId: '', inMachines: [], @@ -18,8 +18,8 @@ }, _initEvent: function () { vc.on('parkingAreaControlVideo', 'notify', function (param) { - if (param.hasOwnProperty('paId')) { - $that.parkingAreaControlVideoInfo.paId = param.paId; + if (param.hasOwnProperty('boxId')) { + $that.parkingAreaControlVideoInfo.boxId = param.boxId; $that._listMachines(); } }) @@ -28,7 +28,7 @@ _listMachines: function () { let param = { params: { - locationObjId: $that.parkingAreaControlVideoInfo.paId, + locationObjId: $that.parkingAreaControlVideoInfo.boxId, page: 1, row: 100, machineTypeCd: '9996', @@ -117,7 +117,7 @@ }); vc.emit('parkingAreaControlFee', 'changeMachine', { machineId: _outMachineId, - paId: $that.parkingAreaControlVideoInfo.paId + boxId: $that.parkingAreaControlVideoInfo.boxId }); let paId = ""; diff --git a/public/components/property/parkingAreaControlWhiteCar/parkingAreaControlWhiteCar.js b/public/components/property/parkingAreaControlWhiteCar/parkingAreaControlWhiteCar.js index 3670e324c..2a0aba240 100644 --- a/public/components/property/parkingAreaControlWhiteCar/parkingAreaControlWhiteCar.js +++ b/public/components/property/parkingAreaControlWhiteCar/parkingAreaControlWhiteCar.js @@ -8,7 +8,7 @@ data: { parkingAreaControlWhiteCar: { cars: [], - paId: '', + boxId: '', carNum: '' } }, @@ -17,7 +17,7 @@ }, _initEvent: function () { vc.on('parkingAreaControlWhiteCar', 'switch', function (_data) { - $that.parkingAreaControlWhiteCar.paId = _data.paId; + $that.parkingAreaControlWhiteCar.boxId = _data.boxId; $that._loadParkingAreaControlWhiteCars(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('parkingAreaControlWhiteCar', 'paginationPlus', 'page_event', @@ -33,7 +33,7 @@ page: _page, row: _row, communityId: vc.getCurrentCommunity().communityId, - paId: $that.parkingAreaControlWhiteCar.paId, + boxId: $that.parkingAreaControlWhiteCar.boxId, blackWhite: '2222', carNum: $that.parkingAreaControlWhiteCar.carNum, } diff --git a/public/components/property/parkingBoxSelect2/parkingBoxSelect2.html b/public/components/property/parkingBoxSelect2/parkingBoxSelect2.html new file mode 100644 index 000000000..daadfc101 --- /dev/null +++ b/public/components/property/parkingBoxSelect2/parkingBoxSelect2.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/public/components/property/parkingBoxSelect2/parkingBoxSelect2.js b/public/components/property/parkingBoxSelect2/parkingBoxSelect2.js new file mode 100644 index 000000000..de604292d --- /dev/null +++ b/public/components/property/parkingBoxSelect2/parkingBoxSelect2.js @@ -0,0 +1,119 @@ +(function (vc) { + vc.extends({ + propTypes: { + parentModal: vc.propTypes.string, + callBackListener: vc.propTypes.string, //父组件名称 + callBackFunction: vc.propTypes.string //父组件监听方法 + }, + data: { + parkingBoxSelect2Info: { + parkingBoxs: [], + boxId: '-1', + boxName: '', + parkingBoxSelector: {}, + } + }, + watch: { + parkingBoxSelect2Info: { + deep: true, + handler: function () { + vc.emit($props.callBackListener, $props.callBackFunction, this.parkingBoxSelect2Info); + } + } + }, + _initMethod: function () { + this._initParkingBoxSelect2(); + }, + _initEvent: function () { + //监听 modal 打开 + vc.on('parkingBoxSelect2', 'setParkingBox', function (_param) { + vc.copyObject(_param, this.parkingBoxSelect2Info); + + var option = new Option(_param.num, _param.paId, true, true); + this.parkingBoxSelect2Info.parkingBoxSelector.append(option); + }); + + vc.on('parkingBoxSelect2', 'clearParkingBox', function (_param) { + this.parkingBoxSelect2Info = { + parkingBoxs: [], + boxId: '-1', + boxName: '', + parkingBoxSelector: {}, + }; + }); + }, + methods: { + _initParkingBoxSelect2: function () { + console.log("调用_initParkingBoxSelect2 方法"); + $.fn.modal.Constructor.prototype.enforceFocus = function () { + }; + $.fn.select2.defaults.set('width', '100%'); + this.parkingBoxSelect2Info.parkingBoxSelector = $('#parkingBoxSelector').select2({ + placeholder: '必填，请选择岗亭', + allowClear: true,//允许清空 + escapeMarkup: function (markup) { + return markup; + }, // 自定义格式化防止xss注入 + ajax: { + url: "/app/parkingBox.listParkingBox", + dataType: 'json', + delay: 250, + headers:{ + 'APP-ID': '8000418004', + 'TRANSACTION-ID' : vc.uuid(), + 'REQ-TIME': vc.getDateYYYYMMDDHHMISS(), + 'SIGN' : '' + }, + data: function (params) { + console.log("param", params); + var _term = ""; + if (params.hasOwnProperty("term")) { + _term = params.term; + } + return { + boxName: _term, + page: 1, + row: 50, + communityId: vc.getCurrentCommunity().communityId + }; + }, + processResults: function (data) { + console.log(data, this._filterParkingBoxData(data.data)); + return { + results: this._filterParkingBoxData(data.data) + }; + }, + cache: true + } + }); + $('#parkingBoxSelector').on("select2:select", function (evt) { + //这里是选中触发的事件 + //evt.params.data 是选中项的信息 + console.log('select', evt); + this.parkingBoxSelect2Info.boxId = evt.params.data.id; + this.parkingBoxSelect2Info.boxName = evt.params.data.text; + }); + + $('#parkingBoxSelector').on("select2:unselect", function (evt) { + //这里是取消选中触发的事件 + //如配置allowClear: true后，触发 + console.log('unselect', evt); + this.parkingBoxSelect2Info.boxId = '-1'; + this.parkingBoxSelect2Info.boxName = ''; + + }); + }, + _filterParkingBoxData: function (_parkingBoxs) { + var _tmpParkingBoxs = []; + for (var i = 0; i < _parkingBoxs.length; i++) { + var _tmpParkingBox = { + id: _parkingBoxs[i].boxId, + text: _parkingBoxs[i].boxName + }; + _tmpParkingBoxs.push(_tmpParkingBox); + } + return _tmpParkingBoxs; + } + } + }); +})(window.vc); diff --git a/public/pages/property/locationManage/locationManage.html b/public/pages/property/locationManage/locationManage.html index 3a4c70f97..db2aed584 100755 --- a/public/pages/property/locationManage/locationManage.html +++ b/public/pages/property/locationManage/locationManage.html @@ -29,7 +29,7 @@ - + diff --git a/public/pages/property/parkingAreaControl/parkingAreaControl.js b/public/pages/property/parkingAreaControl/parkingAreaControl.js index ae2eb9086..e31c8b344 100644 --- a/public/pages/property/parkingAreaControl/parkingAreaControl.js +++ b/public/pages/property/parkingAreaControl/parkingAreaControl.js @@ -6,17 +6,17 @@ data: { parkingAreaControlInfo: { _currentTab: 'parkingAreaControlCarInout', - paId: '', + boxId: '', inMachineId: '', outMachineId: '', } }, _initMethod: function () { - $that.parkingAreaControlInfo.paId = vc.getParam('paId'); + $that.parkingAreaControlInfo.boxId = vc.getParam('boxId'); $that._initParkingAreaWs(); vc.emit('parkingAreaControlVideo', 'notify', { - paId: $that.parkingAreaControlInfo.paId + boxId: $that.parkingAreaControlInfo.boxId }); }, _initEvent: function () { @@ -28,7 +28,7 @@ changeTab: function (_tab) { $that.parkingAreaControlInfo._currentTab = _tab; vc.emit(_tab, 'switch', { - paId: $that.parkingAreaControlInfo.paId + boxId: $that.parkingAreaControlInfo.boxId }) }, _initParkingAreaWs: function () { @@ -68,14 +68,14 @@ if (_protocol.startsWith('https')) { url = "wss://" + window.location.host + "/ws/parkingArea/" + - $that.parkingAreaControlInfo.paId + "/" + clientId; + $that.parkingAreaControlInfo.boxId + "/" + clientId; } else { // url = // "ws://" + window.location.host + "/ws/parkingArea/" + // $that.parkingAreaControlInfo.paId + "/" + clientId; url = "ws://demo.homecommunity.cn:9011/ws/parkingArea/" + - $that.parkingAreaControlInfo.paId + "/" + clientId; + $that.parkingAreaControlInfo.boxId + "/" + clientId; } diff --git a/public/pages/property/parkingAreaManage/parkingAreaManage.html b/public/pages/property/parkingAreaManage/parkingAreaManage.html index aaa4a0cf1..b53929c35 100755 --- a/public/pages/property/parkingAreaManage/parkingAreaManage.html +++ b/public/pages/property/parkingAreaManage/parkingAreaManage.html @@ -88,11 +88,7 @@ v-on:click="_openParkingAreaText(parkingArea)">问候语 -
- -
+ diff --git a/public/pages/property/parkingAreaManage/parkingAreaManage.js b/public/pages/property/parkingAreaManage/parkingAreaManage.js index a8f68d19d..fe4ffc81c 100755 --- a/public/pages/property/parkingAreaManage/parkingAreaManage.js +++ b/public/pages/property/parkingAreaManage/parkingAreaManage.js @@ -125,9 +125,7 @@ _openParkingAreaText:function(_parkingArea){ vc.jumpToPage('/admin.html#/pages/property/parkingAreaText?paId='+_parkingArea.paId) }, - _openParkingAreaControl:function(_parkingArea){ - vc.jumpToPage('/admin.html#/pages/property/parkingAreaControl?paId='+_parkingArea.paId) - } + } }); })(window.vc); \ No newline at end of file diff --git a/public/pages/property/parkingBoxManage/parkingBoxManage.html b/public/pages/property/parkingBoxManage/parkingBoxManage.html index 32c979976..30217be64 100644 --- a/public/pages/property/parkingBoxManage/parkingBoxManage.html +++ b/public/pages/property/parkingBoxManage/parkingBoxManage.html @@ -84,6 +84,11 @@ +
+ +
diff --git a/public/pages/property/parkingBoxManage/parkingBoxManage.js b/public/pages/property/parkingBoxManage/parkingBoxManage.js index f402b6e42..bb09b61a4 100644 --- a/public/pages/property/parkingBoxManage/parkingBoxManage.js +++ b/public/pages/property/parkingBoxManage/parkingBoxManage.js @@ -80,6 +80,9 @@ }, _parkingBoxArea: function (_parkingBox) { vc.jumpToPage('/admin.html#/pages/property/parkingBoxAreaManage?boxId=' + _parkingBox.boxId + "&boxName=" + _parkingBox.boxName); + }, + _openParkingAreaControl:function(_parkingBox){ + vc.jumpToPage('/admin.html#/pages/property/parkingAreaControl?boxId='+_parkingBox.boxId) }