From 5d09d7360dc19afeba2c117774bcfea20e917d55 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 12:53:49 +0800
Subject: [PATCH] 优化其他小区添加
---
WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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..562df12 100644
--- a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
+++ b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
@@ -18,7 +18,7 @@
<div class="col-sm-4">
<select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
<option selected value="">璇烽�夋嫨璁惧绫诲瀷</option>
- <option value="9999">閿愮洰闂ㄧ</option>
+ <option value="992019111002270001">閿愮洰闂ㄧ</option>
<option value="9998">鍏朵粬</option>
</select></div>
<div class="col-sm-3">
@@ -71,15 +71,14 @@
<tr>
<!--<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">璁惧IP</th>
- <th class="text-center">璁惧MAC</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>
@@ -87,12 +86,13 @@
<tr v-for="machine in machineManageInfo.machines">
<!--<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.machineVersion}}</td>-->
<td class="text-center">{{machine.machineName}}</td>
<td class="text-center">{{machine.machineTypeCdName}}</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">{{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">
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">淇敼</button>
@@ -101,8 +101,17 @@
<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>
+ <button class="btn-white btn btn-xs" v-on:click="_openRestartMachineModel(machine)">閲嶅惎</button>
</div>
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openUpgradeMachineModel(machine)">鍗囩骇</button>
+ </div>
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openForbiddenMachineModel(machine)">绂佺敤</button>
+ </div>
+ <!--<div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openMachineDetailModel(machine)">璇︽儏</button>
+ </div>-->
</td>
</tr>
@@ -129,5 +138,6 @@
></vc:create>
<vc:create name="editMachine"></vc:create>
<vc:create name="deleteMachine"></vc:create>
+ <vc:create name="machineState"></vc:create>
</div>
--
Gitblit v1.8.0