Lianxun_Java.git

			@@ -1,9 +1,9 @@
			<div id="editMachineModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
			<div id="editMachineModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel"
			aria-hidden="true">
			<div class="modal-dialog modal-lg">
			<div class="modal-content">
			<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>
			<div>
			@@ -33,8 +33,18 @@
			<div class="col-sm-10">
			<select class="custom-select" v-model="editMachineInfo.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="editMachineInfo.direction">
			<option selected disabled value="">必填，请选择设备方向</option>
			<option value="3306">进场</option>
			<option value="3307">出场</option>
			</select></div>
			</div>
			<div class="form-group row">
			@@ -45,28 +55,83 @@
			</div>
			</div>
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">设备IP</label>
			<label class="col-sm-2 col-form-label">设备位置</label>
			<div class="col-sm-10">
			<input v-model="editMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP"
			class="form-control">
			<select class="custom-select" v-model="editMachineInfo.locationTypeCd">
			<option selected disabled value="">必填，请选择设备位置</option>
			<option value="1000">东大门</option>
			<option value="1001">西大门</option>
			<option value="1002">北大门</option>
			<option value="1003">南大门</option>
			<option value="2000">单元门</option>
			<option value="3000">房屋门</option>
			</select>
			</div>
			</div>
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">设备MAC</label>
			<div class="col-sm-10">
			<input v-model="editMachineInfo.machineMac" type="text" placeholder="选填，请填写设备MAC"
			class="form-control">
			</div>
			</div>
			<div class="form-group row"
			v-show="editMachineInfo.locationTypeCd == '2000' \|\| editMachineInfo.locationTypeCd == '3000' ">
			<label class="col-sm-2 col-form-label">归属楼栋</label>
			<div class="col-sm-10">
			<vc:create name="floorSelect2"
			parentModal="editMachineModel"
			namespace="editMachine"
			></vc:create>
			</div>
			</div>
			<div class="form-group row"
			v-show="editMachineInfo.locationTypeCd == '2000' \|\| editMachineInfo.locationTypeCd == '3000' ">
			<label class="col-sm-2 col-form-label">归属单元</label>
			<div class="col-sm-10">
			<vc:create name="unitSelect2"
			parentModal="editMachineModel"
			callBackListener="editMachine"
			callBackFunction="notify"
			namespace="editMachine"
			></vc:create>
			</div>
			</div>
			<div class="form-group row"
			v-show="editMachineInfo.locationTypeCd == '3000' ">
			<label class="col-sm-2 col-form-label">归属房屋</label>
			<div class="col-sm-10">
			<vc:create name="roomSelect2"
			parentModal="editMachineModel"
			callBackListener="editMachine"
			callBackFunction="notify"
			namespace="editMachine"
			></vc:create>
			</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"
			class="form-control">
			</div>
			</div>
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">设备MAC</label>
			<div class="col-sm-10">
			<input v-model="editMachineInfo.machineMac" type="text" placeholder="选填，请填写设备MAC"
			class="form-control">
			</div>
			</div>
			<div class="form-group row">
			<label class="col-sm-2 col-form-label">设备访问url</label>
			<div class="col-sm-10">
			<input v-model="editMachineInfo.machineUrl" readonly type="text" placeholder="选填，请填写设备MAC"
			class="form-control">
			</div>
			</div>

			<div class="ibox-content">
			<button class="btn btn-primary float-right" type="button" v-on:click="editMachine()"><i
			class="fa fa-check"></i> 保存
			</button>
			<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
			data-dismiss="modal">取消
			</button>
			</div>
			<div class="ibox-content">
			<button class="btn btn-primary float-right" type="button" v-on:click="editMachine()"><i
			class="fa fa-check"></i> 保存
			</button>
			<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
			data-dismiss="modal">取消
			</button>
			</div>
			</div>
			</div>
			@@ -74,3 +139,4 @@
			</div>
			</div>
			</div>
			</div>