Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

This commit is contained in:
duandongmei
2019-01-16 17:02:39 +06:00
28 changed files with 1573 additions and 352 deletions

View File

@@ -47,6 +47,7 @@
<c:if test="${serviceIndex eq 0}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<!-- 拦截策略 -->
<c:if test="${service.functionId eq 200 }">
<c:if test="${service.action eq 1 }">
<spring:message code="intercept"/>
@@ -58,7 +59,18 @@
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:if>
<c:if test="${service.functionId ne 200 }">
<!-- Stream配置 -->
<c:if test="${service.functionId eq 407 || service.functionId eq 408 || service.functionId eq 63 }">
<c:choose>
<c:when test="${service.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
<c:if test="${service.functionId ne 200 && service.functionId ne 407 && service.functionId ne 408 && service.functionId ne 63}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:if>

View File

@@ -149,9 +149,10 @@ var resetIndex = function(){
<c:forEach items="${serviceList}" var="service" varStatus="satus">
<label class="radio-inline">
<c:if test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -176,6 +177,32 @@ var resetIndex = function(){
</div>
</div>
<!-- dolog begin-->
<div class="row doLog">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
<!-- dolog end-->
<h4 class="form-section">
<spring:message code="address_pool_ip_configuration" />
<small>
@@ -227,7 +254,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
@@ -371,7 +398,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden" >
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">

View File

@@ -401,7 +401,6 @@
<th column="address_pool" class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th column="ip_total" class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>

View File

@@ -90,7 +90,7 @@ $(function(){
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
@@ -201,7 +201,7 @@ $(function(){
</div>
</div>
<div class="row port">
<div class="col-md-6">
<%-- <div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="translated_dest_ip"/></label>
<div class="col-md-6">
@@ -209,7 +209,7 @@ $(function(){
</div>
<div for="destIpAddress"></div>
</div>
</div>
</div> --%>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="translated_dest_port"/></label>
@@ -219,6 +219,35 @@ $(function(){
<div for="destPort"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user_type"/></label>
<div class="col-md-6">
<select name="translatedUserType" class="selectpicker show-tick form-control required">
<%-- <option value=""><spring:message code="select"/></option> --%>
<option value="VPN" <c:if test="${_cfg.translatedUserType eq 'VPN' }">selected</c:if>><spring:message code="policy_vpn_user"/></option>
<%-- <option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option> --%>
</select>
</div>
<div for="translatedUserId"></div>
</div>
</div>
<div class="col-md-6 ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
<div class="col-md-6">
<select name="translatedUserId" class="selectpicker show-tick form-control required user" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${users}" var="user">
<option value="${user.userName}" <c:if test="${_cfg.translatedUserId eq user.userName }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach>
</select>
</div>
<div for="translatedUserType"></div>
</div>
</div>
</div>
<%-- <div class="row destPort">
<div class="col-md-6">

View File

@@ -19,9 +19,40 @@
$("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.destPort}"){
$("#intype").val("${cfg.destPort}");
}else if("${cfg.translatedUserId}"){
$("#intype").val("${cfg.translatedUserId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
// 处理用户类型检索条件
if($("#seltype").val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#isValid").selectpicker("hide");
}else{
$("#translatedUserType").selectpicker("hide");
}
$("#seltype").change(function(){
if($(this).val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#intype").val("");// 清空input条件
$("#translatedUserType").find("option").removeAttr("selected",false);
$("#translatedUserType").selectpicker("refresh");
$("#translatedUserType").selectpicker("show");
$("#isValid").selectpicker("hide");
}else if($(this).val() == "isValid"){
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");
}else{
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");// 隐藏下拉框
}
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
@@ -105,8 +136,10 @@
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="original_dest_ip"></spring:message></form:option>
<form:option value="srcPort"><spring:message code="original_dest_port"></spring:message></form:option>
<form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option>
<%-- <form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option> --%>
<form:option value="destPort"><spring:message code="translated_dest_port"></spring:message></form:option>
<form:option value="translatedUserId"><spring:message code="user"></spring:message></form:option>
<%-- <form:option value="translatedUserType"><spring:message code="user_type"></spring:message></form:option> --%>
<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -126,6 +159,13 @@
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
</form:select>
<form:select path="translatedUserType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="VPN"><spring:message code="policy_vpn_user"/></form:option>
<form:option value="SIPv4"><spring:message code="policy_sipv4_user"/></form:option>
<form:option value="SIPv6"><spring:message code="policy_sipv6_user"/></form:option>
</form:select>
</div>
</div>
</div>
@@ -309,9 +349,11 @@
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="original_dest_ip" ><spring:message code="original_dest_ip"/></th>
<th column="original_dest_port" ><spring:message code="original_dest_port"/></th>
<th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th>
<%-- <th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th> --%>
<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
@@ -348,7 +390,7 @@
</td> --%>
<td>${indexCfg.srcIpAddress }</td>
<td>${indexCfg.srcPort }</td>
<td>${indexCfg.destIpAddress }</td>
<%-- <td>${indexCfg.destIpAddress }</td> --%>
<td>${indexCfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
@@ -357,6 +399,25 @@
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${indexCfg.translatedUserType eq 'VPN' }">
<spring:message code="policy_vpn_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv4' }">
<spring:message code="policy_sipv4_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv6' }">
<spring:message code="policy_sipv6_user"/>
</c:if>
</td>
<td>
<c:forEach items="${users }" var="user">
<c:if test="${indexCfg.translatedUserId eq user.userName }">
<spring:message code="${user.userName }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>

View File

@@ -190,10 +190,11 @@ var switchUserType = function(obj){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

View File

@@ -124,9 +124,9 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
<%-- <form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option> --%>
<form:option value="userName"><spring:message code="user"></spring:message></form:option>
<form:option value="userType"><spring:message code="user_type"></spring:message></form:option>
<%-- <form:option value="userType"><spring:message code="user_type"></spring:message></form:option> --%>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -329,7 +329,7 @@
<th column="address_pool"><spring:message code="address_pool"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="ip"><spring:message code="ip"/></th>
<%-- <th column="ip"><spring:message code="ip"/></th> --%>
<th column="log_total"><spring:message code="log_total"/></th>
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -381,7 +381,7 @@
</c:if>
</c:forEach>
</td>
<td>${indexCfg.srcIpAddress }</td>
<%-- <td>${indexCfg.srcIpAddress }</td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>

View File

@@ -41,7 +41,7 @@
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
</div>
<select id="entranceId" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
@@ -93,7 +93,7 @@
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
</div>
<select id="entranceId" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>

View File

@@ -0,0 +1,133 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<title><spring:message code="framed_ip"></spring:message></title>
<style>
.page-content{
padding: 15px;
}
</style>
<script>
function page(n,s){
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").submit();
return false;
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
//打印列表
function doPrint() {
$("#contentTable").print({
globalStyles: true,
iframe: true,
append: null
});
}
</script>
</head>
<body>
<div class="page-content" >
<h3 class="page-title">
<spring:message code="account"/> ${searchAccount }
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}" type="${messageType }"/>
<div class="row" hidden>
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/getUserBehaviorList" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="text" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="text" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="text" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<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" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</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" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left accountSearch">
<form:input path="account" class="form-control" value="${searchAccount}"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return 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>
</div>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
</div>
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<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>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap order_table">
<thead>
<tr>
<th><spring:message code="framed_ip"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="it">
<tr>
<td>${it.nasIp}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

View File

@@ -5,9 +5,10 @@
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/global/css/layout.css" type="text/css" media="screen">
<script type="text/javascript" src="${pageContext.request.contextPath}/static/global/plugins/jquery-ui/jquery-ui.min.js"></script>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<script src="${ctxStatic }/login/assets/js/jquery.dataTables.min.js"></script>
<title><spring:message code="traffic_user_behavior"></spring:message></title>
<style>
td:hover{
.process-noyear:hover{
cursor: pointer;
}
.Wdate {
@@ -16,7 +17,6 @@
</style>
<script>
$(document).ready(function() {
// 获取查询类型
if($("#searchBusinessType").val()==3){
$(".userBtn").removeClass("active");
@@ -121,15 +121,16 @@
});
});
function searchList(){
function page(n,s){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
}
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#pageNo").val(n);
$("#pageSize").val(s);
// $("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
}
@@ -140,11 +141,25 @@
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#account").val(param);
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
var beginDate=$('#searchFoundStartTime').val();
var endDate=$('#searchFoundEndTime').val();
var url="${ctx}/traffic/getUserBehaviorList?searchFoundStartTime="+beginDate+"&searchFoundEndTime="+endDate+"&account="+param+"&searchBusinessType="+2;
$.jBox("iframe:"+url, {
title: null,
top: '1%',
showClose: false,
draggable:false,
width: $(document).width()*0.5,
height:$(document).height()*0.8,
showScrolling: true, /* 是否显示浏览的滚动条 */
iframeScrolling: 'yes',
buttons: { 'close': true },
loaded:function(h){
$(".jbox-content,top.document").css("overflow-y","hidden");
}
});
}
var dtable;
function searchNasIpForList(param){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
@@ -152,11 +167,24 @@
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#nasIp").val(param);
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
}
var beginDate=$('#searchFoundStartTime').val();
var endDate=$('#searchFoundEndTime').val();
var url="${ctx}/traffic/getUserBehaviorList?searchFoundStartTime="+beginDate+"&searchFoundEndTime="+endDate+"&nasIp="+param+"&searchBusinessType="+3;
$.jBox("iframe:"+url, {
title: null,
top: '1%',
showClose: false,
draggable:false,
width: $(document).width()*0.5,
height:$(document).height()*0.8,
showScrolling: true, /* 是否显示浏览的滚动条 */
iframeScrolling: 'yes',
buttons: { 'close': true },
loaded:function(h){
$(".jbox-content,top.document").css("overflow-y","hidden");
}
});
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
@@ -184,10 +212,6 @@
</head>
<body>
<div class="page-content">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button>
</div> --%>
<h3 class="page-title">
<spring:message code="traffic_user_behavior"></spring:message>
</h3>
@@ -207,22 +231,20 @@
</ul>
<br>
<!-- searchform -->
<div class="row" >
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/userBehavior" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="hidden" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<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 Wdate " -->
<%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left">
@@ -230,55 +252,32 @@
<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 Wdate " -->
<%-- value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left accountSearch">
<!--<form:select path="account" class="selectpicker select2 input-medium" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/> <spring:message code="user"/></form:option>
<c:forEach items="${accountList}" var="acc" >
<form:option value="${acc.account}">${acc.account}</form:option>
</c:forEach>
</form:select>-->
<form:input path="account" class="form-control"/>
</div>
<div class="pull-left nasIpSearch">
<!--<form:select path="nasIp" class="selectpicker select2 input-medium" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/> <spring:message code="ip"/></form:option>
<c:forEach items="${nasIpList}" var="nIp">
<form:option value="${nIp.nasIp}" >${nIp.nasIp}</form:option>
</c:forEach>
</form:select>-->
<form:input path="nasIp" class="form-control"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn blue" onClick="return 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>
</div>
<div class="pull-right">
<div class="pull-right" hidden>
<div class="btn-group">
<button type="button"
class="btn btn-default dropdown-toggle"
data-toggle="dropdown">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right"
style="min-width: 110px;">
<li><sys:delRow
url="${ctx}/traffic/userBehaviorExport?type=excel"
<ul class="dropdown-menu pull-right" style="min-width: 81px;right: 2px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/userBehavior" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow
url="${ctx}/traffic/userBehaviorExport?type=csv"
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/userBehavior" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
@@ -286,11 +285,7 @@
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<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>
<!-- 搜索内容与操作按钮栏 -->
@@ -298,71 +293,21 @@
</div>
<br>
<!-- searchform end-->
<div class="httpReqCfg">
<div class="row">
<c:if test="${!empty accountList}">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<%-- <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> --%>
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="ip"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${userList}" var="us">
<tr>
<td>${us.nasIp}</td>
<td>${us.reportTime}</td>
<td><fmt:formatNumber type="number" value="${us.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table> --%>
<table id="contentTable" class="table table-hover table-striped table-bordered table-condensed text-nowrap table-active">
<thead>
<tr>
<th><spring:message code="account"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${accountList}" var="data">
<tr>
<td onClick="return searchAccountForList('${data.account}')"><a title="${data.account}">${data.account}</a></td>
</tr>
</c:forEach>
</tbody>
</table>
<!-- </div> -->
</div>
</div>
</div>
<div class="col-md-11" >
<c:if test="${!empty userList}">
<div class="col-md-12" >
<div class=" ">
<div class="panel-body" style="height:500px">
<div class="panel-body">
<h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
<div id="trend" style="height: 400px; position: relative;" >
<div id="trend" style="position: relative;" >
<!-- ===================1============== -->
<div class="scrollMouse text-center">
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<i class="icon icon-mouse"></i>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
</div>
<c:if test="${!empty userList}">
<div class="about">
<div class="about-body">
<div class="about-content process-content">
@@ -370,14 +315,14 @@
<div class="process-timeline draggable">
<div id="draggable">
<div class="process-body" width="auto">
<c:forEach items="${userList}" var="us">
<c:forEach items="${page.list}" var="us">
<div class="process-row">
<div class="process-time">
<div class="time-con">
<span class="year" title="<spring:message code="visits"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
</div>
</div>
<div class="process-noyear" title="${us.nasIp}">
<div class="process-noyear" title="${us.nasIp}" onClick="return searchNasIpForList('${us.nasIp}')">
${us.nasIp}
</div>
</div>
@@ -388,16 +333,14 @@
</div>
</div>
</div>
<div class="page">${page}</div>
</div>
</c:if>
<!-- ===================1============== -->
</div>
</div>
</div>
</div></c:if>
<c:if test="${empty accountList}">
</div>
</c:if>
<c:if test="${empty userList}">
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
</div>
@@ -405,70 +348,19 @@
<!-- IP -->
<div class="httpResCfg">
<div class="row">
<c:if test="${!empty nasIpList}">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
<%-- <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${ipList}" var="it">
<tr>
<td>${it.account}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table> --%>
<table id="contentTable" class="table table-hover table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="ip"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${nasIpList}" var="data">
<tr>
<td onClick="return searchNasIpForList('${data.nasIp}')"><a title="${data.nasIp}">${data.nasIp}</a></td>
</tr>
</c:forEach>
</tbody>
</table>
<!-- </div> -->
</div>
</div>
</div>
</div>
<div class="col-md-11" >
<c:if test="${!empty ipList}">
<div class="col-md-12" >
<div class=" ">
<div class="panel-body" style="height: 500px">
<div class="panel-body">
<h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
<div id="trend" style="height: 400px; position: relative;" >
<div id="trend" style="position: relative;" >
<!-- ===================2============== -->
<div class="scrollMouse text-center">
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<i class="icon icon-mouse"></i>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
</div>
<!-- -->
<c:if test="${!empty ipList}">
<div class="about">
<div class="about-body">
<div class="about-content process-content">
@@ -485,7 +377,7 @@
</div>
</div>
<div class="process-noyear" title="${it.account}">
<div class="process-noyear" title="${it.account}" onClick="return searchAccountForList('${it.account}')">
${it.account}
</div>
</div>
@@ -496,17 +388,16 @@
</div>
</div>
</div>
<div class="page">${page}</div>
</div>
</c:if>
<!-- ===================2============== -->
</div>
</div>
</div>
</div></c:if>
<c:if test="${empty nasIpList}">
<c:if test="${empty ipList}">
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
</c:if>
</div>
</div>
</div>
@@ -515,8 +406,5 @@
</div>
</div>
</div>
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<!-- END PAGE LEVEL SCRIPTS -->
</body>
</html>

View File

@@ -0,0 +1,148 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<title><spring:message code="traffic_user_behavior"></spring:message></title>
<style>
.page-content{
padding: 15px;
}
</style>
<script>
function page(n,s){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
}
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#pageNo").val(n);
$("#pageSize").val(s);
// $("#searchForm").attr("action","${ctx}/traffic/getUserBehaviorList");
$("#searchForm").submit();
return false;
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
//打印列表
function doPrint() {
if($('.httpResCfg').is(':hidden')){
$(".httpReqCfg").print({
globalStyles: true,
iframe: true,
append: null
});
}else{
$(".httpResCfg").print({
globalStyles: true,
iframe: true,
append: null
});
}
}
</script>
</head>
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="framed_ip"/> ${searchNasIp }
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}" type="${messageType }"/>
<div class="row" hidden>
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/getUserBehaviorList" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="hidden" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<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" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</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" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left nasIpSearch">
<form:input path="nasIp" class="form-control" value="${searchNasIp}"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return 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>
</div>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
</div>
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<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>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="it">
<tr>
<td>${it.account}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

View File

@@ -266,7 +266,7 @@
<div class="form-group">
<label class="control-label"><spring:message code='APP'/></label>
<select id="appSelect" name="appId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${appList}" var="app" >
<option value="${app.code}"><spring:message code="${app.item}"></spring:message></option>
</c:forEach>
@@ -278,7 +278,7 @@
<div class="form-group">
<label class="control-label"><spring:message code='application_layer_protocol'/></label>
<select id="protoSelect" name="protoId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${protocolList}" var="proto" >
<option value="${proto.code}"><spring:message code="${proto.item}"></spring:message></option>
</c:forEach>
@@ -290,7 +290,7 @@
<div class="form-group">
<label class="control-label"><spring:message code="domain_name"/></label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
</c:forEach>

View File

@@ -25,21 +25,21 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.about .about-body .about-title h1{ font-size:30px; color: #666; }
.about .about-body .about-title .help-block{ color: #cbcbcb; font-size: 20px;}
.about .about-body .about-content{ position: relative; color: #666;line-height: 180%; font-size: 16px; padding-bottom: 200px;}
.about .about-body .about-content{ position: relative; color: #666;line-height: 180%; font-size: 16px; padding-bottom: 0px;}
.about .about-body .tree-bg{ background: url('../img/about_tree_bg.png') no-repeat right bottom;}
.about .about-body .about-content p{ color: #666; text-indent: 2em; line-height: 180%; font-size: 16px;}
/**
* 发展历程
*/
.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline{ height: 200px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:45%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0; overflow:hidden;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 0px; position: relative; height: 192px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 45.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; }
.process-timeline .process-row .process-time .time-con .pic{position: absolute; }
.process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; }
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 10px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; }
.process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;}
@@ -51,7 +51,7 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;}
.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-noyear { position: absolute; top: 30%; width: auto; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-content{padding-bottom: 40px; }
.process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;}
.process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; }

File diff suppressed because one or more lines are too long