Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/util/Constants.java

@@ -384,6 +384,14 @@ public final class Constants {
 	public static final String NTC_MMAVURL_LOG = Configurations.getStringProperty("mmAvUrlLog", "");
 	public static final String NTC_MMPICIP_LOG = Configurations.getStringProperty("mmPicIpLog", "");
 	public static final String NTC_MMPICURL_LOG = Configurations.getStringProperty("mmPicUrlLog", "");
+	public static final String NTC_MMVOIP_IP_LOG = Configurations.getStringProperty("mmVoipIpLog", "");
+	public static final String NTC_MMVOIP_ACCOUNT_LOG = Configurations.getStringProperty("mmVoipAccountLog", "");
+	public static final String NTC_MMSAMPLEAUDIO_LOG = Configurations.getStringProperty("mmSampleAudioLog", "");
+	public static final String NTC_MMSAMPLEVIDEO_LOG = Configurations.getStringProperty("mmSampleVideoLog", "");
+	public static final String NTC_MMPORNAUDIOLEVEL_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", "");
+	public static final String NTC_MMPORNVIDEOLEVEL_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", "");
+	public static final String NTC_MMSAMPLEPIC_LOG = Configurations.getStringProperty("mmSamplePicLog", "");
+	public static final String NTC_MMSAMPLEVOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", "");
 	
 	//报表类型,1-	配置命中总量业务
 	public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1);

src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java

