Browse Source

2019_09_10

xs 5 years ago
parent
commit
f81d8c8d3e

+ 12 - 15
src/main/webapp/webpage/modules/sg/project/management.js

@@ -8,18 +8,18 @@
 
     //日期
     laydate.render({
-    elem: '#beginDate1'
-});
-    laydate.render({
-    elem: '#endDate1'
-});
-    laydate.render({
-    elem: '#beginDate2'
-});
-    laydate.render({
-    elem: '#endDate2'
-});
-});
+            elem: '#beginDate1'
+        });
+        laydate.render({
+            elem: '#endDate1'
+        });
+        laydate.render({
+            elem: '#beginDate2'
+        });
+        laydate.render({
+            elem: '#endDate2'
+        });
+    });
 layui.config({
     base: '${ctxp}/static/plugin/assets/'
 }).extend({
@@ -210,7 +210,6 @@ function update(url) {
 }
 //逻辑删除项目
 function deleteItem(id) {
-    alert(id)
     $.ajax({
         type: "post",
         url: "${ctx}/project/tem/deleteItem",
@@ -218,7 +217,6 @@ function deleteItem(id) {
         dataType: "json",
         success: function(data){
             if(data.success){
-                alert(data.msg);
                 layer.msg(data.msg, {icon: 6});
                 window.location.reload();
             }else{
@@ -236,7 +234,6 @@ function deleteProject(id) {
         dataType: "json",
         success: function(data){
             if(data.success){
-                alert(data.msg);
                 layer.msg(data.msg, {icon: 6});
                 window.location.reload();
             }else{

+ 20 - 4
src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -9,9 +9,14 @@
     <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;}
@@ -21,6 +26,8 @@
     .layui-icon-layer{display: none;}
     .layui-icon-file{display: none;}
     .layui-table-view .layui-table {width:100%}
+    .layui-table-tips-main{display:none}
+    .layui-table-tips-c{display:none}
 </style>
 <body style="height:100%">
 <input style="display: none;" id="addtext" value=""/>
@@ -32,7 +39,9 @@
                 <div class="layui-card-header layui-card-header-add">工程管理</div>
                 <div class="layui-card-body" id="noneDiv" style="display: none">
                    <div class="layui-meself-bgc">
-                       <form class="layui-form" action="${ctx}/project/list" style="margin-top: 10px;" method="post">
+                       <form class="layui-form" action="${ctx}/project/list" style="margin-top: 10px;" method="post" id="fromSumbit">
+                           <input id="pageNo" name="pageNo" type="hidden" value=""/>
+                           <input id="pageSize" name="pageSize" type="hidden" value=""/>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
@@ -123,7 +132,7 @@
                             <%--<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>
-                        <%--<table:page page="${page}"></table:page>--%>
+                        <table:page page="${page}"></table:page>
                         <div style="clear: both;"></div>
                     </div>
                 </div>
@@ -133,4 +142,11 @@
 </div>
 </body>
 <%@include file="management.js"%>
+<script>
+    function  page(id1,id2,id3) {
+        $("#pageNo").val(id1);
+        $("#pageSize").val(id2);
+        $("#fromSumbit").submit();
+    }
+</script>
 </html>

+ 2 - 1
src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -55,14 +55,15 @@ function okSubmit() {
     //获取输入的项目名称
     var div1 =  document.getElementsByClassName("mydiv1");
     var divvalue=[];
+    var div_val=[];
     for (var i = 0; i < div1.length; i++) {
         divvalue[i]=div1[i].innerHTML;
+        div_val[i]=div1[i].innerHTML;
     }
     if (divvalue.length<=0){
         layer.msg("请输入项目名称",{icon: 3});
         return false;
     }
-    var div_val = divvalue.sort();
     for (var i = 0; i < divvalue.length; i++) {
         if (divvalue[i]=="请输入项目名称"){
             layer.msg("请输入项目名称",{icon: 3});