From 2a4deb39b2b8a9f6cb125948c339dcfceb78f53e Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Sun, 16 Dec 2018 12:08:33 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=85=8D=E7=BD=AE=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?4-1024"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2337e891b2c60821c972d2612191ffed22d16b31.
---
 .../WEB-INF/views/cfg/complexCfgForm.jsp      |   2 +-
 .../views/dashboard/dashBoardIndex.jsp        | 155 ++++++++++++++----
 2 files changed, 120 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 687157446..882cb7229 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -97,7 +97,7 @@
 					<input class="form-control required invisibleChar
 						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
 						" 
-							type="text" minlength="4" maxlength="1024"
+							type="text"
 						name="${cfgName}.cfgKeywords"
 						value="${cfg.cfgKeywords}">
 				</div>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 024f35b26..c60ba36cc 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -137,26 +137,27 @@
         <div class="main_left fl">
             <div class="left_1">
                 <div class="main_title">
-                <label class="txt"><spring:message code="traffic_ipactive_chart"/></label> <label class="btn1"><a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-line-chart"></i></a></label><label class="btn2"> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
+                <spring:message code="traffic_ipactive_chart"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-line-chart"></i></a> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
-               <!-- 活跃IP图 --> <div class="chart-back" id="chart_main" style="width:100%;height:400px;"></div>
+               <!-- 活跃IP图 --> <div id="chart_main" style="width:100%;height:400px;"></div>
             </div>
         </div>
         <!-- 协议类型图 -->
         <div class="main_center fl">
             <div class="center_text">
                 <div class="main_title">
-                    <label class="txt"><spring:message code="traffic_protocol_chart"/></label> <label class="btn1"><a href="${ctx}/dashboard/traffic/protocolTypeList"><i class="fa fa-line-chart"></i></a></label><label class="btn2"><a href="javascipt:void(0)" onclick="protocolList();return false;"><i class="fa fa-refresh"></i></a></label>
+                    <spring:message code="traffic_protocol_chart"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/traffic/protocolTypeList"><i class="fa fa-line-chart"></i></a>
+                    <a href="javascipt:void(0)" onclick="protocolList();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
-                <div id="chart_1" class="chart-back" style="width:100%;height: 400px;"></div>
+                <div id="chart_1" class="" style="width:100%;height: 400px;"></div>
             </div>
         </div>
         <!-- 活跃端口 -->
         <div class="main_right fr">
             <div class="right_1">
                 <div class="main_title_port">
-                    <label class="txt"><spring:message code="active_port"/></label>
-                    <label class="btn1"><a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
+                    <spring:message code="active_port"/>&nbsp;&nbsp; <!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
+                    <a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
                 
                  <div class="main_table_port">
@@ -183,18 +184,20 @@
         <div class="main_left1 fl">
             <div class="left_1">
                 <div class="main_title1">
-                	<label class="txt"><spring:message code="topic"/></label>
-	              	<label class="btn1"><a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a></label>
+                	<spring:message code="topic"/>&nbsp;&nbsp;<%-- <a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-list-ul"></i></a> --%>
+	              	<a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a>
 	             </div>
 	                <!-- 网站主题分类图 --><div id="chart_topic" style="width:100%;height:400px;"></div>
+                 
+                 
             </div>
         </div>
         
           <div class="main_center1 fl">
             <div class="bottom_web fl">
 	            <div class="main_title_web">
-                    <label class="txt"><spring:message code="traffic_website_list"/></label>
-                    <label class="btn1"><a href="javascipt:void(0)" onclick="websiteList();return false;"><i class="fa fa-refresh"></i></a></label>
+                    <spring:message code="traffic_website_list"/>&nbsp;&nbsp;<%-- <a href="${ctx}/dashboard/webTypeList"><i class="fa fa-list-ul"></i></a> --%>
+                    <a href="javascipt:void(0)" onclick="websiteList();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
 	             <div class="main_table_web">
                     <table>
@@ -217,7 +220,7 @@
 				        <spring:message code="traffic_website_type_chart"/>
 				    </div> --%>
 				    <div class="main_table_web">
