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

This commit is contained in:
lihaochen
2018-12-24 16:06:49 +08:00
158 changed files with 4251 additions and 1844 deletions

View File

@@ -26,27 +26,27 @@
<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
</c:when>
<c:when test="${label eq 'cfg_excel'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i>
</a>
</c:when>
<c:when test="${label eq 'export'}">
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i>
</a>
</c:when>
<c:when test="${label eq 'cfg_csv'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="CSV"/></i>
</a>
</c:when>
<c:when test="${label eq 'excel'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i>
</a>
</c:when>
<c:when test="${label eq 'csv'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="CSV"/></i>
</a>
</c:when>
@@ -114,8 +114,8 @@ function update(url){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}else if(cked.val()==3){
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return;
/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return; */
}
//处理asnIp,asn组下发过的ip配置不允许修改
if(cked.attr("serviceGroupId")&&cked.attr("isValid")){
@@ -400,7 +400,7 @@ function cancelPassOpt(url){
return flag;
}
//导出
function exportData(url,maxRow,searchUrl){
function exportData(url,maxRow,searchUrl,exType){
var column=[];
var hColumn=[]; //隐藏列名
$("#${id} ${value} thead tr th").each(function(){
@@ -428,7 +428,7 @@ function cancelPassOpt(url){
//导出检索条件下所有数据
}else{
var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim();
if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) {
if (exType!='log') {
if(totalCount > maxRow){
top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
@@ -453,12 +453,5 @@ function cancelPassOpt(url){
}
}
function confirmEnding(str, target) {
var result=true;
var num=str.indexOf(target);
if (-1==num) {
result=false;
}
return result;
}
</script>

View File

@@ -100,14 +100,14 @@
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<%-- <div class="pull-left">
<form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code='asn_ip_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
</c:forEach>
</form:select>
</div>
</div> --%>
<%--<div class="pull-left">
<c:set var="state"><spring:message code='group'/></c:set>
<form:select path="isAudit" class="selectpicker select2 input-small">

View File

@@ -8,6 +8,41 @@ $(function(){
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
});
$(".district").on("change", function() {
if($(this).val()=='L3_header'){
$(this).parents(".boxSolid").find(".keywords").addClass("hidden");
$(this).parents(".boxSolid").find(".L3_header").removeClass("hidden");
$(this).parents(".boxSolid").find(".matchMethod").addClass("hidden");
$(this).parents(".boxSolid").find(".exprType").addClass("hidden");
$(this).parents(".boxSolid").find("input:radio[name$='isHex'][value=1]").prop("checked",true);
$(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive'][value=0]").prop("checked",true);
$(this).parents(".boxSolid").find("input:radio[name$='isHex']").attr("disabled",true);
$(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive']").attr("disabled",true);
$(this).parents(".boxSolid").find(".headerType").change();
}else{
$(this).parents(".boxSolid").find(".keywords").removeClass("hidden");
$(this).parents(".boxSolid").find(".L3_header").addClass("hidden");
$(this).parents(".boxSolid").find(".matchMethod").removeClass("hidden");
$(this).parents(".boxSolid").find(".exprType").removeClass("hidden");
$(this).parents(".boxSolid").find(".IP_header").addClass("hidden");
$(this).parents(".boxSolid").find(".ICMP_header").addClass("hidden");
$(this).parents(".boxSolid").find("input:radio[name$='isHex']").attr("disabled",false);
$(this).parents(".boxSolid").find("input:radio[name$='isCaseSenstive']").attr("disabled",false);
}
});
$(".headerType").on("change", function() {
if($(this).val()=='IP_header'){
$(this).parents(".boxSolid").find(".ICMP_header").addClass("hidden");
$(this).parents(".boxSolid").find(".IP_header").removeClass("hidden");
}else{
$(this).parents(".boxSolid").find(".IP_header").addClass("hidden");
$(this).parents(".boxSolid").find(".ICMP_header").removeClass("hidden");
}
});
$(".boxSolid:visible").find(".district").each(function(){
$(this).change();
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#cfgFrom").validate({
errorPlacement: function(error,element){
@@ -25,21 +60,50 @@ $(function(){
return;
}
$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
if($(this).val()==''){
$(this).parents(".form-group").find(
"div[for='"
+ $(this).attr("name")
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
flag = false;
var length = 0;
$(this).parents(".boxSolid").find(".l3_header_prop").each(function(){
if($(this).val()!=''){
length += 1;
}
})
if(length==0){
$(this).parents(".form-group").find(
"div[for='"
+ $(this).attr("name")
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
flag = false;
}else if(length>4){
$(this).parents(".boxSolid").find(
"div[class='l3_header_tips']").html("<label id=\"l3_header_error\" class=\"error\">"+$("#l3_header_error").text()+"</label>");
flag = false;
}
}else{
var length = 0;
$(this).parents(".boxSolid").find(".l3_header_prop").each(function(){
if($(this).val()!=''){
length += 1;
}
})
if(length>0){
$(this).val("");
if(length>4){
$(this).parents(".boxSolid").find(
"div[class='l3_header_tips']").html("<label id=\"l3_header_error\" class=\"error\">"+$("#l3_header_error").text()+"</label>");
flag = false;
}
}
}
})
});
//keywords非空校验完成校验二进制字符串
$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","")
if(keywords != ''){
keywords=keywords.replace("***and***","");
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"
@@ -109,6 +173,8 @@ var delContent = function(contentClassName, addBtnClassName) {
code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message
code="multiple_keywords_tip"></spring:message></span>
<span id="l3_header_error" style="display:none"><spring:message
code="l3_header_error"></spring:message></span>
<div class="page-content">
<c:forEach items="${serviceList}" var="service">
<c:if test="${cfg.functionId eq service.functionId}">
@@ -143,6 +209,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
<input type="hidden" id="doLog" name="doLog" value="2">
<c:set var="serviceId" value="${_cfg.serviceId}" />
<!-- 配置域类型 -->
<div class="form-body">
<div class="row">
@@ -191,6 +258,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<spring:message code="${dict.itemValue }" />
</c:if>
</c:forEach>
<c:set var="serviceId" value="${service.serviceId}" />
</c:if>
</label>
</c:forEach>

View File

@@ -256,13 +256,89 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
<c:if test="${cfg.serviceId eq 1025 }">
<c:if test="${cfg.headerType eq 'IP_header' }">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='VER' />: ${cfg.ver}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='IHL' />: ${cfg.ihl}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='TOS' />: ${cfg.tos}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='Total Length' />: ${cfg.totalLength}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='Flags' />: ${cfg.flags}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='fragment offset' />: ${cfg.fragmentOffset}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='Protocol' />: ${cfg.protocol}</label>
</div>
</div>
</div>
</c:if>
<c:if test="${cfg.headerType eq 'ICMP_header' }">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='ICMP type' />: ${cfg.icmpType}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='ICMP code' />: ${cfg.icmpCode}</label>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code='ICMP identifier' />: ${cfg.icmpIdentifier}</label>
</div>
</div>
</div>
</c:if>
<c:if test="${empty cfg.headerType}">
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
</div>
</div>
</div>
</c:if>
</c:if>
<c:if test="${cfg.serviceId ne 1025 }">
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label class="keyword-disinline"><spring:message code='keywords' />: ${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
</div>
</div>
</div>
</div>
</div>
</c:if>
<div class="row">
<div class="col-md-8">
<div class="form-group">
@@ -271,6 +347,7 @@
<c:choose>
<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
<c:when test="${cfg.exprType eq 3}"><spring:message code='offset_expression'/></c:when>
</c:choose>
</label>
</div>

View File

@@ -237,12 +237,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -99,6 +99,11 @@ $(function(){
if(sfd==632||sfd==631){
var files = $(this)[0].files;
if(files.length>0){
//多文件上传个数限制防止get请求url过长
if(files.length>50){
top.$.jBox.tip("<spring:message code='upload_limit_is'/>"+' '+50);
return false;
}
for(var i = 0;i < files.length;i ++) {
var file = files[i];
var faceName = file.name;

View File

@@ -137,8 +137,19 @@
<shiro:hasPermission name="avFileSample:config">
<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
--%> </shiro:hasPermission>
</shiro:hasPermission>
<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}/ntc/av/exportYsp?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="avFileSample:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -291,27 +302,27 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="src_file"/></th>
<th><spring:message code="sample_file"/></th>
<th><spring:message code="harm_level"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
<%-- <th><spring:message code="operation"></spring:message></th> --%>
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th column=""><spring:message code="seq"/></th> --%>
<th column="src_file"><spring:message code="src_file"/></th>
<th column="sample_file"><spring:message code="sample_file"/></th>
<th column="harm_level"><spring:message code="harm_level"/></th>
<th column="is_audit"><spring:message code="is_audit"/></th>
<th column="log_total"><spring:message code="log_total"/></th>
<th column="letter"><spring:message code="letter"/></th>
<th column="classification"><spring:message code="classification"/></th>
<th column="attribute"><spring:message code="attribute"/></th>
<th column="label"><spring:message code="label"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th column="creator"><spring:message code="creator"/></th>
<th column="config_time" class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th column="editor"><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th column="auditor"><spring:message code="auditor"/></th>
<th column="audit_time" class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
<%-- <th column="operation"><spring:message code="operation"></spring:message></th> --%>
</tr>
</thead>
<tbody>

View File

@@ -237,12 +237,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -49,7 +49,7 @@
</div>
</div>
</c:if>
<div class="row">
<div class="row keywords">
<c:if test="${isP2pHashCfg}">
<div class="col-md-6">
<div class="form-group">
@@ -108,8 +108,127 @@
</div>
</div>
<div class="row">
<c:if test="${serviceId eq 1025}">
<div class="row L3_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="headerType"/></label>
<div class="col-md-6">
<select name="${cfgName}.headerType" class="selectpicker show-tick form-control headerType">
<option value="IP_header" <c:if test="${cfg.headerType eq 'IP_header'}">selected</c:if> ><spring:message code="IP_HEADER"/></option>
<option value="ICMP_header" <c:if test="${cfg.headerType eq 'ICMP_header'}">selected</c:if> ><spring:message code="ICMP_HEADER"/></option>
</select>
</div>
<div class="l3_header_tips"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="VER" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ver" value="${cfg.ver}"><font color="red">4 bit</font>
</div>
<div for="${cfgName}.ver"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="IHL" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="4" maxlength="4" type="text" name="${cfgName}.ihl" value="${cfg.ihl}"><font color="red">4 bit</font>
</div>
<div for="${cfgName}.ihl"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="TOS" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.tos" value="${cfg.tos}"><font color="red">8 bit</font>
</div>
<div for="${cfgName}.tos"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="Total Length" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="16" maxlength="16" type="text" name="${cfgName}.totalLength" value="${cfg.totalLength}"><font color="red">16 bit</font>
</div>
<div for="${cfgName}.totalLength"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="Flags" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="3" maxlength="3" type="text" name="${cfgName}.flags" value="${cfg.flags}"><font color="red">3 bit</font>
</div>
<div for="${cfgName}.flags"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="fragment offset" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.fragmentOffset" value="${cfg.fragmentOffset}"><font color="red">8 bit</font>
</div>
<div for="${cfgName}.fragmentOffset"></div>
</div>
</div>
</div>
<div class="row IP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="Protocol" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.protocol" value="${cfg.protocol}"><font color="red">8 bit</font>
</div>
<div for="${cfgName}.protocol"></div>
</div>
</div>
</div>
<div class="row ICMP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP type" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.icmpType" value="${cfg.icmpType}"><font color="red">8 bit</font>
</div>
<div for="${cfgName}.icmpType"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP code" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop hexCheck" minlength="8" maxlength="8" type="text" name="${cfgName}.icmpCode" value="${cfg.icmpCode}"><font color="red">8 bit</font>
</div>
<div for="${cfgName}.icmpCode"></div>
</div>
</div>
</div>
<div class="row ICMP_header hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><spring:message code="ICMP identifier" /> </label>
<div class="col-md-6">
<input class="form-control l3_header_prop" minlength="16" maxlength="16" type="text" name="${cfgName}.icmpIdentifier" value="${cfg.icmpIdentifier}"><font color="red">16 bit</font>
</div>
<div for="${cfgName}.icmpIdentifier"></div>
</div>
</div>
</div>
</c:if>
<div class="row">
<div class="col-md-6 exprType">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
@@ -152,13 +271,13 @@
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 matchMethod">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="match_method" /></label>
<div class="col-md-6">
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
class="selectpicker select2 form-control required ">
<c:if test="${!empty region.configMatchMethod}">
<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">

View File

@@ -216,6 +216,18 @@
<sys:delRow url="${ctx}/ntc/fileTransfer/updateFileDigestValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
--%> </shiro:hasPermission>
<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}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="fileTransfer:fileDigest:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

View File

@@ -239,12 +239,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -212,12 +212,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -535,12 +535,12 @@ var showHideIPSECProtocol=function(obj){
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -243,12 +243,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -233,6 +233,18 @@
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportSnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<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}/maintenance/ipMultiplexPoolCfg/exportIpPool?functionId=${cfg.functionId}&exType=excel" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportIpPool?functionId=${cfg.functionId}&exType=csv" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="ip:mulitiplex:pool:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -385,26 +397,26 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id"><spring:message code="address_pool_id"/></th>
<th class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th><spring:message code="available_ip_total"/></th>
<th column="address_pool_id" class="sort-column r.compile_id"><spring:message code="address_pool_id"/></th>
<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><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="operation"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></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>
<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
<th column="operation" ><spring:message code="operation"/></th>
<th column="letter" ><spring:message code="letter"/></th>
<th column="classification" ><spring:message code="classification"/></th>
<th column="attribute" ><spring:message code="attribute"/></th>
<th column="label" ><spring:message code="label"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th column="auditor" ><spring:message code="auditor"/></th>
<th column="audit_time" class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
</tr>
</thead>
<tbody>

View File

@@ -171,6 +171,18 @@
<sys:delRow url="${ctx}/maintenance/userManage/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/maintenance/userManage/delete?isValid=-1" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<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}/maintenance/userManage/exportUser?exType=excel" searchUrl="${ctx}/maintenance/userManage/list" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/maintenance/userManage/exportUser?exType=csv" searchUrl="${ctx}/maintenance/userManage/list" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</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>
@@ -227,13 +239,13 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="user_name"/></th>
<th><spring:message code="vpn_ip"/></th>
<th><spring:message code="desc"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th column="user_name"><spring:message code="user_name"/></th>
<th column="vpn_ip"><spring:message code="vpn_ip"/></th>
<th column="desc"><spring:message code="desc"/></th>
<th column="creator"><spring:message code="creator"/></th>
<th column="config_time" class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th column="editor"><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th width="15%"><spring:message code="operation"/></th>
</tr>
</thead>

View File

@@ -139,6 +139,18 @@
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<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}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId}&exType=excel" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId}&exType=csv" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="dnat_policy:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -291,31 +303,31 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<%-- <th class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th><spring:message code="original_dest_ip"/></th>
<th><spring:message code="original_dest_port"/></th>
<th><spring:message code="translated_dest_ip"/></th>
<th><spring:message code="translated_dest_port"/></th>
<th><spring:message code="protocol"/></th>
<th><spring:message code="log_total"/></th>
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<%-- <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_port" ><spring:message code="translated_dest_port"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
<%-- <th column="whether_area_block" ><spring:message code="whether_area_block"/></th> --%>
<th column="letter" ><spring:message code="letter"/></th>
<th column="classification" ><spring:message code="classification"/></th>
<th column="attribute" ><spring:message code="attribute"/></th>
<th column="label" ><spring:message code="label"/></th>
<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column a.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
<th column="auditor" ><spring:message code="auditor"/></th>
<th column="audit_time" class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
</tr>
</thead>
<tbody>

View File

@@ -159,6 +159,18 @@
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<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}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId}&exType=excel" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId}&exType=csv" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="snat_policy:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -311,29 +323,28 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.cfg_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="address_pool"/></th>
<th><spring:message code="user_type"/></th>
<th><spring:message code="user"/></th>
<th><spring:message code="ip"/></th>
<th><spring:message code="log_total"/></th>
<%-- <th class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th><spring:message code="auditor"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
<th column="cfg_id" class="sort-column r.cfg_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<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="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>
<th column="is_audit"><spring:message code="is_audit"/></th>
<%-- <th column="do_log"><spring:message code="do_log"/></th> --%>
<%-- <th column="whether_area_block"><spring:message code="whether_area_block"/></th> --%>
<th column="letter"><spring:message code="letter"/></th>
<th column="classification"><spring:message code="classification"/></th>
<th column="attribute"><spring:message code="attribute"/></th>
<th column="label"><spring:message code="label"/></th>
<th column="creator"><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th column="editor"><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<th column="auditor"><spring:message code="auditor"/></th>
<th column="audit_time" class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
</tr>
</thead>
<tbody>

View File

@@ -140,6 +140,7 @@
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="doBlackList" value="1">
<input type="hidden" id="serviceId" name="serviceId"
value="${_cfg.serviceId}">
@@ -207,12 +208,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<%-- <div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
@@ -226,7 +227,7 @@
</c:forEach>
</div>
</div>
</div> --%>
</div>
<!-- dolog end-->

View File

@@ -371,7 +371,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<%-- <th column="do_blacklist" ><spring:message code="do_blacklist"/></th> --%>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th>
@@ -418,13 +418,13 @@
</c:if>
</c:forEach>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

View File

@@ -180,19 +180,18 @@
<shiro:hasPermission name="${configPermissionName }">
<sys:delRow url="${ctx}/proxy/cache/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/cache/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow> --%>
</shiro:hasPermission>
<!-- <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}/proxy/cache/exportHttp?functionId=${cfg.functionId }&exType=excel" id="contentTable" searchUrl="${actionPath }" label="cfg_excel"></sys:delRow></li> --%>
<%-- <li><sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }&exType=csv" id="contentTable" searchUrl="${actionPath }" label="cfg_csv"></sys:delRow></li> --%>
<!-- </ul> -->
<!-- </div> -->
<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}/proxy/cache/exportCache?functionId=${cfg.functionId }&exType=excel" id="contentTable" searchUrl="${actionPath }" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/proxy/cache/exportCache?functionId=${cfg.functionId }&exType=csv" id="contentTable" searchUrl="${actionPath }" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="${confirmPermissionName }">
<div class="btn-group">

View File

@@ -146,6 +146,18 @@
<sys:delRow url="${ctx}/proxy/spoofing/pool/form" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/spoofing/pool/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
</shiro:hasPermission>
<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}/proxy/spoofing/pool/exportIpPool?functionId=${cfg.functionId}&exType=excel" searchUrl="${ctx}/proxy/spoofing/pool/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/proxy/spoofing/pool/exportIpPool?functionId=${cfg.functionId}&exType=csv" searchUrl="${ctx}/proxy/spoofing/pool/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<shiro:hasPermission name="proxy:spoofing:pool:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

View File

@@ -154,6 +154,7 @@
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="doBlackList" value="1">
<input type="hidden" id="serviceId" name="serviceId"
value="${_cfg.serviceId}">
@@ -219,12 +220,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -370,7 +370,7 @@
<th column="policy_name" ><spring:message code="policy_name"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<%-- <th column="do_blacklist" ><spring:message code="do_blacklist"/></th> --%>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th>
@@ -422,13 +422,13 @@
</c:if>
</c:forEach>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

View File

@@ -281,12 +281,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -225,12 +225,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -210,12 +210,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

View File

@@ -23,8 +23,8 @@ body {
color: #fff
}
.fa-arrow-circle-up {
color: #fe392e;
background-color: white;
color: #001029;
background-color: #fe392e;
border-radius: 10px;
font-size: 13px;
width: 10px;
@@ -32,8 +32,8 @@ body {
line-height: 9px !important;
}
.fa-arrow-circle-down {
color: #42DEEB;
background-color: white;
color: #001029;
background-color: #009966;
border-radius: 10px;
font-size: 13px;
width: 10px;
@@ -72,7 +72,7 @@ body {
</div>
<div class="fr_fc" style="width:40%">
<div class="fl_visual">
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><i class="fa fa-ban"></i></a>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><i class="fa fa-ban"></i></a>
</div>
<div class="fl_fc">
<p style="margin-left: 0px;width:100%">
@@ -81,7 +81,7 @@ body {
<!-- 阻断链接数 --><spring:message code="action_reject"/>
</label>
</p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><p class="numberRun1">0</p></a>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_reject"><p class="numberRun1">0</p></a>
</div>
</div>
</div>
@@ -90,38 +90,37 @@ body {
<div class="text_2">
<div class="fr_fc">
<div class="fl_visual">
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><i class="fa fa-eye"> </i></a>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_monit"><i class="fa fa-eye"> </i></a>
</div>
<div class="fl_fc">
<p data-original-title="<spring:message code="action_monit"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 监测链接数 --><spring:message code="action_monit"/></p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><p class="numberRun2">0</p></a>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_monit"><p class="numberRun2">0</p></a>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-trash"> </i>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_drop"><i class="fa fa-trash"> </i></a>
</div>
<div class="fl_fc">
<%-- <a href="${ctx}/dashboard/ipActiveList"> --%>
<p data-original-title="<spring:message code="action_drop"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 丢弃链接数 --><spring:message code="action_drop"/></p>
<p class="numberRun3">0</p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_drop"> <p class="numberRun3">0</p></a>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-recycle"> </i>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_loop"><i class="fa fa-recycle"> </i></a>
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p data-original-title="<spring:message code="action_loop"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 回流链接数 --><spring:message code="action_loop"/></p>
<p class="numberRun">0</p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=action_loop"><p class="numberRun">0</p></a>
</div>
</div>
@@ -178,8 +177,8 @@ body {
</div>
</div>
</div>
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<%-- <input id="beginDateh" type="hidden" value="${beginDate}"/> --%>
<%-- <input id="endDateh" type="hidden" value="${endDate}"/> --%>
<!--header结束-->
<!-- 第一行 -->
<div class="data_main">
@@ -217,9 +216,12 @@ body {
<div class="right_1">
<div class="main_title_port">
<label class="txt"><spring:message code="active_port"/></label>
<span class="label_block" style="border-left:2px #575073 solid;">
<span class="label_block" style="border-left:2px #1F235C solid;">
<label><a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
<span class="label_block" style="border-left:2px #22265E solid;">
<label><a href="${ctx}/dashboard/portActiveList"><i class="fa fa-line-chart"></i></a></label>
</span>
</div>
<div class="main_table_port">

View File

@@ -1,935 +0,0 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>数据概览</title>
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/common.css">
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/data_text.css">
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/dashboard.css">
<script src="${pageContext.request.contextPath}/static/pages/scripts/dashboard.js"></script>
<!--[if lt IE 9]>
<script src="js/html5shiv.min.js"></script>
<script src="js/respond.min.js"></script>
<![endif]-->
<style>
body {
overflow-x:hidden
}
.chart_topic text {
color: #fff
}
.fa-arrow-circle-up {
color: #fe392e;
background-color: white;
border-radius: 10px;
font-size: 13px;
width: 10px;
height: 10px;
line-height: 9px !important;
}
.fa-arrow-circle-down {
color: #42DEEB;
background-color: white;
border-radius: 10px;
font-size: 13px;
width: 10px;
height: 10px;
line-height: 9px !important;
}
</style>
</head>
<body>
<!--content开始-->
<div class="data_content">
<!--header开始-->
<!-- <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 class="header">
<div class="data_info">
<div class="info_1 fl_fc">
<div class="text_1">
<div class="fr_fc" style="width:60%">
<div class="fl_visual">
<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
</div>
<div class="fl_fc">
<p>
<label data-original-title="<spring:message code="traffic"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 网络带宽 --><spring:message code="traffic"/>
</label>
</p>
<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">c2s <span class="c2sNum">0</span> | s2c <span class="s2cNum">0</span> </p>
<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
</div>
</div>
<div class="fr_fc" style="width:40%">
<div class="fl_visual">
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><i class="fa fa-ban"></i></a>
</div>
<div class="fl_fc">
<p style="margin-left: 0px;width:100%">
<label data-original-title="<spring:message code="action_reject"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 阻断链接数 --><spring:message code="action_reject"/>
</label>
</p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=block"><p class="numberRun1">0</p></a>
</div>
</div>
</div>
</div>
<div class="info_2 fl_fc">
<div class="text_2">
<div class="fr_fc">
<div class="fl_visual">
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><i class="fa fa-eye"> </i></a>
</div>
<div class="fl_fc">
<p data-original-title="<spring:message code="action_monit"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 监测链接数 --><spring:message code="action_monit"/></p>
<a href="${ctx}/dashboard/traffic/trafficBlockList?searchAction=monitor"><p class="numberRun2">0</p></a>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-trash"> </i>
</div>
<div class="fl_fc">
<%-- <a href="${ctx}/dashboard/ipActiveList"> --%>
<p data-original-title="<spring:message code="action_drop"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 丢弃链接数 --><spring:message code="action_drop"/></p>
<p class="numberRun3">0</p>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-recycle"> </i>
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p data-original-title="<spring:message code="action_loop"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 回流链接数 --><spring:message code="action_loop"/></p>
<p class="numberRun">0</p>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-link"> </i>
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p data-original-title="<spring:message code="new_link"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 新建链接数 --><spring:message code="new_link"/></p>
<p class="numberRun5">0</p>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-unlink"> </i>
</div>
<div class="fl_fc">
<p data-original-title="<spring:message code="active_link"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 活跃链接数 --><spring:message code="active_link"/></p>
<p class="numberRun6">0</p>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-smile-o"> </i>
</div>
<div class="fl_fc">
<p data-original-title="<spring:message code="pass"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- pass --><spring:message code="pass"/></p>
<p class="numberRun7">0</p>
</div>
</div>
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-heartbeat"> </i>
</div>
<div class="fl_fc">
<p data-original-title="<spring:message code="live_link"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- live link--><spring:message code="live_link"/></p>
<p class="numberRun8">0</p>
</div>
</div>
</div>
</div>
</div>
</div>
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<!--header结束-->
<!-- 第一行 -->
<div class="data_main">
<div class="main_left fl">
<div class="left_1">
<div class="main_title">
<label class="txt"><spring:message code="traffic_ipactive_chart"/></label>
<span class="label_block" style="border-left:2px #646d8a solid;">
<label class="btn2"> <a href="javascipt:void(0)" onclick="ipActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
<span class="label_block" style="border-left:2px #626a87 solid;">
<label><a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-line-chart"></i></a></label>
</span>
</div>
<!-- 活跃IP图 --> <div class="chart-back" id="chart_main" style="width:100%;height:400px;"></div>
</div>
</div>
<!-- 协议类型图 -->
<div class="main_center fl">
<div class="center_text">
<div class="main_title">
<label class="txt"><spring:message code="traffic_protocol_chart"/></label>
<span class="label_block" style="border-left:2px #575073 solid;">
<label><a href="javascipt:void(0)" onclick="protocolList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
<span class="label_block" style="border-left:2px #575073 solid;">
<label><a href="${ctx}/dashboard/traffic/protocolTypeList"><i class="fa fa-line-chart"></i></a></label>
</span>
</div>
<div id="chart_1" class="chart-back" style="width:100%;height: 400px;"></div>
</div>
</div>
<!-- 活跃端口 -->
<div class="main_right fr">
<div class="right_1">
<div class="main_title_port">
<label class="txt"><spring:message code="active_port"/></label>
<span class="label_block" style="border-left:2px #575073 solid;">
<label><a href="javascipt:void(0)" onclick="portActiveList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
</div>
<div class="main_table_port">
<table id="contentTable">
<thead>
<tr>
<th><spring:message code="port"/></th>
<th><spring:message code="visits"/></th>
<th><spring:message code="trend"/></th>
</tr>
</thead>
<tbody id="tbodyDataPort">
</tbody>
</table>
</div>
</div>
</div>
</div>
<!-- 第2行 -->
<div class="data_main1">
<div class="main_left1 fl">
<div class="left_1">
<div class="main_title1">
<label class="txt"><spring:message code="service"/></label>
<span class="label_block" style="border-left:2px #99879b solid;">
<label><a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
<span class="label_block" style="border-left:2px #9f8da1 solid;">
<label><a href="${ctx}/dashboard/httpStatisticList"><i class="fa fa-line-chart"></i></a></label>
</span>
</div>
<!-- 网站主题分类图 --><div id="chart_topic" style="width:100%;height:400px;"></div>
</div>
</div>
<div class="main_center1 fl">
<div class="bottom_web fl">
<div class="main_title_web">
<label class="txt"><spring:message code="traffic_website_list"/></label>
<span class="label_block" style="border-left:2px #824e6a solid;">
<label><a href="javascipt:void(0)" onclick="websiteList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
</div>
<div class="main_table_web">
<table>
<thead>
<tr>
<th><spring:message code="ranking"/></th>
<th><spring:message code="website"/></th>
<th><spring:message code="trend"/></th>
</tr>
</thead>
<tbody id="tbodyData2">
</tbody>
</table>
</div>
</div>
</div>
<div class="main_right1 fl" style="margin-left:5px;">
<div class="bottom_web fl">
<%-- <div class="main_title_web">
<spring:message code="traffic_website_type_chart"/>
</div> --%>
<div class="main_table_web">
<!-- http网站分类图 --><div id="chart_4" class=""></div>
</div>
</div>
</div>
</div>
<!-- 第三行-->
<div class="data_main1">
<div class="main_left1 fl">
<div class="left_1">
<div class="main_title1">
<label class="txt"><spring:message code="traffic_app_chart"/></label>
<span class="label_block" style="border-left:2px #5c6a78 solid;">
<label><a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
<span class="label_block" style="border-left:2px #5c6a78 solid;">
<label><a href="${ctx}/dashboard/traffic/appTypeList"><i class="fa fa-line-chart"></i></a></label>
</span>
</div>
<!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
</div>
</div>
<div class="main_center1 fl">
<div class="bottom_web fl">
<div class="main_title_web">
<label class="txt"><!-- 终端 -->OS/BS </label><!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
<span class="label_block" style="border-left:2px #6e5377 solid;">
<label><a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a></label>
</span>
</div>
<div class="main_table_web">
<table>
<thead>
<tr>
<th><spring:message code="ranking"/></th>
<th>
<div class="choice">
<select name="uaSelect" id="uaSelect" style="text-align:center; text-align-last:center; -webkit-appearance: none; background-color: #3D495F; width: 80px;" class="minimal">
<option value="system">&nbsp;<spring:message code="os"/></option>
<option value="browser">&nbsp;<spring:message code="browser"/></option>
</select>
</div>
</th>
<th><spring:message code="trend"/></th>
</tr>
</thead>
<tbody id="tbodyData1">
</tbody>
</table>
</div>
</div>
</div>
<div class="main_right1 fl">
<div class="bottom_web fl" style="margin-left:5px;">
<%-- <div class="main_title_web">
<spring:message code="traffic_website_type_chart"/>
</div> --%>
<div class="main_table_web">
<!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 470px;"></div>
</div>
</div>
</div>
</div>
</div>
<!--content结束-->
<!-- 列表显示 -->
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/data.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/drilldown.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/sunburst.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script src="${pageContext.request.contextPath}/static/pages/scripts/echart.js"></script>
<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
<style>
tr.select-row-tr:HOVER {
background-color: #5d6062 !important;
cursor: pointer;
}
tr.select-row-tr:ACTIVE {
background-color: #5d6062 !important;
}
.activeColor{
background-color: #5d6062 !important;
}
</style>
<script type="text/javascript">
$(document).ready(function(){
//动态显示数据
ajaxinfo();
setInterval(function(){
ajaxinfo();
},300000);
protocolList();//协议统计
ipActiveList();//活跃IP
portActiveList();//活跃端口
appTypeList();//应用类型
// systemList();//操作系统列表
websiteList();//http网站列表
topicAndDomainList();//主题网站域名
uaSelectChange();
//当选择改变时触发
$('#uaSelect').change(function(){
uaSelectChange();
});
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#ipBeginDate").val(starth);
$("#ipEndDate").val(endh);
});
//获取数据info
function ajaxinfo(){
$.ajax({
url:'${ctx}/dashboard/traffic/info',
type : "get" ,
dataType:'json',
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (data){
var loopConnNum =loopConnNum= data.loopConnNum;
var rejectNum =data.rejectNum;
var monitorNum =data.monitorNum;
var dropConnNum =data.dropConnNum;
var newUniConnNum=data.newUniConnNum;
var liveConnNum=data.liveConnNum;
if(loopConnNum==null||loopConnNum==""){
loopConnNum=0;
}
if(rejectNum==null||rejectNum==""){
rejectNum=0;
}
if(monitorNum==null||monitorNum==""){
monitorNum=0;
}
if(dropConnNum==null||dropConnNum==""){
dropConnNum=0;
}
if(newUniConnNum==null||newUniConnNum==""){
newUniConnNum=0;
}
if(liveConnNum==null||liveConnNum==""){
liveConnNum=0;
}
dataScroll(".numberRun",Math.round(loopConnNum));
dataScroll(".numberRun1",Math.round(rejectNum));
dataScroll(".numberRun2",Math.round(monitorNum));
dataScroll(".numberRun3",Math.round(dropConnNum));
dataScroll(".numberRun5",Math.round(newUniConnNum));
dataScroll(".numberRun6",Math.round(liveConnNum));
dataScroll(".numberRun7",Math.round(newUniConnNum-rejectNum));
dataScroll(".numberRun8",Math.round(newUniConnNum-rejectNum-dropConnNum));
//计算带宽进出口流量百分比
var inoctetsNum=Math.round(data.inoctetsNum);
var inoctetsNumK=inoctetsNum/1024;
var inoctetsNumM=inoctetsNumK/1024;
var inoctetsNumG=inoctetsNumM/1024;
var outoctetsNum=Math.round(data.outoctetsNum);
var outoctetsNumK=outoctetsNum/1024;
var outoctetsNumM=outoctetsNumK/1024;
var outoctetsNumG=outoctetsNumM/1024;
var unit="bps";
var bandwidth=inoctetsNum+outoctetsNum;
if(inoctetsNumK>1||outoctetsNumK>1){
inoctetsNum=inoctetsNumK.toFixed(2);
outoctetsNum=outoctetsNumK.toFixed(2);
unit="Kbps";
};
if(inoctetsNumM>1||outoctetsNumM>1){
inoctetsNum=inoctetsNumM.toFixed(2);
outoctetsNum=outoctetsNumM.toFixed(2);
unit="Mbps";
};
if(inoctetsNumG>1||outoctetsNumG>1){
inoctetsNum=inoctetsNumG.toFixed(2);
outoctetsNum=outoctetsNumG.toFixed(2);
unit="Gbps";
};
$(".c2sNum").text(inoctetsNum);
$(".s2cNum").text(outoctetsNum);
$(".numberRun4-unit").text(" "+unit);
bandwidth=parseFloat(inoctetsNum)+parseFloat(outoctetsNum);
dataScroll2(".numberRun4",bandwidth);
},
});
}
//动态显示数据
function dataScroll(index,nums){
if(typeof nums=='undefined'||nums==null||nums==""){
nums=0;
}
var num=nums;
var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:","});
numRun.resetData(nums);
}
function dataScroll2(index,nums){
if(typeof nums=='undefined'||nums==null||nums==""){
nums=0;
}
var num=nums;
var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:",",dot:2});
numRun.resetData(nums);
}
//切换下拉列表-操作系统与浏览器
function uaSelectChange(){
var ua = $('#uaSelect').val();
if(ua=="system"){
systemList();
}
if(ua=="browser"){
browserList();
}
}
//协议类型统计
function protocolList(){
loading();
$.ajax({
url: '${ctx}/dashboard/protocol',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_1(rs);
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//活跃IP统计
function ipActiveList(){
loading();
$.ajax({
url: '${ctx}/dashboard/ipActive',
type : "get" ,
dataType:"json",
cache:false,
async:true,
timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_main(rs);
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//活跃端口统计
function portActiveList(){
loading();
$.ajax({
url: '${ctx}/dashboard/portActive',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
var msg = "OnLoading...";
var trLen = $("#tbodyDataPort tr").length;
if(trLen<=0) {
msg = "OnLoading...";
}else {
$("#tbodyDataPort").html("")
}
var tr = "<tr class='frist rowData'>";
tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
$("#tbodyDataPort").prepend(tr);
},
success:function (rs) {
rs.reverse();
$("#tbodyDataPort").html("");
var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
}else{
if(n>0){
$(rs).each(function(i, itemObj) {
var count= itemObj.sum;
var preCount = itemObj.preSum;
var tr = "<tr class='frist rowData'>";
tr += "<td class='list_c1' style='color:#fff' title='"+itemObj.port+"'>"+itemObj.port+"</td>";
tr += "<td class='list_c2' style='color:#fff'>"+count+"</td>";
if(preCount<count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
}else if(preCount>count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down/>"+"</td></tr>";
}else{
tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
}
$("#tbodyDataPort").prepend(tr);
})
}else{
$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//app应用类型统计
function appTypeList(){
loading();
$.ajax({
url: '${ctx}/dashboard/app',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_3(rs);
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//获取终端用户-操作系统列表 左下
function systemList(){
loading();
$.ajax({
url: '${ctx}/dashboard/osList',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
var msg = "OnLoading...";
var trLen = $("#tbodyData1 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
}else {
$("#tbodyData1").html("")
}
var tr = "<tr class='frist rowData'>";
tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
$("#tbodyData1").prepend(tr);
},
success:function (rs) {
$("#tbodyData1").html("");
rs.reverse();
var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
}else{
if(n>0){
$(rs).each(function(i, itemObj) {
var os="";
if(typeof(itemObj.osType)!="undefined"&&itemObj.osType!=null){
os=(itemObj.osType).toString();
if(os.length>18){
os=os.substring(0,18);
}
}
var count= itemObj.count;
var preCount = itemObj.preCount;
var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:osClick(\""+itemObj.osType+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.osType+"'>"+os+"</td>";
if(preCount<count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
}else if(preCount>count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
}else{
tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
}
n=n-1;
$("#tbodyData1").prepend(tr);
})
}else{
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//终端图-操作系统
echart_2(rs.reverse());
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
// 点击操作系统列表右侧显示 浏览器图
function osClick(osType,obj){
//点击行变色
$("#tbodyData1 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor");
$.ajax({
url: '${ctx}/dashboard/browserChart',
type : "get" ,
data:{"osType":osType},
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_5(rs);
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//点击浏览器列表右侧显示 操作系统图
function bsClick(bsType,obj){
$("#tbodyData1 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor");
$.ajax({
url: '${ctx}/dashboard/systemChart',
type : "get" ,
data:{"bsType":bsType},
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_2(rs);
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//获取终端用户-浏览器列表
function browserList() {
loading();
$.ajax({
url: '${ctx}/dashboard/bsList',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
var msg = "OnLoading...";
var trLen = $("#tbodyData1 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
}else {
$("#tbodyData1").html("")
}
var tr = "<tr class='frist rowData'>";
tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
$("#tbodyData1").prepend(tr);
},
success:function (rs) {
$("#tbodyData1").html("");
rs.reverse();
var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
}else{
if(n>0){
$(rs).each(function(i, itemObj) {
var bs="";
if(typeof(itemObj.bsType)!="undefined"&&itemObj.bsType!=null){
bs=(itemObj.bsType).toString();
if(bs.length>18){
bs=bs.substring(0,18);
}
}
var count= itemObj.count;
var preCount = itemObj.preCount;
var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:bsClick(\""+itemObj.bsType+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.bsType+"'>"+bs+"</td>";
if(preCount<count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
}else if(preCount>count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
}else{
tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
}
$("#tbodyData1").prepend(tr);
n=n-1;
})
}else{
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//终端图-浏览器
echart_5(rs.reverse());
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//获取http网站table列表
function websiteList() {
loading();
$.ajax({
url: '${ctx}/dashboard/websiteList',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
var msg = "OnLoading...";
var trLen = $("#tbodyData2 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
}else {
$("#tbodyData2").html("")
}
var tr = "<tr class='frist rowData'>";
tr += "<td class='list_c1' colspan='3' align='center' style='color:#fff'>"+msg+"</td>";
$("#tbodyData2").prepend(tr);
},
success:function (rs) {
rs.reverse();
$("#tbodyData2").html("");
var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
}else{
if(n>0){
$(rs).each(function(i, itemObj) {
var web="";
if(typeof(itemObj.websiteService)!="undefined"&&itemObj.websiteService!=null){
web=(itemObj.websiteService).toString();
if(web.length>18){
web=web.substring(0,18);
}
}
var tr = "<tr class='frist rowData select-row-tr' onclick='javascript:webClick(\""+itemObj.websiteServiceId+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title="+itemObj.websiteService+">"+web+"</td>";
if(itemObj.preCount<itemObj.count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-up'/>"+"</td></tr>";
}else if(itemObj.preCount>itemObj.count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-circle-down'/>"+"</td></tr>";
}else{
tr += "<td class='list_c3' style='color:#fff'>"+"--"+"</td></tr>";
}
$("#tbodyData2").prepend(tr);
n=n-1;
})
}else{
$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
}
//网站统计图
echart_4(rs.reverse());
}
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//点击http网站列表-显示域名图
function webClick(websiteServiceId,obj){
//点击行变色
$("#tbodyData2 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor");
$.ajax({
url: '${ctx}/dashboard/webTypeChart',
type : "get" ,
data:{"websiteServiceId":websiteServiceId},
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_6(rs);
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//网站主题
function topicAndDomainList(){
loading();
$.ajax({
url: '${ctx}/dashboard/topicAndDomainList',
type : "get" ,
dataType:"json",
cache:false,async:true,timeout:60000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
//主题域名流量统计图
echart_topic_domain(rs);
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
</script>
</body>
</html>

View File

@@ -155,17 +155,18 @@ function showActionTransChart(rs){
credits:{//是否有highcharts水印
enabled:false
},
/* plotOptions: {
area: {
stacking: 'normal',
lineColor: '#666666',
lineWidth: 1,
marker: {
lineWidth: 1,
lineColor: '#666666'
}
}
}, */
plotOptions: {
series: {
marker: {
radius: 2,
hover: {
enabled: true,
radius: 7,
radiusPlus: 5
}
}
}
},
// legend: {
// layout: 'vertical',
// align: 'right',

View File

@@ -32,7 +32,7 @@
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
value="" onclick="WdatePicker({onpicked:function(){console.log(endDate);console.log(this);$(endDate).val('')},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
</div>
</div>
<div class="pull-left">
@@ -41,7 +41,7 @@
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'#F{$dp.$D(\'beginDate\',{H:24})}'});"/>
</div>
</div>
@@ -86,6 +86,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
<script type="text/javascript">
$(document).ready(function(){
loading();
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
@@ -94,6 +95,7 @@ $(document).ready(function(){
changeBandwidth(unitType,starth,endh);
//changeBandwidth2(unitType,starth,endh);
$("#unitType").on("change",function(){
loading();
changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
// changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
});
@@ -222,13 +224,12 @@ function changeBandwidth(unitType,beginDate,endDate){
var udpdata2=null;
if(data!=null&&Object.keys(data).length>0){
if(data.ipv4Type1!=undefined&&data.ipv4Type1!=null){
console.log(2222)
xdata=data.ipv4Type1[0].statTime;
xdata=data.ipv4Type1.statTime;
if(unitType=="Gbps"){
ipv4data=data.ipv4Type1[0].gbps;
ipv6data=data.ipv6Type1[0].gbps;
tcpdata=data.trans6Type1[0].gbps;
udpdata=data.trans17Type1[0].gbps;
ipv4data=data.ipv4Type1.gbps;
ipv6data=data.ipv6Type1.gbps;
tcpdata=data.trans6Type1.gbps;
udpdata=data.trans17Type1.gbps;
}
if(unitType=="pps"){
ipv4data=data.ipv4Type1.pps;
@@ -263,13 +264,12 @@ function changeBandwidth(unitType,beginDate,endDate){
if(data!=null&&Object.keys(data).length>0){
if(data.ipv4Type2!=undefined&&data.ipv4Type2!=null){
console.log(3333)
xdata=data.ipv4Type2[0].statTime;
xdata=data.ipv4Type2.statTime;
if(unitType=="Gbps"){
ipv4data2=data.ipv4Type2[0].gbps;
ipv6data2=data.ipv6Type2[0].gbps;
tcpdata2=data.trans6Type2[0].gbps;
udpdata2=data.trans17Type2[0].gbps;
ipv4data2=data.ipv4Type2.gbps;
ipv6data2=data.ipv6Type2.gbps;
tcpdata2=data.trans6Type2.gbps;
udpdata2=data.trans17Type2.gbps;
}
if(unitType=="pps"){
ipv4data2=data.ipv4Type2.pps;

View File

@@ -66,7 +66,6 @@ $(document).ready(function(){
},
error: function(data, textStatus, errorThrown){
closeTip();
// warning_prompt("获取实时列表数据失败!",1500);
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
@@ -130,6 +129,18 @@ function showDomainTrans(rs){
legend: {
enabled:false
},
plotOptions: {
series: {
marker: {
radius: 2,
hover: {
enabled: true,
radius: 7,
radiusPlus: 5
}
}
}
},
series: series,
});
}

View File

@@ -164,6 +164,7 @@ function showIpActiveChart(rs){
var data=new Array();
var xData=new Array();
xData=rs[0].statTime;
//var tickInterval=Math.ceil(xData.length/6);
var series=new Array();
$(rs).each(function(i, d) {
series.push({
@@ -172,9 +173,10 @@ function showIpActiveChart(rs){
});
})
var chart = Highcharts.chart('chart', {
/* chart:{
type: 'area',
}, */
chart:{
//type: 'area',
zoomType: 'x'
},
exporting: {
filename:'IP-Active',
scale:1,
@@ -195,13 +197,29 @@ function showIpActiveChart(rs){
text: null
},
xAxis: {
//tickInterval:tickInterval,
type:'category',
categories: xData,
title: {
text: 'time',
align:'high',
},
},
},
plotOptions: {
series: {
marker: {
radius: 2,
hover: {
enabled: true,
radius: 7,
radiusPlus: 5
}
}
}
},
tooltip: {
pointFormat: '<b><spring:message code="ip"/>:</b>{series.name} <b><spring:message code="count"/>:</b>{point.y}<br/>'
},
yAxis: {
title: {
text: 'bytes'

View File

@@ -0,0 +1,288 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title>
<spring:message code="active_port"></spring:message>
</title>
</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}/dashboard/portActiveList'"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><i class="fa fa-history"></i></button>
</div>
<h3 class="page-title">
<spring:message code="active_port"></spring:message>
</h3>
<div class="row" >
<form:form id="searchForm" action="${ctx}/dashboard/portActiveList" method="get" class="form-search">
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<!-- 搜索内容与操作按钮栏 -->
<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="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
</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="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
</div>
</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 btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<div id="chart" style="width:95%;height:530px;"></div>
</div>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/xlsx.core.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/FileSaver.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
<script type="text/javascript">
$(document).ready(function(){
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
$("#endDate").val(endh);
portActiveMinuteList(starth,endh);
//portActiveOneHourList(starth,endh);
//筛选功能初始化
$("#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",'');
$("#searchForm")[0].reset();
});
});
//导出列表
$(".export-btn").click(function(){
var dataType = $(this).attr("data-type");
var te = $("#contentTable").tableExport({
headings:true,
footers:true,
formats:[dataType],
fileName:"Port-Active-2",
bootstrap:false
});
$("#myexport").click();
$("caption").remove();
});
function searchList(){
var start=$("#beginDate").val();
var end=$("#endDate").val();
loading();
if(start==''||end==''||end==null||start==null){
window.location.reload();
}else{
portActiveMinuteList(start,end);
//portActiveOneHourList(start,end);
}
}
function showPortActiveChart(rs){
var data=new Array();
var xData=new Array();
xData=rs[0].statTime;
var series=new Array();
var legend=new Array();
$(rs).each(function(i, d) {
series.push({
name: d.port,
data: d.sum
});
})
var chart = Highcharts.chart('chart', {
chart:{
// type: 'area',
zoomType: 'x'
},
exporting: {
filename:'Port-Active',
scale:1,
sourceWidth: 1280,
sourceHeight: 500,
buttons: {
contextButton: {
menuItems: [
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
]
}
}
},
plotOptions: {
line: {
marker: {
enabled: true,
radius: 2,
states: {
hover: {
enabled: true,
radius: 7,
radiusPlus: 5
}
}
},
shadow: false
}
},
title: {
text: null
},
xAxis: {
type:'category',
categories: xData,
title: {
text: 'time',
align:'high',
},
},
yAxis: {
title: {
text: 'bytes'
}
},
credits:{//是否有highcharts水印
enabled:false
},
legend: {
layout: 'vertical',
align: 'right',
verticalAlign: 'middle'
},
series: series,
});
}
//活跃IP一小时间隔五分钟统计
function portActiveMinuteList(beginDate,endDate){
loading();
$.ajax({
url: '${ctx}/dashboard/portActiveChart',
type : "get" ,
dataType:"json",
data:{"beginDate":beginDate,"endDate":endDate},
cache:false,
async:false,
timeout:40000,
success:function (rs) {
$("#tbodyData").html("");
if(rs!=null&&rs.length>0){
showPortActiveChart(rs);
}
closeTip();
},
error: function(data, textStatus, errorThrown){
closeTip();
// warning_prompt("获取实时列表数据失败!",1500);
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//活跃IP一小时统计
/* function portActiveOneHourList(beginDate,endDate){
loading();
$.ajax({
url: '${ctx}/dashboard/ajaxPortActiveList',
type : "get" ,
dataType:"json",
data:{"beginDate":beginDate,"endDate":endDate},
cache:false,
async:false,
timeout:40000,
success:function (data) {
$("#tbodyData").html("");
if(data!=null&&data.length>0){
var totalc2sByte= 0;
var totals2cByte= 0;
var totalByte= 0;
var totalLink= 0;
var totalc2sPkt= 0;
var totals2cPkt= 0;
var totalpacket= 0;
$(data).each(function(i, rs) {
var byteNum=rs.s2cByteLen+rs.c2sByteLen;
var packetNum=rs.s2cPktNum+rs.c2sPktNum;
totalc2sByte=totalc2sByte+(rs.c2sByteLen);
totals2cByte=totals2cByte+(rs.s2cByteLen);
totalByte=totalByte+(byteNum);
totalLink=totalLink+(rs.linkNum);
totalc2sPkt=totalc2sPkt+(rs.c2sPktNum);
totals2cPkt=totals2cPkt+(rs.s2cPktNum);
totalpacket=totalpacket+(packetNum);
var html = "<tr>";
html+= "<td class='tc'>"+rs.ipAddr+"</td>";
html+= "<td class='tc'>"+(rs.areaId==1? "Astana":"Alamty")+"</td>";
html+= "<td class='tc'>"+rs.c2sByteLen+"</td>";
html+= "<td class='tc'>"+rs.s2cByteLen+"</td>";
html+= "<td class='tc'>"+byteNum+"</td>";
html+= "<td class='tc'>"+rs.linkNum+"</td>";
html+= "<td class='tc'>"+rs.c2sPktNum+"</td>";
html+= "<td class='tc'>"+rs.s2cPktNum+"</td>";
html+= "<td class='tc'>"+packetNum+"</td>";
html+= "<td class='tc'>"+rs.statTime+"</td>";
html+="</tr>"
if(i==data.length-1){
html+="<tr class='tr-total hidden'>"
html+= "<td class='tc'>"+"<spring:message code='report_total'/>"+"</td>";
html+= "<td class='tc'>"+"--"+"</td>";
html+= "<td class='tc'>"+totalc2sByte+"</td>";
html+= "<td class='tc'>"+totals2cByte+"</td>";
html+= "<td class='tc'>"+totalByte+"</td>";
html+= "<td class='tc'>"+totalLink+"</td>";
html+= "<td class='tc'>"+totalc2sPkt+"</td>";
html+= "<td class='tc'>"+totals2cPkt+"</td>";
html+= "<td class='tc'>"+totalpacket+"</td>";
html+= "<td class='tc'>"+beginDate+"--"+ endDate +"</td>";
html+="</tr>"
}
$("#tbodyData").append(html);
})
}
closeTip();
},
error: function(data, textStatus, errorThrown){
closeTip();
// warning_prompt("获取实时列表数据失败!",1500);
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
} */
</script>
</body>
</html>

View File

@@ -361,11 +361,13 @@
}
function openPicWindow(url){
$.jBox("iframe:"+url, {
title: "",
title: "Domain",
top: '1%',
draggable:false,
width: $(document).width()*0.9,
height:$(document).height()*0.9,
showScrolling: false, /* 是否显示浏览的滚动条 */
iframeScrolling: 'no',
buttons: { 'close': true }
});
}

View File

@@ -897,14 +897,14 @@
color: 'white',
fontSize: 12,
formatter: function (value, index) {
if (value > 1000 && value <= 1000000) {
return value/1000 + " K";
if (value > 1024 && value <= 1048576) {
return value/1024 + " KBps";
}
if (value > 10000000 && value <= 1000000000) {
return value/1000000 + " M";
if (value > 1048576 && value <= 1073741824) {
return value/1048576 + " MBps";
}
if (value > 100000000) {
return value/1000000000 + " B";
if (value > 1073741824) {
return value/1073741824 + " GBps";
}
return value;
}

View File

@@ -28,7 +28,7 @@
sessionStorage.setItem("log_total","${log_total}");
sessionStorage.setItem("log_time_start","${log_time_start}");
sessionStorage.setItem("log_time_range","${log_time_range}");
window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&baseNum=" + baseNum;
window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex?sid=" + indexLogServiceId + "&hour=2&baseNum=" + baseNum;
//window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
//国际化切换
var lang = "${cookie.Language.value }".toLowerCase();

View File

@@ -2,6 +2,9 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/xlsx.core.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/FileSaver.js"></script>
<script src="${ctxStatic }/global/plugins/tableExport-3.3.13/tableexport.js"></script>
<meta name="format-detection" content="telephone=no,email=no,address=no">
<style type="text/css">
.statisticsRequest{
@@ -70,6 +73,7 @@
.table-bordered > thead > tr > td {
border-bottom-width: 2px; }
</style>
<script type="text/javascript">
$(function(){
var hideTd=new Array();
@@ -96,13 +100,92 @@
});
}
closeTip();
// 导出
$(".export-btn").on("click",function(){
loading('<spring:message code="onloading"/>');
var suffix = $(this).data("export-type"); // 导出文件类型
var tableMark = $(this).data("export-table"); //导出table
var menuName = $("#menuName").val();
var fileName = menuName + "_" + getNowFormatDate();
setTemporaryRows(tableMark);
var te = $("."+tableMark).tableExport({
headings:true,
footers:true,
formats:[suffix],
fileName: fileName,
bootstrap:false
});
$("#myexport").click();
$("caption").remove();
$(".exportFirst").remove();
$("."+tableMark+" .count").empty();
closeTip();
});
});
function setTemporaryRows(tableMark){
//1. 设置td合计
var tb=document.getElementsByName(tableMark)[0];
var rows = tb.rows;
var cells = tb.cells;
var colums = tb.rows[0].cells.length;
$("."+tableMark+" .count").empty();
$("."+tableMark+" .count").append("<td><spring:message code='report_total' /></td>");
for(var j = 1; j < colums; j++){
var sum = 0;
for(var i = 1;i<rows.length-1;i++){
var a = parseInt(rows[i].cells[j].innerHTML.trim());
sum = sum + a;
}
$("."+tableMark+" .count").append("<td>"+sum+"</td>");
}
var table = $("."+tableMark);
//2. 设置导出第一行
if(tableMark == "cfgMenuTable"){
var title = table.parent("div:first").siblings("font").text().trim().replace(/\s/g,'');
}else{
var title = table.siblings("font").text().trim().replace(/\s/g,'');
}
var addTr = "<tr class='exportFirst' class='hidden'><td>"+title+"</td></tr>";
$("."+tableMark+"> thead").prepend(addTr);
}
function getNowFormatDate() {
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var strDate = date.getDate();
var hours = date.getHours();
var minutes = date.getMinutes();
var seconds = date.getSeconds();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
if (hours >= 1 && hours <= 9) {
hours = "0" + hours;
}
if (minutes >= 1 && minutes <= 9) {
minutes = "0" + minutes;
}
if (seconds >= 1 && seconds <= 9) {
seconds = "0" + seconds;
}
var currentdate = year+""+ month+""+strDate+""+ hours+""+ minutes+""+seconds;
return currentdate;
}
</script>
</head>
<title>index</title>
</head>
<body class="page-full-width">
<input id="menuName" type="hidden" value="<spring:message code="config_service_statistics"/>">
<div class="statisticsRequest">
<form id="searchForm" action="${ctx}/configure/statistics/configureStateStatistics" >
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -111,10 +194,22 @@
[<spring:message code="statistic_time"/>${requestStatisticTime }]
</i>
</font>
<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh"> </a>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -5px;">
<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><a href="javascript:;" class="export-btn" data-export-type="xlsx" data-export-table="cfgMenuTable"><i class="fa fa-download"> <spring:message code="Excel"/></i></a></li>
<li><a href="javascript:;" class="export-btn" data-export-type="csv" data-export-table="cfgMenuTable"><i class="fa fa-download"> <spring:message code="CSV"/></i></a></li>
</ul>
</div>
</div>
<h5 class="page-header"></h5>
<div class="tableDiv">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap cfgMenuTable" name="cfgMenuTable">
<thead>
<tr>
<th><spring:message code="letter"/></th>
@@ -150,18 +245,33 @@
</tr>
</c:forEach>
<tr class="count"></tr>
</tbody>
</table>
</div>
</form>
<div class="page">${page}</div>
</div>
<div class="statisticsStatus">
<font size="4"><i class="fa fa-cogs"> <spring:message code="configure_statistics_info"/>
[<spring:message code="statistic_time"/>${configStatisticTime }]
</i></font> <a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh pull-right"> </a>
<div id="statisticsStatus" class="statisticsStatus">
<font size="4">
<i class="fa fa-cogs"> <spring:message code="configure_statistics_info"/>
[<spring:message code="statistic_time"/>${configStatisticTime }]</i>
</font>
<a style="color:#333333" href="javascript:page(${page.pageNo},${page.pageSize});" class="icon-refresh "> </a>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" style="margin-top: -5px;">
<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><a href="javascript:;" class="export-btn" data-export-type="xlsx" data-export-table="statisticsStatusTable"><i class="fa fa-download"> <spring:message code="Excel"/></i></a></li>
<li><a href="javascript:;" class="export-btn" data-export-type="csv" data-export-table="statisticsStatusTable"><i class="fa fa-download"> <spring:message code="CSV"/></i></a></li>
</ul>
</div>
</div>
<h5 class="page-header"></h5>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap statisticsStatusTable" name="statisticsStatusTable">
<thead>
<tr>
<th><spring:message code="service_name"/></th>
@@ -221,6 +331,7 @@
</tr>
</c:if>
</c:forEach>
<tr class="count"></tr>
</tbody>
</table>
</div>

View File

@@ -270,7 +270,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -418,7 +418,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -207,7 +207,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -354,7 +354,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -250,7 +250,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
<th class="sort-column type" column="message_type"><spring:message code='message_type'/></th>
<th class="sort-column as_num" column="as"><spring:message code='as'/></th>
@@ -363,7 +363,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
<td>
<c:set var="types">${log.type }</c:set>

View File

@@ -272,7 +272,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -399,7 +399,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -263,7 +263,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<!-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> -->
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -399,7 +399,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -269,7 +269,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -437,7 +437,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -254,7 +254,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -388,7 +388,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -298,7 +298,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -421,7 +421,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -292,7 +292,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -474,7 +474,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -251,7 +251,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -360,7 +360,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -190,7 +190,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -312,7 +312,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -226,7 +226,7 @@
<th column="d_asn" class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th column="s_subscribe_id" class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th column="d_subscribe_id" class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th column="user_region" class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th column="user_region" class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -344,7 +344,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -226,7 +226,7 @@
<th column="d_asn" class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th column="s_subscribe_id" class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th column="d_subscribe_id" class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th column="user_region" class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th column="user_region" class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th column="scene_file" class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -345,7 +345,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -201,7 +201,7 @@
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -324,7 +324,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -280,7 +280,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -414,7 +414,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -207,7 +207,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -366,7 +366,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -204,7 +204,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -361,7 +361,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -256,7 +256,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -414,7 +414,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -203,7 +203,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -363,7 +363,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -202,7 +202,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -360,7 +360,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -204,7 +204,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -358,7 +358,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -256,7 +256,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -414,7 +414,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -316,7 +316,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -469,7 +469,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -245,7 +245,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -404,7 +404,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -245,7 +245,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -401,7 +401,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -255,7 +255,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -412,7 +412,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -245,7 +245,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -403,7 +403,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -256,7 +256,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -415,7 +415,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -261,7 +261,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -410,7 +410,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -211,7 +211,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -354,7 +354,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -267,7 +267,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -418,7 +418,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -251,7 +251,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -372,7 +372,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -334,7 +334,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -254,7 +254,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -371,7 +371,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -198,7 +198,7 @@
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -317,7 +317,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -245,7 +245,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -369,7 +369,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -205,7 +205,7 @@ $(document).ready(function(){
<th class="sort-column d_asn" isVisible="false"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -325,7 +325,7 @@ $(document).ready(function(){
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -268,7 +268,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn"><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id"><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id"><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region"><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file"><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -386,7 +386,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -265,7 +265,7 @@
<th class="sort-column d_asn" isVisible="false" column="d_asn" ><spring:message code='d_asn'/></th>
<th class="sort-column s_subscribe_id" isVisible="false" column="s_subscribe_id" ><spring:message code='s_subscribe_id'/></th>
<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
<th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th>
<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
</tr>
</thead>
@@ -400,7 +400,7 @@
<td>${log.dAsn}</td>
<td>${log.sSubscribeId}</td>
<td>${log.dSubscribeId}</td>
<td>${log.userRegion}</td>
<%-- <td>${log.userRegion}</td> --%>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
</tr>
</c:forEach>

View File

@@ -70,6 +70,7 @@ $(document).ready(function() {
});
//ajaxServiceLogTotal();
$(".export-btn").click(function(){
loading('<spring:message code="onloading"/>');
var suffix = $(this).data("export-type");
totaltb(1,-1);
@@ -85,6 +86,7 @@ $(document).ready(function() {
$("#myexport").click();
$("caption").remove();
//totaltb(pato,size);
closeTip();
});
@@ -484,7 +486,10 @@ white-space:nowrap;
<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>
<%-- <button type="button" class="btn btn-default" id="export-btn"><i class="fa fa-download"> <spring:message code="export"/></i></button> --%>
<div class="btn-group">
<%-- <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></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>
@@ -494,10 +499,6 @@ white-space:nowrap;
<li><a href="javascript:;" class="export-btn" data-export-type="csv"><i class="fa fa-download"> <spring:message code="CSV"/></i></a></li>
</ul>
</div>
<%-- <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><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>

View File

@@ -91,6 +91,7 @@
$(obj).find(".itemCode").attr("name","dictItemList["+index+"].itemCode");
$(obj).find(".itemValue").attr("name","dictItemList["+index+"].itemValue");
$(obj).find(".itemDesc").attr("name","dictItemList["+index+"].itemDesc");
$(obj).find(".itemSort").attr("name","dictItemList["+index+"].itemSort");
$(obj).find(".itemStatus").attr("name","dictItemList["+index+"].status");
$(obj).find(".itemType").attr("name","dictItemList["+index+"].type");
@@ -180,6 +181,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" autocomplete="off"/>
<spring:message code="value"/> <input type="text" class="itemValue" autocomplete="off"/>
<spring:message code="describe"/> <input type="text" class="itemDesc" autocomplete="off"/>
<spring:message code="sort"/> <input type="text" class="itemSort" autocomplete="off"/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2">
<option value="1"><spring:message code="yes"/></option>
@@ -198,6 +200,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="value"/> <input type="text" class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="describe"/> <input type="text" class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="sort"/> <input type="text" class="itemSort" value="${dictItem.itemSort}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>><spring:message code="yes"/></option>

View File

@@ -237,7 +237,7 @@
var $cols = $(val).find('th, td');
return $cols.map(function (i, val) {
// 当文字过长有省略时取title导出
var titleText=$(val).text();
var titleText=$(val).text().trim();
if($(val).attr("title")!=null&&$(val).attr("title")!=""){
titleText=$(val).attr("title");
}
@@ -315,7 +315,7 @@
* @param myClass {String}
*/
function createObjButton(dataObject, myContent, myClass) {
var exportButton = "<button id='myexport' data-fileblob='" + dataObject + "' class='" + bootstrapClass + bootstrapTheme + myClass + "'>" + myContent + "</button>";
var exportButton = "<button id='myexport' type='button' data-fileblob='" + dataObject + "' class='" + bootstrapClass + bootstrapTheme + myClass + "'>" + myContent + "</button>";
checkCaption(exportButton);
}
});

View File

@@ -884,12 +884,14 @@ var switchAction=function(action){
$(this).removeAttr("disabled");
$(this).removeClass("hidden");
$(this).removeClass("disabled");
})
});
$(".doBalckList").removeClass("hidden");
}else{
$(".policy").find("input,select,div,button").each(function(){
$(this).attr("disabled","disabled");
$(this).addClass("hidden");
})
});
$(".doBalckList").addClass("hidden");
}
/*************************action切换时隐藏白名单和drop的是否记录日志*****************************/

View File

@@ -20,7 +20,7 @@ var getTotalLog=function(){
var serviceId=$(this).attr("serviceId");
var functionId=$(this).attr("functionId");
if(audit&&compileId&&functionId&&serviceId){
if(audit == 1){
if(audit != 0){
var has=false;
for(var i=0;i<data.serviceIds.length;i++){
if(data.serviceIds[i]==$(this).attr("serviceId")){

View File

@@ -1199,23 +1199,19 @@ function echart_topic_domain(rs){
var domainNum=t.byteCount;
unit=changeUnit(domainNum);
domainNum=changeNum(domainNum);
data.push({
'id': '2.'+t.webId,
'parent': '1.'+d.topicId,
'name': t.domain,
'value':parseFloat(domainNum)
});
if(domainNum>0){
data.push({
'id': '2.'+t.webId,
'parent': '1.'+d.topicId,
'name': t.domain,
'value':parseFloat(domainNum)
});
}
})
});
// Splice in transparent for the center circle
Highcharts.getOptions().colors.splice(0, 0, 'transparent');
var chart = Highcharts.chart('chart_topic', {
chart: {
backgroundColor: 'rgba(255, 255, 255, 0)',
plotBackgroundColor:null,
@@ -1246,7 +1242,11 @@ function echart_topic_domain(rs){
buttons: exportingButton('#6e6379')
},
//colors:[ '#44A9A8', '#f36f8a','#25f3e6','#ffff43','#964CEC','#32B0ED','#2b6ed7','#7278DD','#2DA9D8','#C66FE6','#0099cc','#cc0033','#ff6633','#99cccc','#d9f9d0'],
colors:['#003078','#004bbc', '#015bb1', '#2f74b5', '#4186c1', '#0058e1','#066aff', '#5597cd', '#5c9dff', '#67a7de', '#77b5dc', '#98cde7','#89b9ff','#78adff'],
// colors:['#003078','#004bbc', '#015bb1', '#2f74b5', '#4186c1', '#0058e1','#066aff', '#5597cd', '#5c9dff', '#67a7de', '#77b5dc', '#98cde7','#89b9ff','#78adff'],
// colors:['#008ef9','#0594ff', '#002540', '#004679', '#025ba1', '#026fc0','#0279d5'],
// colors:['#002540','#004679','#025ba1', '#026fc0', '#0279d5', '#0086e9', '#008ef9','#0594ff', '#25a2ff', '#63bbff', '#88cbff'],
colors:[ '#1C4573','#275A9C', '#306EB9', '#3579CE', '#3C85E1', '#3E8EF1','#4294F7', '#4294F7', '#98CBFA'],
// colors:colors,
noData:{
style: {//设置字体颜色
color: '#fff',
@@ -1293,13 +1293,13 @@ function echart_topic_domain(rs){
colorByPoint: true,
dataLabels: {
rotationMode: 'parallel'
}
},
},
{
level: 3,
colorVariation: {
key: 'brightness',
to: -0.5
to: 0.5
}
}, {
level: 4,

File diff suppressed because it is too large Load Diff