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

优化代码

Browse Source
This commit is contained in:
java110 2021-01-29 13:49:35 +08:00
parent 2d28a7d55d
commit c417c1fe04
3 changed files with 11 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app.js
View File

@ -36,11 +36,11 @@ let opts = {
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
//app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
//app.use('/app',proxy('http://127.0.0.1:8012',opts));
app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
app.use('/app',proxy('http://127.0.0.1:8012',opts));
//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
//app.use('/app',proxy('http://192.168.1.16:8012',opts));

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

@ -36,7 +36,8 @@
<option value="9996">车辆道闸</option>
<option value="9997">考勤机</option>
<option value="9995">第三方道闸平台</option>
</select></div>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">设备方向</label>
@ -45,7 +46,8 @@
<option selected disabled value="">必填，请选择设备方向</option>
<option value="3306">进场</option>
<option value="3307">出场</option>
</select></div>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">厂家</label>
@ -54,75 +56,12 @@
class="form-control">
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">设备位置</label>
<div class="col-sm-10">
<select class="custom-select" v-model="editMachineInfo.locationTypeCd"
@change="onAddChangeLocation">
<option selected disabled value="">必填，请选择设备位置</option>
<option v-for="item in editMachineInfo.locations" :label="item.locationName"
:value="item.locationId">{{item.locationName}}
</option>
</select>
</div>
</div>
</div>
<div class="form-group row"
v-show="editMachineInfo.locationType == '2000' || editMachineInfo.locationType == '3000' ">
<label class="col-sm-2 col-form-label">归属楼栋</label>
<div class="col-sm-10">
<vc:create path="property/floorSelect2" parentModal="editMachineModel"
namespace="editMachine"></vc:create>
</div>
</div>
<div class="form-group row"
v-show="editMachineInfo.locationType == '2000' || editMachineInfo.locationType == '3000' ">
<label class="col-sm-2 col-form-label">归属单元</label>
<div class="col-sm-10">
<vc:create path="property/unitSelect2" parentModal="editMachineModel"
callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
</vc:create>
</div>
</div>
<div class="form-group row" v-show="editMachineInfo.locationType == '3000' ">
<label class="col-sm-2 col-form-label">归属房屋</label>
<div class="col-sm-10">
<vc:create path="property/roomSelect2" parentModal="editMachineModel"
callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
</vc:create>
</div>
</div>
<div class="form-group row" v-show="editMachineInfo.locationType == '4000' ">
<label class="col-sm-2 col-form-label">归属停车场</label>
<div class="col-sm-10">
<vc:create path="property/parkingAreaSelect2" parentModal="editMachineModel"
callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
</vc:create>
</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">
<label class="col-sm-2 col-form-label">设备IP</label>
<div class="col-sm-10">
<input v-model="editMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP,如 192.168.1.10:8090"
class="form-control">
<input v-model="editMachineInfo.machineIp" type="text"
placeholder="选填，请填写设备IP,如 192.168.1.10:8090" class="form-control">
</div>
</div>
<div class="form-group row">
@ -170,5 +109,5 @@
</div>
</div>
</div>
</div>
</div>

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

@ -243,23 +243,6 @@
},
editMachine: function () {
vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
if (vc.component.editMachineInfo.locationType != '2000'
&& vc.component.editMachineInfo.locationType != '3000'
&& vc.component.editMachineInfo.locationType != '4000'
&& vc.component.editMachineInfo.locationType != '5000') { //大门时直接写 小区ID
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId;
} else if (vc.component.editMachineInfo.locationType == '2000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId;
} else if (vc.component.editMachineInfo.locationType == '3000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId;
} else if (vc.component.editMachineInfo.locationType == '4000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.paId;
} else if (vc.component.addMachineInfo.locationType == '5000') {
vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.orgId;
} else {
vc.toast("设备位置值错误");
return;
}
if (!vc.component.editMachineValidate()) {
vc.toast(vc.validate.errInfo);
return;