-				        <!-- http网站分类图 --><div id="chart_4" class="" style="width:100%;height: 470px;"></div>
+				        <!-- http网站分类图 --><div id="chart_4" class="" style="width:100%;height: 400px;"></div>
 				    </div>
 				</div>
         </div>
@@ -227,8 +230,8 @@
         <div class="main_left1 fl">
             <div class="left_1">
                 <div class="main_title1">
-                <label class="txt-app"><spring:message code="traffic_app_chart"/></label><label class="btn1-app"><a href="${ctx}/dashboard/traffic/appTypeList"><i class="fa fa-line-chart"></i></a></label>
-                <label class="btn2-app"><a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a></label>
+                <spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/traffic/appTypeList"><i class="fa fa-line-chart"></i></a>
+                <a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
                  <!--app应用图  --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
             </div>
@@ -237,8 +240,8 @@
           <div class="main_center1 fl">
             <div class="bottom_web fl">
 	            <div class="main_title_web">
-                   <label class="txt-bs"><!-- 终端 -->OS/BS </label><!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
-	                <label class="btn1-bs"><a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a></label>
+                   <!-- 终端 -->OS/BS &nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
+	                <a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a>
                 </div>
 	             <div class="main_table_web">
                     <table>
@@ -268,15 +271,96 @@
 				        <spring:message code="traffic_website_type_chart"/>
 				    </div> --%>
 				    <div class="main_table_web">
-				        <!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 470px;"></div>
+				        <!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 400px;"></div>
 				    </div>
 				</div>
         </div>
         
     </div>
+    
+	<!-- 第4行 -->
+<%--     <div class="data_bottom">
+	        <div class="bottom_1 fl">
+	            <div class="main_title">
+	                <!-- 终端 -->BS &nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
+	                <a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a>
+	            </div>
+	            <div class="main_table">
+	                <table>
+	                    <thead>
+	                    <tr>
+	                        <th><spring:message code="ranking"/></th>
+	                        <th>
+								 <div class="choice">
+	                    			<select name="uaSelect" id="uaSelect">
+	                       				<option value="system"><spring:message code="os"/></option>
+	                        			<option value="browser"><spring:message code="browser"/></option>
+	                    			</select>
+	                			</div>
+							</th>
+	                        <th><spring:message code="trend"/></th>
+	                    </tr>
+	                    </thead>
+	                    <tbody id="tbodyData1">
+	                    <tr>
+	                        <td>1</td>
+	                        <td>windows</td>
+	                        <td>0</td>
+	                    </tr>
+	                    </tbody>
+	                </table>
+	            </div>
+	        </div>
+        
+        <div class="bottom_center fl">
+            <div class="bottom_2 fl">
+                <div class="main_title">
+                    <spring:message code="BS"/>
+                </div>
+                <div class="main_table">
+                    <!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 400px;"></div>
+                </div>
+            </div>
+            <div class="bottom_3 fl">
+                <div class="main_title">
+                    <spring:message code="traffic_website_list"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/webTypeList"><i class="fa fa-list-ul"></i></a>
+                </div>
+                <div class="main_table">
+                    <table>
+                        <thead>
+                        <tr>
+                            <th><spring:message code="ranking"/></th>
+                            <th><spring:message code="website"/></th>
+                            <th><spring:message code="trend"/></th>
+                        </tr>
+                        </thead>
+                        <tbody id="tbodyData2">
+                        <tr>
+                            <td>1</td>
+                            <td>baidu.com</td>
+                            <td>0</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+       
+	        <div class="bottom_3 fl">
+	                <div class="main_title">
+	                <spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
+                <a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a>
+                </div>
+                 <!--app应用图  --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
+	        </div>
+	        </div>
+    </div> --%>
+
     </div>
 
 
