From 49b5dba003ff2b03d40630982ea637df2cfccab1 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 01 十二月 2019 10:45:00 +0800
Subject: [PATCH] 优化namespace 时对vc.on 做处理
---
WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html | 100 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 30 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
index 420d9db..2c22520 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
@@ -1,24 +1,12 @@
-<div id="addMachineModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+<div id="addMachineModel" 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>
- <!--<div class="form-group row">
- <label class="col-sm-2 col-form-label">妤煎悕绉�</label>
- <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="蹇呭～锛岃濉啓鍚嶇О" class="form-control"></div>
- </div>
- <div class="form-group row">
- <label class="col-sm-2 col-form-label">妤肩紪鍙�</label>
- <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="蹇呭～锛岃濉啓缂栧彿" class="form-control"></div>
- </div>
- <div class="form-group row">
- <label class="col-sm-2 col-form-label">澶囨敞</label>
- <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="鍙～锛岃濉啓澶囨敞" class="form-control"></div>
- </div>-->
<div class="form-group row">
<label class="col-sm-2 col-form-label">璁惧缂栫爜</label>
@@ -58,28 +46,79 @@
</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="addMachineInfo.machineIp" type="text" placeholder="閫夊～锛岃濉啓璁惧IP"
- class="form-control">
+ <select class="custom-select" v-model="addMachineInfo.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="addMachineInfo.machineMac" type="text" placeholder="閫夊～锛岃濉啓璁惧MAC"
- class="form-control">
- </div>
+ </div>
+ <div class="form-group row"
+ v-show="addMachineInfo.locationTypeCd == '2000' || addMachineInfo.locationTypeCd == '3000' ">
+ <label class="col-sm-2 col-form-label">褰掑睘妤兼爧</label>
+ <div class="col-sm-10">
+ <vc:create name="floorSelect2"
+ parentModal="addMachineModel"
+ namespace="addMachine"
+ ></vc:create>
</div>
+ </div>
+ <div class="form-group row"
+ v-show="addMachineInfo.locationTypeCd == '2000' || addMachineInfo.locationTypeCd == '3000' ">
+ <label class="col-sm-2 col-form-label">褰掑睘鍗曞厓</label>
+ <div class="col-sm-10">
+ <vc:create name="unitSelect2"
+ parentModal="addMachineModel"
+ callBackListener="addMachine"
+ callBackFunction="notify"
+ namespace="addMachine"
- <div class="ibox-content">
- <button class="btn btn-primary float-right" type="button"
- v-on:click="saveMachineInfo()"><i class="fa fa-check"></i> 淇濆瓨
- </button>
- <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
- data-dismiss="modal">鍙栨秷
- </button>
+ ></vc:create>
</div>
+ </div>
+ <div class="form-group row"
+ v-show="addMachineInfo.locationTypeCd == '3000' ">
+ <label class="col-sm-2 col-form-label">褰掑睘鎴垮眿</label>
+ <div class="col-sm-10">
+ <vc:create name="roomSelect2"
+ parentModal="addMachineModel"
+ callBackListener="addMachine"
+ callBackFunction="notify"
+ namespace="addMachine"
+
+ ></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="addMachineInfo.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="addMachineInfo.machineMac" 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="saveMachineInfo()"><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>
@@ -87,3 +126,4 @@
</div>
</div>
</div>
+</div>
--
Gitblit v1.8.0