Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

蔡德晨 5 rokov pred
rodič
commit
922f7970b8

+ 7 - 18
src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -9,14 +9,7 @@
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/vermeit.css">
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
-    <link rel="stylesheet" href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
-    <script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
-    <%--<script src="${ctxp}/static/plugin/bootstrapTable/tableExport.js"></script>--%>
-    <%--<script src="${ctxp}/static/plugin/bootstrapTable/bootstrap-table-contextmenu.js"></script>--%>
-    <%--<script src="${ctxp}/static/plugin/bootstrapTable/bootstrap-table-export.js"></script>--%>
-    <%--<script src="${ctxp}/static/plugin/bootstrapTable/bootstrap-table-zh-CN.js"></script>--%>
-    <%--<script src="${ctxp}/static/plugin/bootstrapTable/bootstrap-table-contextmenu.js"></script>--%>
 </head>
 <style>
     .layui-input{height: 28px;margin-top: 5px;width: 260px;}
@@ -29,7 +22,7 @@
     .layui-table-tips-main{display:none}
     .layui-table-tips-c{display:none}
 </style>
-<body style="height:100%">
+<body style="height: 100%">
 <input style="display: none;" id="addtext" value=""/>
 <div class="layui-main-bgc">
     <sys:message content="${message}"/>
@@ -127,9 +120,6 @@
                         </div>
                         <div class="layui-btn-group" style="float: right;margin-right: 10px;border: 1px solid rgb(204,204,204)">
                             <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="noneBtn"><img class="layui-meself-img" src="${ctxp}/icon/solr.png" alt=""></button>
-                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
-                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
-                            <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
                         <div id="page"><div>
@@ -141,13 +131,6 @@
 </body>
 <%@include file="management.js"%>
 <script>
-    function  page(id1,id2,id3) {
-        $("#pageNo").val(id1);
-        $("#pageSize").val(id2);
-        $("#fromSumbit").submit();
-    }
-</script>
-<script>
     layui.use(['laypage', 'layer'], function(){
         var laypage = layui.laypage
             ,layer = layui.layer;
@@ -155,6 +138,8 @@
         laypage.render({
             elem: 'page'
             ,count: ${page.count}
+            ,limit:${page.pageSize}
+            ,curr:${page.pageNo}
             ,layout: ['limit', 'prev', 'page', 'next']
             ,jump: function(obj, first){
                 //首次不执行
@@ -164,6 +149,10 @@
                     $("#fromSumbit").submit();
                 }
             }
+            ,data:{
+                page_num:20,
+                current_page:1
+            }
         });
     });
 </script>