节点列表增加下行流量，节点列表可以按CPU、内存、下行流量排序

web/views/@default/clusters/cluster/node/boards/index.js

@@ -9,17 +9,21 @@ Tea.context(function () {
 		return (Math.round(count / 1000 / 1000 * 100) / 100) + "M"
 	}
 
-	this.board.trafficInBytes = teaweb.formatBytes(this.board.trafficInBytes)
-	this.board.trafficOutBytes = teaweb.formatBytes(this.board.trafficOutBytes)
-	this.board.countConnections = this.formatCount(this.board.countConnections)
-	this.board.countRequests = this.formatCount(this.board.countRequests)
-	this.board.countAttackRequests = this.formatCount(this.board.countAttackRequests)
-	this.board.cpuUsage = Math.round(this.board.cpuUsage * 100 * 100) / 100
-	this.board.memoryUsage = Math.round(this.board.memoryUsage * 100 * 100) / 100
-	this.board.memoryTotalSize = Math.round(this.board.memoryTotalSize / 1024 / 1024 / 1024)
-	this.board.load = Math.round(this.board.load * 100) / 100
-	this.board.cacheDiskSize = teaweb.formatBytes(this.board.cacheDiskSize)
-	this.board.cacheMemorySize = teaweb.formatBytes(this.board.cacheMemorySize)
+	this.loadBoard = function () {
+		this.board.trafficInBytes = teaweb.formatBytes(this.board.trafficInBytes)
+		this.board.trafficOutBytes = teaweb.formatBytes(this.board.trafficOutBytes)
+		this.board.countConnections = this.formatCount(this.board.countConnections)
+		this.board.countRequests = this.formatCount(this.board.countRequests)
+		this.board.countAttackRequests = this.formatCount(this.board.countAttackRequests)
+		this.board.cpuUsage = Math.round(this.board.cpuUsage * 100 * 100) / 100
+		this.board.memoryUsage = Math.round(this.board.memoryUsage * 100 * 100) / 100
+		this.board.memoryTotalSize = Math.round(this.board.memoryTotalSize / 1024 / 1024 / 1024)
+		this.board.load = Math.round(this.board.load * 100) / 100
+		this.board.cacheDiskSize = teaweb.formatBytes(this.board.cacheDiskSize)
+		this.board.cacheMemorySize = teaweb.formatBytes(this.board.cacheMemorySize)
+	}
+	this.loadBoard()
+
 
 	/**
 	 * 流量统计
@@ -32,6 +36,26 @@ Tea.context(function () {
 		this.reloadTopDomainsChart()
 		this.reloadCPUChart()
 	})
+	this.$delay(function() {
+		this.refreshBoard()
+	}, 30000)
+
+	this.refreshBoard = function() {
+		this.$post("$")
+			.params({
+				clusterId: this.clusterId,
+				nodeId: this.node.id
+			})
+			.success(function (resp) {
+				this.board = resp.data.board
+				this.loadBoard()
+			})
+			.done(function () {
+				this.$delay(function () {
+					this.refreshBoard()
+				}, 60000)
+			})
+	}
 
 	this.selectTrafficTab = function (tab) {
 		this.trafficTab = tab

web/views/@default/clusters/cluster/nodes.html

@@ -2,7 +2,7 @@
 
 {$template "menu"}
 
-<form class="ui form" action="/clusters/cluster" v-show="countAll > 0">
+<form class="ui form" action="/clusters/cluster/nodes" v-show="countAll > 0">
 	<input type="hidden" name="clusterId" :value="clusterId"/>
 	<div class="ui fields inline">
         <div class="ui field" v-if="regions.length > 0">
@@ -35,7 +35,8 @@
 			<input type="text" name="keyword" placeholder="关键词" v-model="keyword" style="width:10em"/>
 		</div>
 		<div class="ui field">
-			<button class="ui button" type="submit">搜索</button>
+			<button class="ui button" type="submit">搜索</button> &nbsp;
+            <a :href="'/clusters/cluster/nodes?clusterId=' + clusterId" v-if="regionId >0 || groupId > 0 || installState > 0 || activeState > 0 || keyword.length > 0">[清除条件]</a>
 		</div>
 	</div>
 </form>
@@ -55,28 +56,24 @@
 	<thead>
 	<tr>
 		<th>节点名称</th>
-        <th>所属区域</th>
-		<th>所属分组</th>
 		<th>IP</th>
 		<th class="width10">DNS线路</th>
-		<th class="width5 center">CPU</th>
-		<th class="width5 center">内存</th>
-		<!--<th>流量</th>
-		<th>连接数</th>-->
+		<th class="width5 center">CPU<sort-arrow name="cpuOrder"></sort-arrow></th>
+		<th class="width5 center">内存<sort-arrow name="memoryOrder"></sort-arrow></th>
+		<th class="center" style="width: 7em">下行流量<sort-arrow name="trafficOutOrder"></sort-arrow></th>
 		<th class="two wide center">状态</th>
 		<th class="two op">操作</th>
 	</tr>
 	</thead>
 	<tr v-for="node in nodes">
-		<td>{{node.name}}</td>
-        <td>
-            <span v-if="node.region != null">{{node.region.name}}</span>
-            <span v-else class="disabled">-</span>
+		<td>{{node.name}}
+            <div style="margin-top: 0.5em" v-if="node.region != null">
+                <tiny-label class="basic">区域：{{node.region.name}}</tiny-label>
+            </div>
+            <div style="margin-top: 0.5em" v-if="node.group != null">
+                <tiny-label class="basic">分组：{{node.group.name}}</tiny-label>
+            </div>
         </td>
-		<td>
-			<span v-if="node.group != null">{{node.group.name}}</span>
-			<span v-else class="disabled">-</span>
-		</td>
 		<td>
 			<span v-if="node.ipAddresses.length == 0" class="disabled">-</span>
 			<div v-else class="address-box">
@@ -104,6 +101,10 @@
 			<span v-if="node.status.isActive" :class="{red:node.status.memUsage > 0.80}">{{node.status.memUsageText}}</span>
 			<span v-else class="disabled">-</span>
 		</td>
+        <td class="center">
+            <span v-if="node.status.isActive && node.status.trafficOutBytes > 0">{{teaweb.formatBytes(node.status.trafficOutBytes)}}<br/><span class="grey small">/分钟</span></span>
+            <span v-else class="disabled">-</span>
+        </td>
 		<td class="center">
 			<div v-if="!node.isUp">
 				<span class="red">健康问题下线</span>

web/views/@default/clusters/cluster/nodes.js

@@ -1,21 +1,23 @@
 Tea.context(function () {
-    this.deleteNode = function (nodeId) {
-        teaweb.confirm("确定要删除这个节点吗？", function () {
-            this.$post("/nodes/delete")
-                .params({
-                    nodeId: nodeId
-                })
-                .refresh();
-        })
-    }
+	this.teaweb = teaweb
 
-    this.upNode = function (nodeId) {
-        teaweb.confirm("确定要手动上线此节点吗？", function () {
-            this.$post("/clusters/cluster/node/up")
-                .params({
-                    nodeId: nodeId
-                })
-                .refresh()
-        })
-    }
+	this.deleteNode = function (nodeId) {
+		teaweb.confirm("确定要删除这个节点吗？", function () {
+			this.$post("/nodes/delete")
+				.params({
+					nodeId: nodeId
+				})
+				.refresh();
+		})
+	}
+
+	this.upNode = function (nodeId) {
+		teaweb.confirm("确定要手动上线此节点吗？", function () {
+			this.$post("/clusters/cluster/node/up")
+				.params({
+					nodeId: nodeId
+				})
+				.refresh()
+		})
+	}
 })