|
+ ${cfg.compileId } |
${cfg.cfgDesc } |
@@ -344,6 +351,13 @@
|
+
+
+
+
+
+
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 95945d6c1..6af43eeb0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -129,6 +129,27 @@ $(function(){
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index f9e2a7c9a..42fc38606 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -10,6 +10,8 @@
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
+ }else if("${cfg.compileId}"){
+ $("#intype").val("${cfg.compileId}");
}else{
$("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text());
}
@@ -31,6 +33,7 @@
$(".Wdate").attr("value",'');
$("#description").attr("value",'');
$("#searchForm")[0].reset();
+ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text());
});
});
var edit=function(url){
@@ -100,6 +103,7 @@
+
@@ -271,12 +275,14 @@
|
+ |
|
|
|
|
|
|
+ |
|
|
|
@@ -297,6 +303,7 @@
|
+ ${cfg.compileId } |
${cfg.cfgDesc } |
|
+
+
+
+
+
+
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
index dc9b2122a..61fee0d1e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
@@ -107,6 +107,27 @@ $(function(){
+
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index ad10e8185..b239f57a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -8,6 +8,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
+ }else if("${cfg.compileId}"){
+ $("#intype").val("${cfg.compileId}");
}else if("${cfg.srcIpAddress}"){
$("#intype").val("${cfg.srcIpAddress}");
}else if("${cfg.srcPort}"){
@@ -33,6 +35,7 @@
$(".Wdate").attr("value",'');
$("#description").attr("value",'');
$("#searchForm")[0].reset();
+ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text());
});
});
var edit=function(url){
@@ -102,6 +105,7 @@
+
@@ -275,6 +279,7 @@
|
<%-- | --%>
+ |
|
|
|
@@ -286,6 +291,7 @@
|
|
|
+ |
|
|
|
@@ -307,6 +313,7 @@
|
+ ${cfg.compileId } |
${cfg.cfgDesc } |
@@ -344,6 +351,13 @@
|
+
+
+
+
+
+
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index f135211a5..e3543b643 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -120,6 +120,27 @@ $(function(){
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 9b43274e0..5e3ba99e1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -8,6 +8,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
+ }else if("${cfg.compileId}"){
+ $("#intype").val("${cfg.compileId}");
}else if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
}else{
@@ -31,6 +33,8 @@
$(".Wdate").attr("value",'');
$("#description").attr("value",'');
$("#searchForm")[0].reset();
+ $("#searchForm")[0].reset();
+ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text());
});
});
var edit=function(url){
@@ -100,6 +104,7 @@
+
@@ -272,12 +277,14 @@
|
<%-- | --%>
+ |
|
|
|
|
|
|
+ |
|
|
|
@@ -298,6 +305,7 @@
|
+ ${cfg.compileId } |
${cfg.cfgDesc } |
|
+
+
+
+
+
+
+ |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index c260fbf7a..1a156fede 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -152,6 +152,27 @@ $(function(){
+
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 813c5809d..8524491f2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -8,6 +8,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
+ }else if("${cfg.compileId}"){
+ $("#intype").val("${cfg.compileId}");
}else if("${cfg.description}"){
$("#intype").val("${cfg.description}");
}else if("${cfg.level}"){
@@ -33,6 +35,7 @@
$(".Wdate").attr("value",'');
$("#description").attr("value",'');
$("#searchForm")[0].reset();
+ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text());
});
});
var edit=function(url){
@@ -73,7 +76,7 @@
-
+
@@ -102,6 +105,7 @@
+
@@ -275,10 +279,12 @@
|
<%-- | --%>
+ |
|
|
|
|
+ |
|
|
|
@@ -299,6 +305,7 @@
|
+ ${cfg.compileId } |
@@ -314,6 +321,13 @@
|
+
+
+
+
+
+
+ |
${cfg.requestName } |
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 48d67fad0..8bb931152 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -415,7 +415,31 @@ $(function(){
initCommIpVal();
});
window.onload=function(){
- //日志查询IP类型增加格式提示
+ // 配置id的搜索下拉框选择切换
+ if ($("#searchForm #seltype").val() == 'compileId') {
+ $("#searchForm #intype").addClass("number");
+ } else {
+ $("#searchForm #intype").removeClass("number");
+ }
+ // reset时去掉number
+ $("#resetBtn").on("click", function() {
+ if ($("#searchForm #seltype").val() == 'compileId') {
+ $("#searchForm #intype").addClass("number");
+ } else {
+ $("#searchForm #intype").removeClass("number");
+ }
+ });
+ // 切换时为compileId加上number
+ $("#searchForm #seltype").on("change", function() {
+ if ($("#searchForm #seltype").val() == 'compileId') {
+ $("#searchForm #intype").addClass("number");
+ } else {
+ $("#searchForm #intype").removeClass("number");
+ }
+ });
+
+
+ // 日志查询IP类型增加格式提示
$("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
$("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
$("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
| | | | |