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 | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 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 b61bfbc..64a4808 100644
--- a/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
+++ b/WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html
@@ -5,35 +5,45 @@
<div class="ibox-title">
<h5>鏌ヨ鏉′欢</h5>
<div class="ibox-tools" style="top:10px;">
- <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}</button>
+ <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}</button>
</div>
</div>
<div class="ibox-content">
<div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
+ <div class="col-sm-4">
+ <div class="form-group">
<input type="text" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="machineManageInfo.conditions.machineCode" class=" form-control">
- </div> </div><div class="col-sm-4" >
-<select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
- <option selected value="">璇烽�夋嫨璁惧绫诲瀷</option>
- <option value="9999">閿愮洰闂ㄧ</option>
-<option value="9998">鍏朵粬</option>
- </select> </div><div class="col-sm-3" >
-<div class="form-group">
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
+ <option selected value="">璇烽�夋嫨璁惧绫诲瀷</option>
+ <option value="9999">閿愮洰闂ㄧ</option>
+ <option value="9998">鍏朵粬</option>
+ </select></div>
+ <div class="col-sm-3">
+ <div class="form-group">
<input type="text" placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="machineManageInfo.conditions.machineName" class=" form-control">
- </div> </div><div class="col-sm-1">
+ </div>
+ </div>
+ <div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryMachineMethod()">
- <i class="glyphicon glyphicon-search"></i> 鏌ヨ
+ <i class="glyphicon glyphicon-search"></i> 鏌ヨ
</button>
- </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
-<div class="form-group">
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
+ <div class="form-group">
<input type="text" placeholder="璇疯緭鍏ヨ澶嘔P" v-model="machineManageInfo.conditions.machineIp" class=" form-control">
- </div> </div><div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
-<div class="form-group">
+ </div>
+ </div>
+ <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
+ <div class="form-group">
<input type="text" placeholder="璇疯緭鍏ヨ澶嘙AC" v-model="machineManageInfo.conditions.machineMac" class=" form-control">
- </div> </div></div>
+ </div>
+ </div>
+ </div>
</div>
@@ -59,33 +69,41 @@
>
<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.machineTypeCd}}</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"><div class="btn-group">
+ <td class="text-center">
+ <div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">淇敼</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openDeleteMachineModel(machine)">鍒犻櫎</button>
- </div></td>
+ </div>
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_openMachineDetailModel(machine)">璇︽儏</button>
+ </div>
+ </td>
</tr>
</tbody>
@@ -104,7 +122,6 @@
</div>
</div>
-
<vc:create name="addMachine"
callBackListener=""
--
Gitblit v1.8.0