dashboard: update machine list page

Signed-off-by: Eric Zhao <[email protected]>
alibaba · Mar 14, 2019 · ae774db · ae774db
1 parent 78c0dd8
commit ae774db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/sentinel-dashboard/src/main/webapp/resources/app/styles/main.css b/sentinel-dashboard/src/main/webapp/resources/app/styles/main.css
@@ -533,6 +533,10 @@ body {
     max-width: 300px;
 }
 
+.width-300 {
+    max-width: 300px;
+}
+
 .card.highlight {
     border-color: #d9534f;
 }

diff --git a/sentinel-dashboard/src/main/webapp/resources/app/views/machine.html b/sentinel-dashboard/src/main/webapp/resources/app/views/machine.html
@@ -1,14 +1,3 @@
-<!--<div class="row" xmlns="http://www.w3.org/1999/html">-->
-<!--<div class="col-lg-12">-->
-<!--<h2 class="page-header">{{app}} &nbsp;&nbsp;&nbsp;</h2>-->
-<!--<div>-->
-<!--<span>实例总数 {{machines.length}}</span>,-->
-<!--<span style="color: green"> 健康 {{healthyCount}}</span>,-->
-<!--<span style="color: red"> 失联 {{machines.length-healthyCount}}</span>。-->
-
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
 <div class="row" style="margin-left: 1px; margin-top:10px; height: 50px;">
   <div class="col-md-6" style="margin-bottom: 10px;">
     <span style="font-size: 30px;font-weight: bold;">{{app}}</span>
@@ -26,10 +15,8 @@
       <div class="card">
         <div class="inputs-header">
           <span class="brand" style="font-size: 13px;">机器列表</span>
-          <span>实例总数 {{machines.length}}, 健康 {{healthyCount}}, 失联 {{machines.length-healthyCount}}.</span>
-          <!--<button class="btn btn-danger" style="float: right;margin-right: 10px;height: 30px;font-size: 12px;" ng-click="addNewApp()">全部禁用</button>-->
-          <!--<button class="btn btn-danger" style="float: right; margin-right: 10px; height: 30px;font-size: 12px;margin-left: 10px;" ng-click="addNewApp()">全部启用</button>-->
-          <input class="form-control witdh-300" placeholder="关键字" ng-model="searchKey">
+          <span>实例总数 {{machines.length}}, 健康 {{healthyCount}}, 失联 {{machines.length - healthyCount}}.</span>
+          <input class="form-control width-300" placeholder="关键字" ng-model="searchKey">
         </div>
 
         <!--.tools-header -->
@@ -57,7 +44,7 @@
                 <td ng-if="!entry.healthy" style="color: red">失联</td>
                 <td>{{entry.lastHeartbeat | date: 'yyyy/MM/dd HH:mm:ss'}}</td>
                 <td>
-                    <button ng-if="!entry.healthy" class="btn btn-xs btn-default" style="height: 25px; font-size: 12px;" ng-click="removeMachine(entry.ip, entry.port)">REMOVE</button>
+                    <button ng-if="!entry.healthy" class="btn btn-xs btn-outline-danger" style="height: 25px; font-size: 12px;" ng-click="removeMachine(entry.ip, entry.port)">移除</button>
                 </td>
               </tr>
             </tbody>