From b8804d5d98c558b17e88362eaec5e1a89bbe4ad2 Mon Sep 17 00:00:00 2001 From: leijun Date: Tue, 11 Dec 2018 11:12:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manipulation/IpMultiplexController.java | 39 +++++++++ .../ntc/FileTransferCfgController.java | 20 +++++ .../web/dao/configuration/IpMultiplexDao.java | 5 +- .../web/dao/configuration/IpMultiplexDao.xml | 28 +++++++ .../configuration/IpMultiplexService.java | 8 ++ .../WEB-INF/views/cfg/av/voip/voipSubList.jsp | 1 - .../cfg/fileTransfer/fileDigestLogSubList.jsp | 75 +++++++++++++++++ .../WEB-INF/views/cfg/ipaddr/ipSubList.jsp | 2 +- .../manipulation/ipmulitiplex/dnatSubList.jsp | 79 ++++++++++++++++++ .../manipulation/ipmulitiplex/snatSubList.jsp | 81 +++++++++++++++++++ .../cfg/proxy/control/httpRedirectSubList.jsp | 1 - .../views/log/manipulation/dkBehaviorList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 2 +- .../WEB-INF/views/log/ntc/httpKeyList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 3 +- .../WEB-INF/views/log/ntc/irDnatLogList.jsp | 36 +-------- .../WEB-INF/views/log/ntc/irSnatLogList.jsp | 36 +-------- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 2 +- .../views/log/ntc/mmFileDigestList.jsp | 4 +- .../views/log/ntc/mmPornVideoSampleList.jsp | 2 +- .../views/log/ntc/mmSampleAudioList.jsp | 2 +- .../views/log/ntc/mmSampleFaceList.jsp | 2 +- .../views/log/ntc/mmSampleLogoList.jsp | 2 +- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 2 +- .../views/log/ntc/mmSampleSpeakerList.jsp | 2 +- .../views/log/ntc/mmSampleVideoList.jsp | 2 +- .../views/log/ntc/mmSampleVoipList.jsp | 2 +- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 2 +- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 2 +- .../WEB-INF/views/log/ntc/sslLogList.jsp | 2 +- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 2 +- .../webapp/static/global/scripts/common.js | 39 ++++++++- 37 files changed, 397 insertions(+), 102 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp create mode 100644 src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatSubList.jsp create mode 100644 src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index 24833bb54..61f2ba1be 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -234,6 +234,45 @@ public class IpMultiplexController extends CommonController { return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+functionId; } + + @RequestMapping(value = {"/ajaxSnatInfo"}) + public String ajaxSnatInfo(Model model,Long cfgId,Integer index,Integer compileId) { + IpReusePolicyCfg cfg = ipMultiplexService.getSnatCfg(cfgId, compileId); + List tabList = new ArrayList(); + String cfgType = null; + if(!cfg.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"1",cfg.getCfgType()}); + cfgType = cfg.getCfgType(); + } + + List users = userManageService.findUsers(); + List addrPools = ipAddrPoolCfgService.getEffectiveAddrPool(); + model.addAttribute("users", users); + model.addAttribute("addrPools", addrPools); + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/manipulation/ipmulitiplex/snatSubList"; + } + + + + @RequestMapping(value = {"/ajaxDnatInfo"}) + public String ajaxDnatInfo(Model model,Long cfgId,Integer index,Integer compileId) { + IpReuseDnatPolicyCfg cfg = ipMultiplexService.getDnatCfg(cfgId, compileId); + List tabList = new ArrayList(); + String cfgType = null; + if(!cfg.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"1",cfg.getCfgType()}); + cfgType = cfg.getCfgType(); + } + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/manipulation/ipmulitiplex/dnatSubList"; + } + + /** * 异步获取地址池信息 * @param request diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index c39c33bf6..c73270e1a 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -132,6 +132,8 @@ public class FileTransferCfgController extends BaseController{ model.addAttribute("tabList", tabList); return "/cfg/fileTransfer/ftpSubList"; } + + /** * 做删除操作 * @param isValid @@ -371,6 +373,24 @@ public class FileTransferCfgController extends BaseController{ return "/cfg/fileTransfer/fileDigestSubList"; } + @RequestMapping(value = {"ajaxFileDigestLogSubIdList"}) + public String ajaxFileDigestLogSubIdList(Model model,Long cfgId,Integer index,Integer compileId) { + FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId,compileId); + List tabList = new ArrayList(); + String cfgType = null; + if(!cfg.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"1",cfg.getCfgType()}); + cfgType = cfg.getCfgType(); + } + model.addAttribute("_cfg", cfg); + model.addAttribute("index", index); + model.addAttribute("tabList", tabList); + return "/cfg/fileTransfer/fileDigestLogSubList"; + } + + + + @RequestMapping(value = {"p2pList"}) public String p2pList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { Page searchPage=new Page(request,response,"a"); diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java index 6abe1e159..549e736c9 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java @@ -40,5 +40,8 @@ public interface IpMultiplexDao extends CrudDao{ List findPageDnat(IpReuseDnatPolicyCfg entity); List findDnatList(@Param("cfgId")Long cfgId, @Param("isValid")Integer isValid); - + + IpReusePolicyCfg getSnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); + + IpReuseDnatPolicyCfg getDnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId); } diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index babb93430..603256054 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -711,4 +711,32 @@ ORDER BY a.cfg_id + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java index 2e1db7bb3..a6de5c52a 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import com.beust.jcommander.internal.Lists; import com.nis.domain.Page; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.DdosIpCfg; import com.nis.domain.configuration.IpReuseDnatPolicyCfg; import com.nis.domain.configuration.IpReusePolicyCfg; import com.nis.domain.maat.ToMaatResult; @@ -308,4 +309,11 @@ public class IpMultiplexService extends BaseService{ } } + public IpReusePolicyCfg getSnatCfg(Long cfgId,Integer compileId) { + return ipMultiplexDao.getSnatCfg(cfgId,compileId); + } + + public IpReuseDnatPolicyCfg getDnatCfg(Long cfgId,Integer compileId) { + return ipMultiplexDao.getDnatCfg(cfgId,compileId); + } } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp index 051c235fc..383a36eb5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp @@ -109,7 +109,6 @@ - diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp new file mode 100644 index 000000000..5f39147d8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp @@ -0,0 +1,75 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + +
+ + +
+ + + + + + +
+
+
+
+ + + ${fns:abbr(cfg.digest,40)} + +
+
+
+
+
+
+ + + ${fn:substring(cfg.fileUrl,0,40) } + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp index c3e5b2586..0740788c7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp @@ -4,7 +4,7 @@ + + + +
+ + +
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp new file mode 100644 index 000000000..f444d04c5 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp @@ -0,0 +1,81 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ + +
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp index f9d6a733c..cbfb74a17 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp @@ -61,7 +61,6 @@ -
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 956a30268..c7526ab6c 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -267,7 +267,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 16894d194..aabbf3125 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -252,7 +252,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 929a58676..a51a48844 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -249,7 +249,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index 780d085fb..e40dd08ce 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -268,7 +268,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index cca4a089e..908f42da7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -253,7 +253,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index b87416425..2b37d96c9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -289,7 +289,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 9a7c8372f..86a655ba9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -271,7 +271,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index 6a1988b35..5ba3c92a3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -31,6 +31,7 @@ $("#"+openId).hide(); $("#"+closeId).show(); var compileId=$(this).attr("compileId"); + compileId="839066"; // var cfgId=$(this).attr("cfgId"); if($("#"+openId).parent().parent().next("tr").hasClass("child")){ $("#"+openId).parent().parent().next("tr").show(); @@ -249,7 +250,7 @@ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp index bedfb6b8f..fb1f231e4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp @@ -23,40 +23,6 @@ //筛选功能 filterActionInit(); - //异步获取voip相关信息 - $("span[id^=open]").click(function(){ - var openId=$(this).attr("id"); - var closeId=$(this).attr("id").replace("open","close"); - var index=$(this).attr("id").replace("open",""); - $("#"+openId).hide(); - $("#"+closeId).show(); - var compileId=$(this).attr("compileId"); -// var cfgId=$(this).attr("cfgId"); - if($("#"+openId).parent().parent().next("tr").hasClass("child")){ - $("#"+openId).parent().parent().next("tr").show(); - }else{ - $.ajax({ - type:'post', - async:false, - url:'${ctx}/ntc/iplist/ajaxSubList', - data:{"compileId":compileId,"index":index}, - dataType:"html", - success:function(data){ - var subTab=""+ - ""; - var html=""; - html+="
"; - html = html+data; - subTab=subTab+html; - subTab+=""; - subTab+=""; - $("#"+openId).parent().parent().after(subTab); - $("div[name='tabTitle"+index+"']").get(0).click(); - } - }); - } - - }); $("span[id^=close]").on("click",function(){ var closeId=$(this).attr("id"); @@ -260,7 +226,7 @@ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp index 1fffd6168..f7cd91e0a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp @@ -23,40 +23,6 @@ //筛选功能 filterActionInit(); - //异步获取voip相关信息 - $("span[id^=open]").click(function(){ - var openId=$(this).attr("id"); - var closeId=$(this).attr("id").replace("open","close"); - var index=$(this).attr("id").replace("open",""); - $("#"+openId).hide(); - $("#"+closeId).show(); - var compileId=$(this).attr("compileId"); -// var cfgId=$(this).attr("cfgId"); - if($("#"+openId).parent().parent().next("tr").hasClass("child")){ - $("#"+openId).parent().parent().next("tr").show(); - }else{ - $.ajax({ - type:'post', - async:false, - url:'${ctx}/ntc/iplist/ajaxSubList', - data:{"compileId":compileId,"index":index}, - dataType:"html", - success:function(data){ - var subTab=""+ - ""; - var html=""; - html+="
"; - html = html+data; - subTab=subTab+html; - subTab+=""; - subTab+=""; - $("#"+openId).parent().parent().after(subTab); - $("div[name='tabTitle"+index+"']").get(0).click(); - } - }); - } - - }); $("span[id^=close]").on("click",function(){ var closeId=$(this).attr("id"); @@ -260,7 +226,7 @@ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index a7bfd34f6..fc7bc62bc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -255,7 +255,7 @@ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 70f620b90..10ba938b4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -35,7 +35,7 @@ $(document).ready(function(){ $.ajax({ type:'post', async:false, - url:'${ctx}/ntc/fileTransfer/ajaxFileDigestSubIdList', + url:'${ctx}/ntc/fileTransfer/ajaxFileDigestLogSubIdList', data:{"compileId":compileId,"index":index}, dataType:"html", success:function(data){ @@ -255,7 +255,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index d104a523c..1f5cef1cf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index cc4a3c4e2..69bb5a7c6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -314,7 +314,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index 327554fab..da3d34eba 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index 509501073..fb6b465ac 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index be5cf8a2e..5e64dfdee 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 4fa193c2b..7aa1e929e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -254,7 +254,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 497b71cfa..19529f08f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -255,7 +255,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index 4110c1b93..0fec691b1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -260,7 +260,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 81d48ec18..562725c08 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -263,7 +263,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 830077d24..b472d8aa3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -248,7 +248,7 @@ $(document).ready(function(){ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index db457f91a..c38f32475 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -252,7 +252,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 440d75d1e..cd26a440b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -266,7 +266,7 @@ <%-- ▷ --%> - + ${log.cfgId } diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp index 423eadf85..8326c0da4 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -252,7 +252,7 @@ <%-- ▷ - --%> + --%> ${log.cfgId } diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index cbd6a1cbd..d089a071a 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -67,6 +67,28 @@ $(function(){ setIsHexBin(this); }); $("a[name=viewLogInfo]>i").on("click",function(){ + + var url=$(this).parents("a").attr("url"); + var compileId=$(this).parents("a").attr("compileId"); + var pzhtml=""; + var index="0"; + if((url!=null && url!='') && (compileId !=null && compileId!='')){ + $.ajax({ + type:'post', + async:false, + url:url, + data:{"compileId":compileId,"index":index}, + dataType:"html", + success:function(data){ + var subTab=""; + var htmls=""; + htmls+="
"; + htmls = htmls+data; + subTab=subTab+htmls; + pzhtml=subTab; + } + }); + } var html = "
"; $(this).parents("tr").find("td").each(function(index,element){ if(index >0){ @@ -88,12 +110,21 @@ $(function(){ html+="
"; html+="
"; html+="
"; - } }) - html +="
"; - - top.$.jBox(html,{height:450,width:600,title:" Log Info",showIcon:false,opacity:0.5}); + if(pzhtml!=null && pzhtml!=""){ + html+="
"; + html+="
" + html+=pzhtml; + html +='"; + html+="
" + } + html +="
"; + top.$.jBox(html,{height:450,width:700,title:" Log Info",showIcon:false,opacity:0.5}); }); //表格中的tooltips鼠标点击复制完整的内容 $("td>.tooltips").not(".addrPool").on("click",function(){