From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 980ede2..bb58a67 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
@@ -34,8 +34,18 @@
<div class="col-sm-10">
<select class="custom-select" v-model="addMachineInfo.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="addMachineInfo.direction">
+ <option selected disabled value="">蹇呭～锛岃閫夋嫨璁惧鏂瑰悜</option>
+ <option value="3306">杩涘満</option>
+ <option value="3307">鍑哄満</option>
</select></div>
</div>
<div class="form-group row">
@@ -66,6 +76,7 @@
<div class="col-sm-10">
<vc:create name="floorSelect2"
parentModal="addMachineModel"
+ namespace="addMachine"
></vc:create>
</div>
</div>
@@ -77,6 +88,7 @@
parentModal="addMachineModel"
callBackListener="addMachine"
callBackFunction="notify"
+ namespace="addMachine"
></vc:create>
</div>
</div>
@@ -88,6 +100,7 @@
parentModal="addMachineModel"
callBackListener="addMachine"
callBackFunction="notify"
+ namespace="addMachine"
></vc:create>
</div>
</div>
--
Gitblit v1.8.0