Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2020-02-19 b1b52d61acedccd6fdd58b32dcd04ebf14a96f38

 WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js

@@ -23,7 +23,8 @@
                roomId: '',
                locationTypeCd: '',
                locationObjId: '',
                roomName: ''
                roomName: '',
                direction:''
            }
        },
        _initMethod: function () {
@@ -41,6 +42,10 @@

                if (_param.hasOwnProperty("unitId")) {
                    vc.component.addMachineInfo.unitId = _param.unitId;
                }

                if(_param.hasOwnProperty("roomId")){
                    vc.component.addMachineInfo.roomId = _param.roomId;
                }
            });
        },
@@ -85,6 +90,19 @@
                                limit: "num",
                                param: "",
                                errInfo: "设备类型格式错误"
                            },
                        ],
                        'addMachineInfo.direction':
                        [
                            {
                                limit: "required",
                                param: "",
                                errInfo: "设备方向不能为空"
                            },
                            {
                                limit: "num",
                                param: "",
                                errInfo: "设备方向格式错误"
                            },
                        ],
                    'addMachineInfo.authCode':
@@ -135,14 +153,7 @@
                });
            },
            saveMachineInfo: function () {
                if (!vc.component.addMachineValidate()) {
                    vc.message(vc.validate.errInfo);

                    return;
                }

                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;

                if (vc.component.addMachineInfo.locationTypeCd != '2000' && vc.component.addMachineInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                } else if (vc.component.addMachineInfo.locationTypeCd == '2000') {
@@ -151,6 +162,12 @@
                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
                } else {
                    vc.toast("设备位置值错误");
                    return;
                }

                if (!vc.component.addMachineValidate()) {
                    vc.toast(vc.validate.errInfo);

                    return;
                }

@@ -198,7 +215,7 @@
                    authCode: '',
                    machineIp: '',
                    machineMac: '',

                    direction:''
                };
            },
            _initAddMachineData: function () {