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 |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 5cfa55b..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,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">
@@ -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>
@@ -107,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