admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 21:59:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
java110 2021-10-20 00:40:57 +08:00
parent 9fb21f1ae5
commit b4fad0d5ff
22 changed files with 182 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/components/property/addLocation/addLocation.html
View File

@ -23,7 +23,7 @@
<option value="6000">楼栋</option>
<option value="2000">单元</option>
<option value="3000">房屋</option>
<option value="4000">停车场</option>
<option value="4000">岗亭</option>
<option value="5000">部门</option>
</select> </div>
</div>

4
public/components/property/addMachine/addMachine.html
View File

@ -95,9 +95,9 @@
</div>
</div>
<div class="form-group row" v-show="addMachineInfo.locationType == '4000' ">
<label class="col-sm-2 col-form-label">归属停车场</label>
<label class="col-sm-2 col-form-label">归属岗亭</label>
<div class="col-sm-10">
<vc:create path="property/parkingAreaSelect2" parentModal="addMachineModel"
<vc:create path="property/parkingBoxSelect2" parentModal="addMachineModel"
callBackListener="addMachine" callBackFunction="notify" namespace="addMachine">
</vc:create>
</div>

10
public/components/property/addMachine/addMachine.js
View File

@ -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',

2
public/components/property/editLocation/editLocation.html
View File

@ -23,7 +23,7 @@
<option value="6000">楼栋</option>
<option value="2000">单元</option>
<option value="3000">房屋</option>
<option value="4000">停车场</option>
<option value="4000">岗亭</option>
<option value="5000">部门</option>
</select>
</div>

6
public/components/property/parkingAreaControlBlackCar/parkingAreaControlBlackCar.js
View File

@ -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,

6
public/components/property/parkingAreaControlCarInouts/parkingAreaControlCarInouts.js
View File

@ -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
}

6
public/components/property/parkingAreaControlFee/parkingAreaControlFee.js
View File

@ -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,
}
};

6
public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.js
View File

@ -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
}

6
public/components/property/parkingAreaControlOwnerCar/parkingAreaControlOwnerCar.js
View File

@ -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
}

6
public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.js
View File

@ -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
}

6
public/components/property/parkingAreaControlRemaining/parkingAreaControlRemaining.js
View File

@ -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请求

6
public/components/property/parkingAreaControlTempCar/parkingAreaControlTempCar.js
View File

@ -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,
}

10
public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.js
View File

@ -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 = "";

6
public/components/property/parkingAreaControlWhiteCar/parkingAreaControlWhiteCar.js
View File

@ -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,
}

5
public/components/property/parkingBoxSelect2/parkingBoxSelect2.html Normal file
View File

@ -0,0 +1,5 @@
<select class="form-control" id = "parkingBoxSelector">
<option value="">请选择停车场</option>
</select>

119
public/components/property/parkingBoxSelect2/parkingBoxSelect2.js Normal file
View File

@ -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);

2
public/pages/property/locationManage/locationManage.html
View File

@ -29,7 +29,7 @@
<option value="6000">楼栋</option>
<option value="2000">单元</option>
<option value="3000">房屋</option>
<option value="4000">停车场</option>
<option value="4000">岗亭</option>
<option value="5000">部门</option>
</select>
</div>

12
public/pages/property/parkingAreaControl/parkingAreaControl.js
View File

@ -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;
}

6
public/pages/property/parkingAreaManage/parkingAreaManage.html
View File

@ -88,11 +88,7 @@
v-on:click="_openParkingAreaText(parkingArea)">问候语
</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openParkingAreaControl(parkingArea)">控制台
</button>
</div>
</td>

4
public/pages/property/parkingAreaManage/parkingAreaManage.js
View File

@ -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);

5
public/pages/property/parkingBoxManage/parkingBoxManage.html
View File

@ -84,6 +84,11 @@
<button class="btn-white btn btn-xs"
v-on:click="_parkingBoxArea(parkingBox)">共享岗亭</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openParkingAreaControl(parkingBox)">控制台
</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openEditParkingBoxModel(parkingBox)">修改</button>

3
public/pages/property/parkingBoxManage/parkingBoxManage.js
View File

@ -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)
}