+
+
+
 <!--content结束-->
 <!-- 列表显示 -->
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
@@ -408,18 +492,18 @@ function ajaxinfo(){
 			$(".c2sNum").text(data.c2sNum);
 			$(".s2cNum").text(100-data.c2sNum);
 			if(data.c2sNum>c2s){
-			//c2s增长 fa fa-arrow-circle-up
-			$("#c2sColor").addClass("fa fa-arrow-circle-up");
-			$("#c2sColor").attr({style:"color:#5DC2C1"});
-			$("#s2cColor").addClass("fa fa-arrow-circle-down");
+			//c2s增长 fa fa-arrow-up
+			$("#c2sColor").addClass("fa fa-arrow-up");
+			$("#c2sColor").attr({style:"color:green"});
+			$("#s2cColor").addClass("fa fa-arrow-down");
 			$("#s2cColor").attr({style:"color:red"});
 			}
 			//c2s下降
 			if(data.c2sNum<c2s){
-			$("#c2sColor").addClass("fa fa-arrow-circle-down");
+			$("#c2sColor").addClass("fa fa-arrow-down");
 			$("#c2sColor").attr({style:"color:red"});
-			$("#s2cColor").addClass("fa fa-arrow-circle-up");
-			$("#s2cColor").attr({style:"color:#5DC2C1"});
+			$("#s2cColor").addClass("fa fa-arrow-up");
+			$("#s2cColor").attr({style:"color:green"});
 				}
 			} */
 		},
@@ -519,7 +603,7 @@ function portActiveList(){
 			}
 
 			var tr = "<tr class='frist rowData'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff;border-right:none !important;'>"+msg+"</td>";
+			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
 			
 			$("#tbodyDataPort").prepend(tr);
 		},
@@ -539,9 +623,9 @@ function portActiveList(){
 							tr += "<td class='list_c1' style='color:#fff' title='"+itemObj.port+"'>"+itemObj.port+"</td>";
 							tr += "<td class='list_c2' style='color:#fff'>"+count+"</td>";
 							if(preCount<count){
-								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up' style='color:#f2392e'/>"+"</td></tr>";
+								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
 							}else if(preCount>count){
-								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down' style='color:#5DC2C1'/>"+"</td></tr>";
+								tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-down' style='color:green'/>"+"</td></tr>";
 							}else{
 								tr += "<td class='list_c3'>"+"--"+"</td></tr>";
 							}
@@ -630,9 +714,9 @@ function systemList(){
 						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
 						tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.osType+"'>"+os+"</td>";
 						if(preCount<count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up' style='color:#f2392e'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
 						}else if(preCount>count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down' style='color:#5DC2C1'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-down' style='color:green'/>"+"</td></tr>";
 						}else{
 							tr += "<td class='list_c3'>"+"--"+"</td></tr>";
 						}
@@ -741,9 +825,9 @@ function browserList() {
 						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
 						tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.bsType+"'>"+bs+"</td>";
 						if(preCount<count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up' style='color:#f2392e'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
 						}else if(preCount>count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down' style='color:#5DC2C1'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-down' style='color:green'/>"+"</td></tr>";
 						}else{
 							tr += "<td class='list_c3'>"+"--"+"</td></tr>";
 						}
@@ -780,8 +864,8 @@ function websiteList() {
 				$("#tbodyData2").html("")
 			}
 
-			var tr = "<tr class='frist rowData' style='color:#fff;border-right:none !important;'>";
-			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff;border-right:none !important;'>"+msg+"</td>";
+			var tr = "<tr class='frist rowData'>";
+			tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
 			
 			$("#tbodyData2").prepend(tr);
 		},
@@ -805,9 +889,9 @@ function websiteList() {
 						tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
 						tr += "<td class='list_c2' style='color:#fff' title="+itemObj.websiteService+">"+web+"</td>";
 						if(itemObj.preCount<itemObj.count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up' style='color:#f2392e'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
 						}else if(itemObj.preCount>itemObj.count){
-							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down' style='color:#5DC2C1'/>"+"</td></tr>";
+							tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-down' style='color:green'/>"+"</td></tr>";
 						}else{
 							tr += "<td class='list_c3'>"+"--"+"</td></tr>";
 						}
@@ -856,8 +940,7 @@ function topicAndDomainList(){
 		url: '${ctx}/dashboard/topicAndDomainList',
 		type : "get" ,
 		dataType:"json",
-		cache:false,async:true,
-		timeout:60000,//超时时间设置，查询接口时间过长超时
+		cache:false,async:true,timeout:60000,//超时时间设置，查询接口时间过长超时
 		success:function (rs) {
 			//主题域名流量统计图
 			echart_topic_domain(rs);