编辑设备时的位置完成

wuxw

2019-12-01 1cdabad00b81db8adbeea6a8636c4e7e3eae6d5c

编辑设备时的位置完成

 WebService/src/main/java/com/java110/web/smo/machine/impl/EditMachineSMOImpl.java

@@ -34,6 +34,8 @@
        Assert.hasKeyAndValue(paramIn, "machineName", "必填，请填写设备名称");
        Assert.hasKeyAndValue(paramIn, "machineTypeCd", "必填，请选择设备类型");
        Assert.hasKeyAndValue(paramIn, "authCode", "必填，请填写鉴权编码");
        Assert.hasKeyAndValue(paramIn, "locationTypeCd", "必填，请选择位置类型");
        Assert.hasKeyAndValue(paramIn, "locationObjId", "必填，请填写位置对象ID");


        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_MACHINE);

 WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js

@@ -52,7 +52,7 @@
                        floorId:vc.component.editMachineInfo.floorId,
                        floorNum:vc.component.editMachineInfo.floorNum,
                        unitId:vc.component.editMachineInfo.unitId,
                        floorNum:vc.component.editMachineInfo.unitNum,
                        unitNum:vc.component.editMachineInfo.unitNum,
                    });
                    vc.emit('editMachine','roomSelect2','setRoom',{
                        floorId:vc.component.editMachineInfo.floorId,
@@ -159,7 +159,7 @@
                                param: "",
                                errInfo: "设备ID不能为空"
                            }],
                    'addMachineInfo.locationTypeCd':
                    'editMachineInfo.locationTypeCd':
                        [
                            {
                                limit: "required",
@@ -167,7 +167,7 @@
                                errInfo: "请选择设备位置"
                            }
                        ],
                    'addMachineInfo.locationObjId':
                    'editMachineInfo.locationObjId':
                        [
                            {
                                limit: "required",