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

优化代码

Browse Source
This commit is contained in:
java110 2021-01-25 18:14:48 +08:00
parent 32e50b7ee7
commit 1f30f6cac2
6 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -2,7 +2,7 @@
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<h3 class="m-t-none m-b ">添加设备门禁</h3> <h3 class="m-t-none m-b ">添加设备</h3>
<div class="ibox-content"> <div class="ibox-content">
<div> <div>
<div> <div>
@ -102,6 +102,24 @@
</div> </div>
</div> </div>
<div class="form-group row" v-show="addMachineInfo.locationType == '5000' ">
<label class="col-sm-2 col-form-label">归属部门</label>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<vc:create path="frame/orgSelect2" parentModal="addMachineModel"
callBackListener="addMachine" callBackFunction="notify"
namespace="addMachine"></vc:create>
</div>
<div class="col-sm-6">
<vc:create path="frame/departmentSelect2" parentModal="addMachineModel"
callBackListener="addMachine" callBackFunction="notify"
namespace="addMachine"></vc:create>
</div>
</div>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">设备IP</label> <label class="col-sm-2 col-form-label">设备IP</label>
<div class="col-sm-10"> <div class="col-sm-10">

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

@ -22,6 +22,7 @@
unitName: '', unitName: '',
roomId: '', roomId: '',
paId: '', paId: '',
orgId: '',
locationTypeCd: '', locationTypeCd: '',
locationObjId: '', locationObjId: '',
roomName: '', roomName: '',
@ -57,7 +58,13 @@
if (_param.hasOwnProperty("paId")) { if (_param.hasOwnProperty("paId")) {
vc.component.addMachineInfo.paId = _param.paId; vc.component.addMachineInfo.paId = _param.paId;
} }
}); });
vc.on('addMachine', 'staffSelect2', 'setStaff',function(_param){
if (_param.hasOwnProperty("orgId")) {
vc.component.addMachineInfo.orgId = _param.orgId;
}
})
}, },
methods: { methods: {
addMachineValidate: function () { addMachineValidate: function () {
@ -167,6 +174,7 @@
if (vc.component.addMachineInfo.locationType != '2000' if (vc.component.addMachineInfo.locationType != '2000'
&& vc.component.addMachineInfo.locationType != '3000' && vc.component.addMachineInfo.locationType != '3000'
&& vc.component.addMachineInfo.locationType != '4000' && vc.component.addMachineInfo.locationType != '4000'
&& vc.component.addMachineInfo.locationType != '5000'
) { //大门时直接写 小区ID ) { //大门时直接写 小区ID
vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId; vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
} else if (vc.component.addMachineInfo.locationType == '2000') { } else if (vc.component.addMachineInfo.locationType == '2000') {
@ -175,6 +183,8 @@
vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId; vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
} else if (vc.component.addMachineInfo.locationType == '4000') { } else if (vc.component.addMachineInfo.locationType == '4000') {
vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.paId; vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.paId;
} else if (vc.component.addMachineInfo.locationType == '5000') {
vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.orgId;
} else { } else {
vc.toast("设备位置值错误"); vc.toast("设备位置值错误");
return; return;
@ -241,7 +251,8 @@
unitId: '', unitId: '',
unitName: '', unitName: '',
roomId: '', roomId: '',
paId: '' paId: '',
orgId: ''
}; };
}, },
_initAddMachineData: function () { _initAddMachineData: function () {

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

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

20
public/components/property/editMachine/editMachine.html
View File

@ -92,7 +92,7 @@
</vc:create> </vc:create>
</div> </div>
</div> </div>
<div class="form-group row" v-show="addMachineInfo.locationType == '4000' "> <div class="form-group row" v-show="editMachineInfo.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"> <div class="col-sm-10">
<vc:create path="property/parkingAreaSelect2" parentModal="editMachineModel" <vc:create path="property/parkingAreaSelect2" parentModal="editMachineModel"
@ -100,6 +100,24 @@
</vc:create> </vc:create>
</div> </div>
</div> </div>
<div class="form-group row" v-show="editMachineInfo.locationType == '5000' ">
<label class="col-sm-2 col-form-label">归属部门</label>
<div class="col-sm-10">
<div class="row">
<div class="col-sm-6">
<vc:create path="frame/orgSelect2" parentModal="editMachineModel"
callBackListener="editMachine" callBackFunction="notify"
namespace="editMachine"></vc:create>
</div>
<div class="col-sm-6">
<vc:create path="frame/departmentSelect2" parentModal="editMachineModel"
callBackListener="editMachine" callBackFunction="notify"
namespace="editMachine"></vc:create>
</div>
</div>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">设备IP</label> <label class="col-sm-2 col-form-label">设备IP</label>
<div class="col-sm-10"> <div class="col-sm-10">

16
public/components/property/editMachine/editMachine.js
View File

@ -18,6 +18,7 @@
unitNum: '', unitNum: '',
roomId: '', roomId: '',
paId: '', paId: '',
orgId: '',
locationTypeCd: '', locationTypeCd: '',
locationObjId: '', locationObjId: '',
roomNum: '', roomNum: '',
@ -75,6 +76,11 @@
paId: vc.component.editMachineInfo.paId, paId: vc.component.editMachineInfo.paId,
num: vc.component.editMachineInfo.num num: vc.component.editMachineInfo.num
}); });
} else if (vc.component.editMachineInfo.locationTypeCd == '5000') {
vc.emit('editMachine', 'orgSelect2', 'setOrg', {
orgId: vc.component.editMachineInfo.orgId,
num: vc.component.editMachineInfo.num
});
} }
if (_params.hasOwnProperty('machineAttrs')) { if (_params.hasOwnProperty('machineAttrs')) {
@ -104,6 +110,11 @@
vc.component.editMachineInfo.roomId = _param.roomId; vc.component.editMachineInfo.roomId = _param.roomId;
} }
}); });
vc.on('editMachine', 'staffSelect2', 'setStaff',function(_param){
if (_param.hasOwnProperty("orgId")) {
vc.component.addMachineInfo.orgId = _param.orgId;
}
})
}, },
methods: { methods: {
_initMachineUrl: function () { _initMachineUrl: function () {
@ -234,7 +245,8 @@
vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId; vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
if (vc.component.editMachineInfo.locationType != '2000' if (vc.component.editMachineInfo.locationType != '2000'
&& vc.component.editMachineInfo.locationType != '3000' && vc.component.editMachineInfo.locationType != '3000'
&& vc.component.editMachineInfo.locationType != '4000') { //大门时直接写 小区ID && vc.component.editMachineInfo.locationType != '4000'
&& vc.component.editMachineInfo.locationType != '5000') { //大门时直接写 小区ID
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId; vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId;
} else if (vc.component.editMachineInfo.locationType == '2000') { } else if (vc.component.editMachineInfo.locationType == '2000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId; vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId;
@ -242,6 +254,8 @@
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId; vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId;
} else if (vc.component.editMachineInfo.locationType == '4000') { } else if (vc.component.editMachineInfo.locationType == '4000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.paId; vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.paId;
} else if (vc.component.addMachineInfo.locationType == '5000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.orgId;
} else { } else {
vc.toast("设备位置值错误"); vc.toast("设备位置值错误");
return; return;