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 |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 6789d66..64a4808 100644
--- a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
+++ b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
@@ -74,12 +74,11 @@
                             <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>
-
                             <th class="text-center">鎿嶄綔</th>
-
 
                         </tr>
                         </thead>
@@ -90,8 +89,9 @@
                             <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">{{machine.machineMac}}</td>
                             <td class="text-center">
                                 <div class="btn-group">

--
Gitblit v1.8.0