From 2c65e8353a6f8898dfa7dfd557a18ca7198aaa70 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 29 十一月 2019 14:15:11 +0800
Subject: [PATCH] 优化扩展设备功能
---
WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
index 83b8317..64a4808 100644
--- a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
+++ b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
@@ -69,25 +69,28 @@
>
<thead>
<tr>
- <th class="text-center">璁惧ID</th>
+ <!--<th class="text-center">璁惧ID</th>-->
<th class="text-center">璁惧缂栫爜</th>
<th class="text-center">鐗堟湰鍙�</th>
<th class="text-center">璁惧鍚嶇О</th>
<th class="text-center">璁惧绫诲瀷</th>
+ <th class="text-center">璁惧浣嶇疆</th>
+ <th class="text-center">鐘舵��</th>
<th class="text-center">璁惧IP</th>
<th class="text-center">璁惧MAC</th>
<th class="text-center">鎿嶄綔</th>
-
</tr>
</thead>
<tbody>
<tr v-for="machine in machineManageInfo.machines">
- <td class="text-center">{{machine.machineId}}</td>
+ <!--<td class="text-center">{{machine.machineId}}</td>-->
<td class="text-center">{{machine.machineCode}}</td>
<td class="text-center">{{machine.machineVersion}}</td>
<td class="text-center">{{machine.machineName}}</td>
<td class="text-center">{{machine.machineTypeCdName}}</td>
+ <td class="text-center">{{machine.locationObjName}}</td>
+ <td class="text-center">{{machine.stateName}}</td>
<td class="text-center">{{machine.machineIp}}</td>
<td class="text-center">{{machine.machineMac}}</td>
<td class="text-center">
@@ -97,6 +100,9 @@
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openDeleteMachineModel(machine)">鍒犻櫎</button>
</div>
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openMachineDetailModel(machine)">璇︽儏</button>
+ </div>
</td>
</tr>
--
Gitblit v1.8.0