@@ -0,0 +1,79 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.client.ClientProtocolException;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmVoipLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmAvVoipAccountLogs")
+public class MmVoipAccountLogController extends BaseController{
+
+	/**
+	 * @param model
+	 * @param entry
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	@RequestMapping(value={"list",""})
+	public String list(Model model,@ModelAttribute("log")MmVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+		
+		try {
+			
+			PageLog<MmVoipLog> page = new PageLog<MmVoipLog>(request, response);
+			Map<String, Object> params=new HashMap<>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			//查询值判断
+			initLogSearchValue(entry,params);
+			
+			String url = "";
+			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_ACCOUNT_LOG;
+			String jsonString = HttpClientUtil.getMsg(url,params,request);
+			
+			Gson gson = new GsonBuilder().create();
+			//gson泛型支持
+			LogRecvData<MmVoipLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmVoipLog>>(){}.getType());
+			
+			if (fromJson.getStatus().intValue() == 200) {
+				Page<MmVoipLog> data = fromJson.getData();
+				page.setList(data.getList());
+				List<MmVoipLog> list = page.getList();
+				for (MmVoipLog l : list) {
+					l.setFunctionId(entry.getFunctionId());
+					setLogAction(l);
+				}
+				model.addAttribute("page", page);
+				logger.info("查询mmVoipAccount日志成功");
+			}
+		} catch (Exception e) {
+			logger.info("查询mmVoipAccount日志失败", e);
+			addMessage(model, e.getMessage());
+		}
+		return "/log/ntc/mmVoipAccountList";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java

@@ -0,0 +1,79 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.client.ClientProtocolException;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.MmVoipLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/mmVoipIpLogs")
+public class MmVoipIpLogController extends BaseController{
+
+	/**
+	 * @param model
+	 * @param entry
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	@RequestMapping(value={"list",""})
+	public String list(Model model,@ModelAttribute("log")MmVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+		
+		try {
+			
+			PageLog<MmVoipLog> page = new PageLog<MmVoipLog>(request, response);
+			Map<String, Object> params=new HashMap<>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			//查询值判断
+			initLogSearchValue(entry,params);
+			
+			String url = "";
+			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG;
+			String jsonString = HttpClientUtil.getMsg(url,params,request);
+			
+			Gson gson = new GsonBuilder().create();
+			//gson泛型支持
+			LogRecvData<MmVoipLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmVoipLog>>(){}.getType());
+			
+			if (fromJson.getStatus().intValue() == 200) {
+				Page<MmVoipLog> data = fromJson.getData();
+				page.setList(data.getList());
+				List<MmVoipLog> list = page.getList();
+				for (MmVoipLog l : list) {
+					l.setFunctionId(entry.getFunctionId());
+					setLogAction(l);
+				}
+				model.addAttribute("page", page);
+				logger.info("查询VoipIp日志成功");
+			}
+		} catch (Exception e) {
+			logger.info("查询VoipIp日志失败", e);
+			addMessage(model, e.getMessage());
+		}
+		return "/log/ntc/mmVoipIpList";
+	}
+	
+}

src/main/resources/nis.properties

@@ -254,6 +254,14 @@ mmAvIpLog=mmAvIpLogs
 mmAvUrlLog=mmAvUrlLogs
 mmPicIpLog=mmPicIpLogs
 mmPicUrlLog=mmPicUrlLogs
+mmVoipIpLog=mmVoipIpLogs
+mmVoipAccountLog=mmVoipAccountLogs
+mmSampleAudioLog=mmSampleAudioLogs
+mmSampleVideoLog=mmSampleVideoLogs
+mmPornAudioLevelLog=mmPornAudioLevelLogs
+mmPornVideoLevelLog=mmPornVideoLevelLogs
+mmSamplePicLog=mmSamplePicLogs
+mmSampleVoipLog=mmSampleVoipLogs
 ########################################
 #大屏图表展示服务接口
 dashboardUrl=http://10.0.6.101:8080/galaxy/service/log/v1/

src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp

@@ -15,18 +15,35 @@
     <![endif]-->
     
     <style type="text/css">
-
+/* 		
+		a:link {
+			color:red !important;
+			text-decoration:none
+		}
+		a:visited {
+			background-color:blue !important;
+			text-decoration:none
+		}
+		a:hover {
+			color:green !important;
+			text-decoration:none
+		}
+		a:active {
+			color:green !important;
+			text-decoration:none;
+			background-color:blue !important;
+		} */
     </style>
 </head>
 <body>
 <!--content开始-->
 <div class="data_content">
 <!--header开始-->
-<div class="header-title">
+<!-- <div class="header-title">
         <div class="title-left fl"></div>
         <div class="title-center fl"><a href="javascript:window.location.reload()"><i class="fa fa-line-chart"></i>&nbsp;网络流量分析</a></div>
         <div class="title-right fr"></div>
-</div>
+</div> -->
 <!--header结束-->
 
     <div class="data_main">
@@ -352,8 +369,14 @@ function systemList(){
 		   $(rs).each(function(i, itemObj) {  
 				var tr = "<tr class='frist rowData'>";
 				tr += "<td class='list_c1'><a href='javascript:osClick(\""+itemObj.osType+"\");'>"+n+"</a></td>";
-				tr += "<td class='list_c2'><a data-toggle='tooltip' title='"+itemObj.osType+"' href='javascript:osClick(\""+itemObj.osType+"\");'>"+itemObj.osType+"</a></td>";
-				tr += "<td class='list_c3'><a href='javascript:osClick(\""+itemObj.osType+"\");'>"+itemObj.count+"</a></td></tr>";
+				tr += "<td class='list_c2'><a href='javascript:;' data-toggle='tooltip' title='"+itemObj.osType+"' onclick='javascript:osClick(\""+itemObj.osType+"\");'>"+itemObj.osType+"</a></td>";
+				if(itemObj.preCount<itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:osClick(\""+itemObj.osType+"\");'>"+"<i class='fa fa-arrow-up'/>"+"</a></td></tr>";
+				}else if(itemObj.preCount>itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:osClick(\""+itemObj.osType+"\");'>"+"<i class='fa fa-arrow-down'/>"+"</a></td></tr>";
+				}else{
+					tr += "<td class='list_c3'><a href='javascript:osClick(\""+itemObj.osType+"\");'>"+""+"</a></td></tr>";
+				}
 				n=n-1;
 				$("#tbodyData1").prepend(tr);
 		   })
@@ -431,8 +454,13 @@ function browserList() {
 				var tr = "<tr class='frist rowData'>";
 				tr += "<td class='list_c1'><a href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+n+"</a></td>";
 				tr += "<td class='list_c2'><a data-toggle='tooltip' title='"+itemObj.bsType+"' href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+itemObj.bsType+"</a></td>";
-				tr += "<td class='list_c3'><a href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+itemObj.count+"</a></td></tr>";
-				
+				if(itemObj.preCount<itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+"<i class='fa fa-arrow-up'/>"+"</a></td></tr>";
+				}else if(itemObj.preCount>itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+"<i class='fa fa-arrow-down'/>"+"</a></td></tr>";
+				}else{
+					tr += "<td class='list_c3'><a href='javascript:bsClick(\""+itemObj.bsType+"\");'>"+""+"</a></td></tr>";
+				}
 				$("#tbodyData1").prepend(tr);
 				n=n-1;
 		   })
@@ -477,7 +505,13 @@ function websiteList() {
 				var tr = "<tr class='frist rowData'>";
 				tr += "<td class='list_c1'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+n+"</a></td>";
 				tr += "<td class='list_c2'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+itemObj.webId+"</a></td>";
-				tr += "<td class='list_c3'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+itemObj.count+"</a></td></tr>";
+				if(itemObj.preCount<itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+"<i class='fa fa-arrow-up'/>"+"</a></td></tr>";
+				}else if(itemObj.preCount>itemObj.count){
+					tr += "<td class='list_c3'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+"<i class='fa fa-arrow-down'/>"+"</a></td></tr>";
+				}else{
+					tr += "<td class='list_c3'><a href='javascript:webClick(\""+itemObj.webId+"\");'>"+""+"</a></td></tr>";
+				}
 				
 				$("#tbodyData2").prepend(tr);
 				n=n-1;

src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp

@@ -61,6 +61,7 @@ $(document).ready(function(){
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
 										<form:option value="16"><spring:message code="action_reject"/></form:option>
 										<form:option value="1"><spring:message code="action_monit"/></form:option>
 									</form:select>

src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp

@@ -61,6 +61,7 @@ $(document).ready(function(){
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
 										<form:option value="16"><spring:message code="action_reject"/></form:option>
 										<form:option value="1"><spring:message code="action_monit"/></form:option>
 									</form:select>

src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp

@@ -61,6 +61,7 @@ $(document).ready(function(){
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
 										<form:option value="16"><spring:message code="action_reject"/></form:option>
 										<form:option value="1"><spring:message code="action_monit"/></form:option>
 									</form:select>

src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp

@@ -61,6 +61,7 @@ $(document).ready(function(){
 							<div class="col-md-12">
 								<div class="pull-left">
 									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
 										<form:option value="16"><spring:message code="action_reject"/></form:option>
 										<form:option value="1"><spring:message code="action_monit"/></form:option>
 									</form:select>

src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp

@@ -0,0 +1,273 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+//查询
+	function page(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").attr("action","${ctx}/log/ntc/mmAvVoipAccountLogs");
+	$("#searchForm").submit();
+	loading();
+	return false;
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		VOIP ACCOUNT
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmAvVoipAccountLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<form:option value="16"><spring:message code="action_reject"/></form:option>
+										<form:option value="1"><spring:message code="action_monit"/></form:option>
+									</form:select>
+								</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="entrance_id"/>：</label>
+											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='direct'/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='recv_time'/></th>
+									<th><spring:message code='protocol'/></th>
+									
+									<th><spring:message code='duation'/></th>
+									<th><spring:message code='voip_protocol'/></th>
+									<th><spring:message code='calling_account'/></th>
+									<th><spring:message code='called_account'/></th>
+									<th><spring:message code='calling_number'/></th>
+									<th><spring:message code='called_number'/></th>
+									<th><spring:message code='from_to_store_ip'/></th>
+									<th><spring:message code='from_to_store_url'/></th>
+									<th><spring:message code='to_from_store_ip'/></th>
+									<th><spring:message code='to_from_store_url'/></th>
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+									
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='stream_type'/></th>
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='nest_addr_list'/></th>
+									<th><spring:message code='user_region'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId}</td> 
+									<td>${log.entranceId}</td>
+									<td>
+										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.foundTime}</td>
+									<td>${log.recvTime}</td>
+									<td>${log.transProto}</td>
+									
+									<td>${log.duation}</td>
+									<td>${log.protocol}</td>
+									<td>${log.callingAccount}</td>
+									<td>${log.calledAccount}</td>
+									<td>${log.callingNumber}</td>
+									<td>${log.calledNumber}</td>
+									<td>${log.fromToStoreIp}</td>
+									<td>${log.fromToStoreUrl}</td>
+									<td>${log.toFromStoreIp}</td>
+									<td>${log.toFromStoreUrl}</td>
+									<td>${log.pid}</td>
+									<td>${log.logUri}</td>
+									<td>${log.level}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+									
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.dIp}</td>
+									<td>${log.sIp}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
+											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.capIp}</td>
+									<td>${log.addrList}</td>
+									<td>${log.userRegion}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp

@@ -0,0 +1,273 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+//查询
+	function page(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").attr("action","${ctx}/log/ntc/mmVoipIpLogs");
+	$("#searchForm").submit();
+	loading();
+	return false;
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		VOIP IP
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmVoipIpLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<form:option value="16"><spring:message code="action_reject"/></form:option>
+										<form:option value="1"><spring:message code="action_monit"/></form:option>
+									</form:select>
+								</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<label><spring:message code="protocol_type"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker select2 form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="entrance_id"/>：</label>
+											<input id=entranceId name="entranceId" class="form-control" type="text" value="${log.entranceId}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='direct'/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='recv_time'/></th>
+									<th><spring:message code='protocol'/></th>
+									
+									<th><spring:message code='duation'/></th>
+									<th><spring:message code='voip_protocol'/></th>
+									<th><spring:message code='calling_account'/></th>
+									<th><spring:message code='called_account'/></th>
+									<th><spring:message code='calling_number'/></th>
+									<th><spring:message code='called_number'/></th>
+									<th><spring:message code='from_to_store_ip'/></th>
+									<th><spring:message code='from_to_store_url'/></th>
+									<th><spring:message code='to_from_store_ip'/></th>
+									<th><spring:message code='to_from_store_url'/></th>
+									<th><spring:message code='pid'/></th>
+									<th><spring:message code='log_uri'/></th>
+									<th><spring:message code='harm_level'/></th>
+									<th><spring:message code='fd_type'/></th>
+									
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+									<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='stream_type'/></th>
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='nest_addr_list'/></th>
+									<th><spring:message code='user_region'/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId}</td> 
+									<td>${log.entranceId}</td>
+									<td>
+										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
+										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.foundTime}</td>
+									<td>${log.recvTime}</td>
+									<td>${log.transProto}</td>
+									
+									<td>${log.duation}</td>
+									<td>${log.protocol}</td>
+									<td>${log.callingAccount}</td>
+									<td>${log.calledAccount}</td>
+									<td>${log.callingNumber}</td>
+									<td>${log.calledNumber}</td>
+									<td>${log.fromToStoreIp}</td>
+									<td>${log.fromToStoreUrl}</td>
+									<td>${log.toFromStoreIp}</td>
+									<td>${log.toFromStoreUrl}</td>
+									<td>${log.pid}</td>
+									<td>${log.logUri}</td>
+									<td>${log.level}</td>
+									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
+									<td>
+										<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
+										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
+										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
+									</td>
+									
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.dIp}</td>
+									<td>${log.sIp}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
+											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td>${log.capIp}</td>
+									<td>${log.addrList}</td>
+									<td>${log.userRegion}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/static/global/plugins/highcharts/css/common.css

@@ -85,8 +85,12 @@ a {
 td a {
 	color:#fff
 }
-/* td a:link {
-	color:#fff;
+td a i {
+	color:#21a10e
+}
+/* 
+tr td a:link {
+	color:red;
 	text-decoration:none
 }
 td a:active {

src/main/webapp/static/global/plugins/highcharts/css/data_text.css

@@ -1,8 +1,8 @@
 .data_content{
     /*overflow-x: hidden;*/
     /* min-width: 1366px; */
-    background-color: #1c1c1c;
-    padding-top: 10px;
+    background-color: #303030;
+    padding-top: 40px;
     padding-bottom: 10px;
 }
 .data_content .data_main{
@@ -17,12 +17,12 @@
     width: 100%;
     height: 400px;
     box-sizing: border-box;
-    border: 1px solid #333333;
-    /*box-shadow: 0px 0px 10px #333333 inset;*/
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    border: 1px solid #3D3D3D;
+    /*box-shadow: 0px 0px 10px #3D3D3D inset;*/
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
 }
 .data_content .data_main .main_left div.left_1{
@@ -36,7 +36,7 @@
     width: 230px;
     height: 35px;
     line-height: 33px;
-    background-color: #333333;
+    background-color: #3D3D3D;
     border-radius: 18px;
     position: absolute;
     top: -17px;
@@ -46,8 +46,9 @@
     font-size: 18px;
     font-weight: 600;
     box-sizing: border-box;
-    padding-left: 45px;
+    text-align:center;
     z-index: 1000;
+    border-radius:18px !important;
 }
 .data_content .data_main .main_left div .main_title img{
     position: absolute;
@@ -67,11 +68,11 @@
     margin-left: 15px;
     margin-right: 15px;
     box-sizing: border-box;
-    border: 1px solid #333333;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    border: 1px solid #3D3D3D;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
     /*background: url("../img/chart_map.png") no-repeat center ;*/
 }
@@ -79,19 +80,18 @@
     width: 250px;
     height: 35px;
     line-height: 33px;
-    background-color: #333333;
-    border-radius: 18px;
+    background-color: #3D3D3D;
     position: absolute;
     top: -17px;
-    left:45%;
+    left:50%;
     margin-left: -90px;
     color:#fff;
     font-size: 18px;
     font-weight: 600;
     box-sizing: border-box;
-    padding-left: 45px;
-    text-align:auto;
+    text-align:center;
     z-index: 1000;
+    border-radius:18px !important;
 }
 
 .data_content .data_main .main_right{
@@ -101,11 +101,11 @@
     width: 100%;
     height: 400px;
     box-sizing: border-box;
-    border: 1px solid #333333;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    border: 1px solid #3D3D3D;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
 }
 .data_content .data_main .main_right div.right_1 .choice{
@@ -154,7 +154,7 @@
     width: 230px;
     height: 35px;
     line-height: 33px;
-    background-color: #333333;
+    background-color: #3D3D3D;
     border-radius: 18px;
     position: absolute;
     top: -17px;
@@ -164,8 +164,9 @@
     font-size: 18px;
     font-weight: 600;
     box-sizing: border-box;
-    padding-left: 45px;
+    text-align:center;
     z-index: 1000;
+    border-radius:18px !important;
 }
 .data_content .data_main .main_right div .main_title img{
     position: absolute;
@@ -186,13 +187,13 @@
 .data_content .data_bottom .bottom_1{
     width: 22%;
     height: 430px;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
     box-sizing: border-box;
-    border: 1px solid #333333;
+    border: 1px solid #3D3D3D;
     /*background: url("../img/chart_5.png") no-repeat;*/
 }
 .data_content .data_bottom .bottom_center{
@@ -202,46 +203,46 @@
 .data_content .data_bottom .bottom_2{
     width: calc(53% - 10px);
     height: 430px;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
     box-sizing: border-box;
-    border: 1px solid #333333;
+    border: 1px solid #3D3D3D;
     margin-left: 15px;
     /*background: url("../img/chart_6.png") no-repeat;*/
 }
 .data_content .data_bottom .bottom_3{
     width: calc(47% - 35px);
     height: 430px;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
     box-sizing: border-box;
-    border: 1px solid #333333;
+    border: 1px solid #3D3D3D;
     /*background: url("../img/chart_7.png") no-repeat;*/
     margin-left:15px;
 }
 .data_content .data_bottom .bottom_4{
     width: 26%;
     height: 430px;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    0px -10px 15px #333333 inset,  /*上边阴影*/
-    10px 0px 15px #333333 inset,  /*右边阴影*/
-    0px 10px 15px #333333 inset;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    0px -10px 15px #3D3D3D inset,  /*上边阴影*/
+    10px 0px 15px #3D3D3D inset,  /*右边阴影*/
+    0px 10px 15px #3D3D3D inset;
     position: relative;
     box-sizing: border-box;
-    border: 1px solid #333333;
+    border: 1px solid #3D3D3D;
     /*background: url("../img/chart_8.png") no-repeat;*/
 }
 .data_content .data_bottom div .main_title{
     width: 220px;
     height: 35px;
     line-height: 33px;
-    background-color: #333333;
+    background-color: #3D3D3D;
     border-radius: 18px;
     position: absolute;
     top: -17px;
@@ -251,7 +252,8 @@
     font-size: 18px;
     font-weight: 600;
     box-sizing: border-box;
-    padding-left: 30px;
+    text-align:center;
+    border-radius:18px !important;
 }
 .data_content .data_bottom div .main_title img{
     position: absolute;
@@ -288,7 +290,7 @@
     width: 35%;
 }
 .data_content .data_bottom div .main_table td{
-    color:#fff;
+    color:#3D3D3D;
     font-size: 12.8px;
     text-align: center;
 }
@@ -297,8 +299,8 @@
 .data_content .data_bottom div .main_table tbody tr:nth-child(7),
 .data_content .data_bottom div .main_table tbody tr:nth-child(9),
 .data_content .data_bottom div .main_table tbody tr:nth-child(5){
-    background-color: #1c1c1c;
-    box-shadow:-10px 0px 15px #333333 inset,   /*左边阴影*/
-    10px 0px 15px #333333 inset;  /*右边阴影*/
-    /*0px 10px 15px #333333 inset;*/
+    background-color: #303030;
+    box-shadow:-10px 0px 15px #3D3D3D inset,   /*左边阴影*/
+    10px 0px 15px #3D3D3D inset;  /*右边阴影*/
+    /*0px 10px 15px #3D3D3D inset;*/
 }

src/main/webapp/static/global/plugins/highcharts/echart.js

@@ -40,7 +40,7 @@
 //        			margin:10,
     				
     		},
-    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6' ,'#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6' ,'#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
     		title: {
     				text: null
     		},
@@ -174,7 +174,7 @@
     			marginTop:50,
     			inverted: true,
     		},
-    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
     		title: {
     				text: null
     		},
@@ -299,7 +299,7 @@
 					fontFamily:'Microsoft YaHei'
 				},
     		},
-    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+    		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
     		title: {
     				text: null
     		},
@@ -320,6 +320,7 @@
 						align:'high',
 						style: {//设置字体颜色
 							color: '#fff',
+							fontSize:'10px',
 							fontFamily:'Microsoft YaHei'
 						},
 				},
@@ -431,7 +432,7 @@ function echart_2(rs){
     	    		fontFamily:'Microsoft YaHei',
     	    	}
     	    },
-			colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+			colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
 			title: {
 					text: null,
 					style: {//设置字体颜色
@@ -555,7 +556,7 @@ function echart_5(rs){
 	    		fontFamily:'Microsoft YaHei',
 	    	}
 	    },
-		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+		colors:['#f36f8a', '#44A9A8', '#ffff43','#25f3e6','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
 		title: {
 			text: null,
 			style: {//设置字体颜色
@@ -664,7 +665,7 @@ function echart_4(rs){
 			type: 'pie'
 		},
 		
-		colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+		colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
 		title: {
 			text: null,
 		},
@@ -774,7 +775,7 @@ function echart_6(rs){
 			type: 'pie'
 		},
 		
-		colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#95CEFF','#7278DD','#2DA9D8','#C66FE6'],
+		colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6'],
 		title: {
 			text: null,
 		},