From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName
---
WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html | 96 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
index 2d6a9e2..89d7b53 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
@@ -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,7 +33,7 @@
<div class="col-sm-10">
<select class="custom-select" v-model="editMachineInfo.machineTypeCd">
<option selected disabled value="">蹇呭～锛岃閫夋嫨璁惧绫诲瀷</option>
- <option value="9999">閿愮洰闂ㄧ</option>
+ <option value="992019111002270001">閿愮洰闂ㄧ</option>
<option value="9998">鍏朵粬</option>
</select></div>
</div>
@@ -45,28 +45,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 +129,4 @@
</div>
</div>
</div>
+</div>
--
Gitblit v1.8.0