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

wuxw

2020-02-19 b1b52d61acedccd6fdd58b32dcd04ebf14a96f38

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

@@ -34,8 +34,18 @@
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="addMachineInfo.machineTypeCd">
                                        <option selected disabled value="">必填，请选择设备类型</option>
                                        <option value="9999">锐目门禁</option>
                                        <option value="9998">其他</option>
                                        <option value="992019111002270001">锐目门禁</option>
                                        <option value="9998">其他门禁</option>
                                        <option value="9996">车辆道闸</option>
                                    </select></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="addMachineInfo.direction">
                                        <option selected disabled value="">必填，请选择设备方向</option>
                                        <option value="3306">进场</option>
                                        <option value="3307">出场</option>
                                    </select></div>
                            </div>
                            <div class="form-group row">
@@ -66,6 +76,7 @@
                            <div class="col-sm-10">
                                <vc:create name="floorSelect2"
                                           parentModal="addMachineModel"
                                           namespace="addMachine"
                                ></vc:create>
                            </div>
                        </div>
@@ -77,6 +88,7 @@
                                           parentModal="addMachineModel"
                                           callBackListener="addMachine"
                                           callBackFunction="notify"
                                           namespace="addMachine"
                                ></vc:create>
                            </div>
                        </div>
@@ -88,6 +100,7 @@
                                           parentModal="addMachineModel"
                                           callBackListener="addMachine"
                                           callBackFunction="notify"
                                           namespace="addMachine"
                                ></vc:create>
                            </div>
                        </div>