diff --git a/WebRoot/html/study/add.html b/WebRoot/html/study/add.html index 98ed40f..13ec05e 100644 --- a/WebRoot/html/study/add.html +++ b/WebRoot/html/study/add.html @@ -62,6 +62,14 @@ layui.extend({ admin: '{/}../static/js/admin' }); + function GetQueryString(name,istop) { + var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); + var r = window.location.search.substr(1).match(reg); + if(typeof(istop) != "undefined") r = top.location.search.substr(1).match(reg); + + if (r != null) return unescape(r[2]); + return null; + } layui.use(['form', 'jquery', 'admin', 'layer'], function () { var form = layui.form, $ = layui.jquery, diff --git a/WebRoot/html/study/documentList.html b/WebRoot/html/study/documentList.html index 7bc90bf..364be08 100644 --- a/WebRoot/html/study/documentList.html +++ b/WebRoot/html/study/documentList.html @@ -5,6 +5,20 @@ Title -我是右边的页面! + \ No newline at end of file diff --git a/WebRoot/html/study/left.html b/WebRoot/html/study/left.html index f39015a..4ca7128 100644 --- a/WebRoot/html/study/left.html +++ b/WebRoot/html/study/left.html @@ -50,11 +50,8 @@ success: function (data) { //修改一下数据源 for (let v in data) { - if (data[v]["level_id"] == 2) { - data[v]["target"] = "iframeContent"; - data[v]["url"] = "documentList.html?task_id=" + data[v]["id"]; - console.log(data[v]); - } + data[v]["target"] = "iframeContent"; + data[v]["url"] = "documentList.html?task_id=" + data[v]["id"] + "&level_id=" + data[v]["level_id"]; } zNodes = data; zTreeObj = $.fn.zTree.init($("#tree"), setting, zNodes); diff --git a/WebRoot/html/study/studyList.html b/WebRoot/html/study/studyList.html index 591f723..29e62e3 100644 --- a/WebRoot/html/study/studyList.html +++ b/WebRoot/html/study/studyList.html @@ -11,12 +11,12 @@ height: 70px; } #iframeLeft{ - width: 15%; + width: 25%; height: 1280px; float: left; } #iframeContent{ - width: 84%; + width: 74%; height: 1280px; } diff --git a/WebRoot/html/study/update.html b/WebRoot/html/study/update.html index 4e84fdf..4488946 100644 --- a/WebRoot/html/study/update.html +++ b/WebRoot/html/study/update.html @@ -62,6 +62,14 @@ layui.extend({ admin: '{/}../static/js/admin' }); + function GetQueryString(name,istop) { + var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); + var r = window.location.search.substr(1).match(reg); + if(typeof(istop) != "undefined") r = top.location.search.substr(1).match(reg); + + if (r != null) return unescape(r[2]); + return null; + } layui.use(['form', 'jquery', 'admin', 'layer'], function () { var form = layui.form, $ = layui.jquery,