From 09b237e04d0ee08f420a0f498691b7209d3811af Mon Sep 17 00:00:00 2001 From: zhangwq Date: Sun, 9 Dec 2018 17:12:40 +0800 Subject: [PATCH] =?UTF-8?q?1.HTTP=20url=E3=80=81keyword=E3=80=81advanced?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B7=B3=E8=BD=AChttp=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=202.snat=E5=9C=B0=E5=9D=80=E6=B1=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE+=E8=B7=B3=E8=BD=AC=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/20181209/update_specific_service_cfg.sql | 6 ++++++ .../views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp | 6 ++++-- .../cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp | 2 +- .../jquery-validation/1.11.0/localization/messages_ru.js | 2 +- src/main/webapp/static/global/scripts/pzLog.js | 7 +++++-- 6 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/sql/20181209/update_specific_service_cfg.sql diff --git a/src/main/resources/sql/20181209/update_specific_service_cfg.sql b/src/main/resources/sql/20181209/update_specific_service_cfg.sql new file mode 100644 index 000000000..e29fd614a --- /dev/null +++ b/src/main/resources/sql/20181209/update_specific_service_cfg.sql @@ -0,0 +1,6 @@ +UPDATE + specific_service_cfg c +SET + c.spec_service_code = c.spec_service_code + 10000 +WHERE + c.cfg_type IN (2, 3) AND c.parent_id = 0; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp index 3ef432fb5..7436bb55b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp @@ -85,7 +85,7 @@ var dataArr = data.candidate_ip; var html = "" html = "
" - html+=""; + html+="
"; html+=""; if(dataArr.length == 0){ html+=""; @@ -121,7 +121,7 @@ success:function(data,status){ var html = "" html = "
" - html+="
"; + html+="
"; html+=""; if(data.length == 0){ html+=""; @@ -389,6 +389,7 @@ + <%-- --%> @@ -420,6 +421,7 @@ + <%-- - +
${cfg.ipTotal }
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp index b96f0f8d3..3f390a3b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp @@ -156,7 +156,7 @@ $(function(){
-
+
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index 02d38e47f..66abd1b02 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -69,7 +69,7 @@ haveInvisibleChar:"Теги {0} включают невидимый символ", httpCheck:"Введите правильный URL(http[s]://xxx.xx)", failed:"Неудачно", - go_back:"Вернуть назад Политики", + go_back:"Назад", log_5_minutes:"Журнал за последние пять минут", log_1_hour:"Журнал За последний час", input:"Введите, пожалуйста ", diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js index afe52b090..9114a56dc 100644 --- a/src/main/webapp/static/global/scripts/pzLog.js +++ b/src/main/webapp/static/global/scripts/pzLog.js @@ -114,7 +114,7 @@ var toLogSearch = function(index){ var date=$(this).attr("date"); var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4); - switchMenu("152"); + switchMenu("152",functionId); window.location.href = pathName+"/toLogSearch?service="+serviceId+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes"; } @@ -122,7 +122,7 @@ var toLogSearch = function(index){ } -var switchMenu = function(topMenuId){ +var switchMenu = function(topMenuId,functionId){ // 顶部菜单切换 menuId： Policies/86 Logs/152 $(".hor-menu ul li",parent.document).each(function(){ var id = $(this).children("a").attr("id"); @@ -144,6 +144,9 @@ var switchMenu = function(topMenuId){ middleMenu.push($(this).attr("menu-name")); } }); + if(functionId == 8){ + middleMenu.pop(); + } // 左侧菜单切换 $(".page-sidebar",parent.document).find("ul[id]").each(function(){