阶段性提交

web/views/@default/nodes/create.html

@@ -10,6 +10,15 @@
 				<input type="text" name="name" maxlength="50" ref="focus"/>
 			</td>
 		</tr>
+		<tr>
+			<td>IP地址</td>
+			<td>
+				<div>
+					<div class="ui divider"></div>
+				</div>
+				<p class="comment">已经绑定的IP地址。</p>
+			</td>
+		</tr>
 		<tr>
 			<td>所属集群</td>
 			<td>

web/views/@default/nodes/grants/createPopup.html

@@ -6,7 +6,7 @@
 		<tr>
 			<td>名称 *</td>
 			<td>
-				<input type="text" name="name" maxlength="100" ref="focus"/>
+				<input type="text" name="name" maxlength="100" ref="focus" value="认证"/>
 			</td>
 		</tr>
 

web/views/@default/nodes/index.html

@@ -8,28 +8,37 @@
 		<tr>
 			<th>ID</th>
 			<th>节点名称</th>
-			<th>IP</th>
+			<th>主机名</th>
+			<!--<th>IP</th>-->
 			<th>所属集群</th>
 			<th>状态</th>
 			<th>CPU</th>
 			<th>内存</th>
-			<th>流量</th>
-			<th>连接数</th>
+			<!--<th>流量</th>
+			<th>连接数</th>-->
 			<th class="two op">操作</th>
 		</tr>
 	</thead>
 	<tr v-for="node in nodes">
 		<td>{{node.id}}</td>
 		<td>{{node.name}}</td>
-		<td></td>
+		<td>
+			<span v-if="node.status.hostname != null && node.status.hostname.length > 0">{{node.status.hostname}}</span>
+			<span v-else>-</span>
+		</td>
 		<td>{{node.cluster.name}}</td>
 		<td>
-			已安装|安装中|安装错误|运行中|失去连接
+			<span v-if="node.status.isActive"><span class="green">运行中</span></span>
+			<span v-else-if="node.status.updatedAt == 0" class="red">未连接</span>
+		</td>
+		<td>
+			<span v-if="node.status.isActive" :class="{red:node.status.cpuUsage > 0.80}">{{node.status.cpuUsageText}}</span>
+			<span v-else>-</span>
+		</td>
+		<td>
+			<span v-if="node.status.isActive" :class="{red:node.status.memUsage > 0.80}">{{node.status.memUsageText}}</span>
+			<span v-else>-</span>
 		</td>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td></td>
 		<td>
 			<a :href="'/nodes/node?nodeId=' + node.id">详情</a> &nbsp; <a href="" @click.prevent="deleteNode(node.id)">删除</a>
 		</td>

web/views/@default/nodes/update.html

@@ -43,8 +43,8 @@
 		<tr>
 			<td>SSH登录认证</td>
 			<td>
-				<div class="ui label small" v-if="grant != null">{{grant.name}}<span class="small">（{{grant.methodName}}）</span> <a href="" title="删除" @click.prevent="removeGrant()"><i class="icon remove"></i></a> </div>
-				<div v-if="grant == null">
+				<div class="ui label small" v-if="grant != null && grant.id != null">{{grant.name}}<span class="small">（{{grant.methodName}}）</span> <a href="" title="删除" @click.prevent="removeGrant()"><i class="icon remove"></i></a> </div>
+				<div v-else>
 					<a href="" @click.prevent="selectGrant()">[选择已有认证]</a> &nbsp; &nbsp; <a href="" @click.prevent="createGrant()">[添加新认证]</a>
 				</div>
 			</td>