From 29099acda0a85757293b062146d1758e74fd13c6 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Tue, 18 Dec 2018 00:53:18 +0600
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A6=96=E9=A1=B5pass=20=20l?=
 =?UTF-8?q?ive=20=E6=95=B0=E9=87=8F=E7=9A=84=E4=BD=8D=E7=BD=AE=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E9=80=9A=E8=81=94=E5=85=B3=E7=B3=BB=20=E5=8D=95?=
 =?UTF-8?q?=E5=90=91=E6=B5=81=E5=8D=A0=E6=AF=94=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dashboard/dashBoardIndex.jsp        | 56 +++++++++++--------
 .../views/log/ntc/connRecordLogList.jsp       | 31 +++++-----
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 705bc357d..1a022c099 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -31,7 +31,7 @@
     <div class="data_info">
         <div class="info_1 fl_fc">
             <div class="text_1">
-                <div class="fr_fc" style="width:60%">
+                <div class="fr_fc" style="width:55%">
                  <div class="fl_visual">
                 	<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
                  </div>
@@ -45,7 +45,10 @@
                         	<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
                     </div>
                 </div>
-                <div class="fr_fc" style="width:40%">
+                
+                
+                
+                <div class="fr_fc" style="width:45%">
                 	<div class="fl_visual">
                 		<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><i class="fa fa-ban"></i></a>
                 	 </div>
@@ -74,6 +77,18 @@
                         <a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><p class="numberRun2">0</p></a>
                     </div>
                 </div>
+                <div class="fr_fc">
+             		<div class="fl_visual">
+                		<i class="fa fa-smile-o"> </i>
+                	 </div>
+                    <div class="fl_fc">
+                        <p data-original-title="<spring:message code="pass"/>" 
+                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
+                         <!-- pass --><spring:message code="pass"/></p>
+                        <p class="numberRun7">0</p>
+                    </div>
+                </div>
+                
             	<div class="fr_fc">
             		<div class="fl_visual">
                 		<i class="fa fa-trash"> </i>
@@ -113,6 +128,19 @@
                     
                     </div>
                 </div>
+                
+                <div class="fr_fc">
+             		<div class="fl_visual">
+                		<i class="fa fa-heartbeat"> </i>
+                	 </div>
+                    <div class="fl_fc">
+                        <p data-original-title="<spring:message code="live_link"/>" 
+                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
+                         <!-- live link--><spring:message code="live_link"/></p>
+                        <p class="numberRun8">0</p>
+                    </div>
+                </div>
+                
                  <div class="fr_fc">
                 	<div class="fl_visual">
                 		<i class="fa fa-unlink"> </i>
@@ -127,28 +155,8 @@
                     </div>
                 </div>
                 
-                <div class="fr_fc">
-             		<div class="fl_visual">
-                		<i class="fa fa-smile-o"> </i>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="pass"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- pass --><spring:message code="pass"/></p>
-                        <p class="numberRun7">0</p>
-                    </div>
-                </div>
-                <div class="fr_fc">
-             		<div class="fl_visual">
-                		<i class="fa fa-heartbeat"> </i>
-                	 </div>
-                    <div class="fl_fc">
-                        <p data-original-title="<spring:message code="live_link"/>" 
-                         class="tooltips" data-flag="false" data-html="true" data-placement="top"> 
-                         <!-- live link--><spring:message code="live_link"/></p>
-                        <p class="numberRun8">0</p>
-                    </div>
-                </div>
+                
+                
                 
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index fe2bab624..01450527e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -69,23 +69,20 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">		
-		    <div data-service="bps" class="service btn blue" >
-				<span><spring:message code="bps"/></span>
-				(<span class="bps">0</span>)
-			</div>
-		    <div data-service="bpsp" class="service btn blue">
-				<span><spring:message code="bps_percent"/></span>
-				(<span class="bpsp">0</span>)
-			</div>
-		    <div data-service="pps" class="service btn blue">
-				<span><spring:message code="pps_percent"/></span>
-				(<span class="pps">0</span>)
-			</div>
-		    <div data-service="ppsp" class="service btn blue">
-				<span><spring:message code="pps_percent"/></span>
-				(<span class="ppsp">0</span>)
-			</div>
-			</div>
+		    
+		 <b>Asymmetry Links: </b>
+	    <div data-service="bps" class="service btn blue" >
+			<span><spring:message code="bps"/></span>
+			:<span class="bps">0</span>(<span class="bpsp">0</span>)
+			
+		</div>
+		
+	    <div data-service="pps" class="service btn blue">
+			<span><spring:message code="pps"/></span>:<span class="pps">0</span>(<span class="ppsp">0</span>)
+			
+		</div>
+		    
+	</div>
 	<h3 class="page-title">
 		<spring:message code="conn_record"/>
 	</h3>