From b3f85b60ba9e39572e686009d36b5e5d7e81e910 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:30:10 +0800
Subject: [PATCH] 合并远程信息
---
WebService/src/main/resources/components/unit/unit.html | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/WebService/src/main/resources/components/unit/unit.html b/WebService/src/main/resources/components/unit/unit.html
index cdb22a0..4765e0d 100644
--- a/WebService/src/main/resources/components/unit/unit.html
+++ b/WebService/src/main/resources/components/unit/unit.html
@@ -1,4 +1,4 @@
-<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+<div id="component" >
<vc:create name="unitSelectFloor"></vc:create>
<div class="row">
<div class="col-lg-12">
@@ -8,12 +8,12 @@
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead>
<tr>
- <th>鏉冮檺ID</th>
- <th data-hide="phone">鏉冮檺鍚嶇О</th>
- <th data-hide="phone">鏉冮檺鎻忚堪</th>
- <th data-hide="phone">闅跺睘鏉冮檺缁処D</th>
- <th data-hide="phone,tablet" >闅跺睘鏉冮檺缁勫悕绉�</th>
- <th data-hide="phone">鐘舵��</th>
+ <th>鍗曞厓ID</th>
+ <th data-hide="phone">鍗曞厓缂栧彿</th>
+ <th data-hide="phone">鎬诲眰鏁�</th>
+ <th data-hide="phone">鏄惁鏈夌數姊�</th>
+ <th data-hide="phone,tablet" >鍒涘缓浜�</th>
+ <th data-hide="phone">澶囨敞</th>
<th class="text-right">鎿嶄綔</th>
</tr>
@@ -21,24 +21,27 @@
<tbody>
<tr v-for="unit in unitInfo.units">
<td>
- {{unit.pId}}
+ {{unit.unitId}}
</td>
<td>
- {{unit.name}}
+ {{unit.unitNum}}
</td>
<td>
- {{unit.description}}
+ {{unit.layerCount}}
</td>
<td>
- {{unit.pgId}}
+ {{unit.lift == '1010'?'鏈�':'鏃�'}}
</td>
<td>
- {{unit.pgName}}
+ {{unit.userName}}
</td>
<td>
- <span class="label label-primary">鍦ㄧ敤</span>
+ {{unit.remark}}
</td>
- <td class="text-right">
+ <td class="text-right">
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openEditUnitModel(unit)">淇敼</button>
+ </div>
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openDeleteUnitModel(unit)">鍒犻櫎</button>
</div>
@@ -59,5 +62,6 @@
</div>
</div>
<!-- 鍒犻櫎鍛樺伐鏉冮檺 -->
+ <vc:create name="editUnit"></vc:create>
<vc:create name="deleteUnit"></vc:create>
</div>
\ No newline at end of file
--
Gitblit v1.8.0