From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码
---
WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 d1a0118..86ab93d 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
@@ -1,4 +1,4 @@
-<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">
@@ -63,10 +63,10 @@
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"
+ <vc:create name="floorSelect2"
parentModal="editMachineModel"
-
- ></vc:create>-->
+ namespace="editMachine"
+ ></vc:create>
</div>
</div>
<div class="form-group row"
@@ -77,6 +77,7 @@
parentModal="editMachineModel"
callBackListener="editMachine"
callBackFunction="notify"
+ namespace="editMachine"
></vc:create>
</div>
</div>
@@ -88,6 +89,7 @@
parentModal="editMachineModel"
callBackListener="editMachine"
callBackFunction="notify"
+ namespace="editMachine"
></vc:create>
</div>
</div>
@@ -105,6 +107,13 @@
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
--
Gitblit v1.8.0