صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
chengqiang
/
sg_finalAcountAuto
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

Merge remote-tracking branch 'origin/master'

蔡德晨 5 سال پیش
والد
c0795aa34b 506c21bb0f
کامیت
c1fb82af88
2فایلهای تغییر یافته به همراه91 افزوده شده و 49 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 32 45
      src/main/webapp/webpage/modules/sg/free/individualForm.jsp
  2. 59 4
      src/main/webapp/webpage/modules/sg/free/wbslist.js

+ 32 - 45
src/main/webapp/webpage/modules/sg/free/individualForm.jsp
مشاهده فایل 

@@ -7,7 +7,6 @@
 
     <link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
 
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
-    <%--<%@include file="alongst.js"%>--%>
 
 </head>
 
 <style>
 
     .layui-table-view .layui-table {width:100%}
 
@@ -16,29 +15,19 @@
 
     .layui-icon-file{display: none;}
 
     .layui-table-tips-main{display:none}
 
     .layui-table-tips-c{display:none}
 
-    input {
 
-        height: 33px;
 
-        line-height: 33px;
 
-        padding: 0 7px;
 
-        border: 1px solid #ccc;
 
-        border-radius: 2px;
 
-        margin-bottom: -2px;
 
-        outline: none;
 
-    }
 
-    input:focus {
 
-        border-color: #009E94;
 
-    }
 
+    .solr{height: 33px;line-height: 33px;padding: 0 7px;border: 1px solid #ccc;border-radius: 2px;margin-bottom: -2px;outline: none;width: 190px;}
 
+    input:focus {border-color: #009E94;}
 
 </style>
 
 <body>
 
 <div class="layui-btn-group suretable" style="display: none;">
 
     <button class="layui-btn"  data-type="getCheckData" id="freenl">确定</button>
 
 </div>
 
 <form class="layui-form" action="">
 
-    <div class="layui-form-item">
 
+    <div class="layui-form-item" style="float: left">
 
         <div class="" style="margin-left: 10px;margin-top: 10px;">
 
             <span id="mylable2">项目调整</span>
 
             <span>:</span>
 
-            <span id="readid2">200</span>
 
+            <span id="readid2"></span>
 
         </div>
 
         <div class="" style="margin-left: 10px;">
 
             <input type="radio" name="mydiv" value="1" title="增加" checked="">
 
@@ -46,10 +35,10 @@
 
         </div>
 
     </div>
 
 </form>
 
-&nbsp;&nbsp;
 
-<input id="edt-search" type="text" placeholder="输入关键字" style="width: 120px;"/>&nbsp;&nbsp;
 
-<%--<button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>--%>
 
-<button class="layui-btn" onclick="solr();">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
 
+<div style="float: right;margin:22px 100px;">&nbsp;&nbsp;
 
+    <input id="edt-search" type="text" placeholder="输入关键字" class="solr" style=""/>&nbsp;&nbsp;
 
+    <button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
 
+</div>
 
 <div style="margin-left: 7px;margin-right: 7px">
 
 <table class="layui-table" id="longtable" lay-filter="longtable"></table>
 
 </div>
 
@@ -64,7 +53,6 @@
 
         var table = layui.table;
 
         var layer = layui.layer;
 
         var treetable = layui.treetable;
 
-
 
         var renderTable1 = function () {
 
             layer.load(2);
 
             treetable.render({
 
@@ -141,6 +129,30 @@
 
                 data.bl=bfb2;
 
             }
 
         });
 
+        //搜索--
 
+        $('#btn-search').click(function () {
 
+            var keyword = $('#edt-search').val();
 
+            var searchCount = 0;
 
+            $('#longtable').next('.treeTable').find('.layui-table-body tbody tr td').each(function () {
 
+                $(this).css('background-color', 'transparent');
 
+                var text = $(this).text();
 
+                if (keyword != '' && text.indexOf(keyword) >= 0) {
 
+                    $(this).css('background-color', 'rgba(250,230,160,0.5)');
 
+                    if (searchCount == 0) {
 
+                        treetable.expandAll('#longtable');
 
+                        $('html,body').stop(true);
 
+                        $('html,body').animate({scrollTop: $(this).offset().top - 150}, 500);
 
+                    }
 
+                    searchCount++;
 
+                }
 
+            });
 
+            if (keyword == '') {
 
+                layer.msg("请输入搜索内容", {icon: 5});
 
+            } else if (searchCount == 0) {
 
+                layer.msg("没有匹配结果", {icon: 5});
 
+            }
 
+        });
 
+
 
         var $ = layui.$, active = {
 
             getCheckData: function(){ //获取选中数据
 
                 var checkStatus = table.checkStatus('checktable'),
 
@@ -187,31 +199,6 @@
 
         var fyje2 = parent.$('#fyje1').val();
 
         $("#mylable2").text(xmmc2);
 
         $("#readid2").text(fyje2);
 
-
 
     });
 
 </script>
 
-<script>
 
-    function solr(){
 
-        var keyword = $('#edt-search').val();
 
-        var searchCount = 0;
 
-        $('#longtable').next('.treeTable').find('.layui-table-body tbody tr td').each(function () {
 
-            $(this).css('background-color', 'transparent');
 
-            var text = $(this).text();
 
-            if (keyword != '' && text.indexOf(keyword) >= 0) {
 
-                $(this).css('background-color', 'rgba(250,230,160,0.5)');
 
-                if (searchCount == 0) {
 
-                    treetable.expandAll('#longtable');
 
-                    $('html,body').stop(true);
 
-                    $('html,body').animate({scrollTop: $(this).offset().top - 150}, 500);
 
-                }
 
-                searchCount++;
 
-            }
 
-        });
 
-        if (keyword == '') {
 
-            layer.msg("请输入搜索内容", {icon: 5});
 
-        } else if (searchCount == 0) {
 
-            layer.msg("没有匹配结果", {icon: 5});
 
-        }
 
-    }
 
-</script>
 
 </html>

+ 59 - 4
src/main/webapp/webpage/modules/sg/free/wbslist.js
مشاهده فایل 

@@ -206,7 +206,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
 
             layer.open({  //弹出层页面
 
                 type: 2,
 
                 title: '单独调整',
 
-                area: ['70%', '90%'], //设置弹出层大小
 
+                area: ['900px', '95%'], //设置弹出层大小
 
                 shade: 0.8,
 
                 maxmin: true,  //最大最小值
 
                 shadeClose: true,
 
@@ -234,7 +234,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
 
            layer.open({
 
                 type: 2,
 
                 title: xmmc,
 
-                area: ['40%', '90%'],
 
+                area: ['500px', '95%'],
 
                 shade: 0.8,
 
                 shadeClose: true,
 
                 content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'
 
@@ -307,8 +307,9 @@ table.on('tool(settle)', function(obj){
 
             type: 1,
 
             title:data.setname,
 
             // skin: 'layui-layer-rim',
 
-            area: ['60%', '70%'],
 
-            content: "<div style='padding: 16px'>"+data.reason+"</div>"
 
+            area: ['700px', '90%'],
 
+            // content: "<div style='padding: 16px'>"+data.reason+"</div>"
 
+            content: tips(data)
 
         });
 
     }
 
 });
 
@@ -320,4 +321,58 @@ function doIt(val){ //科学计数法
 
     var num = new Number(val);
 
     return num;
 
 }
 
+function tips(data) {
 
+  var div = "<div style='padding: 16px'>"+data.reason+"</div>";
 
+  // var div = "<div className='layui-form'>"+
 
+  //   "<table className='layui-table'>"+
 
+  //   "<colgroup>"+
 
+  //   "<col width='150'>"+
 
+  //   "<col width='150'>"+
 
+  //   "<col width='200'>"+
 
+  //   "<col>"+
 
+  //   "</colgroup>"+
 
+  //   "<thead>"+
 
+  //   "<tr>"+
 
+  //   "<th>人物</th>"+
 
+  //   "<th>民族</th>"+
 
+  //   "<th>出场时间</th>"+
 
+  //   "<th>格言</th>"+
 
+  //   "</tr>"+
 
+  //   "</thead>"+
 
+  //   "<tbody>"+
 
+  //   "<tr>"+
 
+  //   "<td>贤心</td>"+
 
+  //   "<td>汉族</td>"+
 
+  //   "<td>1989-10-14</td>"+
 
+  //   "<td>人生似修行</td>"+
 
+  //   "</tr>"+
 
+  //   "<tr>"+
 
+  //   "<td>张爱玲</td>"+
 
+  //   "<td>汉族</td>"+
 
+  //   "<td>1920-09-30</td>"+
 
+  //   "<td>于千万人之中遇见你所遇见的人，于千万年之中，时间的无涯的荒野里…</td>"+
 
+  //   "</tr>"+
 
+  //   "<tr>"+
 
+  //   "<td>Helen Keller</td>"+
 
+  //   "<td>拉丁美裔</td>"+
 
+  //   "<td>1880-06-27</td>"+
 
+  //   "<td> Life is either a daring adventure or nothing.</td>"+
 
+  //   "</tr>"+
 
+  //   "<tr>"+
 
+  //   "<td>岳飞</td>"+
 
+  //   "<td>汉族</td>"+
 
+  //   "<td>1103-北宋崇宁二年</td>"+
 
+  //   "<td>教科书再滥改，也抹不去“民族英雄”的事实</td>"+
 
+  //   "</tr>"+
 
+  //   "<tr>"+
 
+  //   "<td>孟子</td>"+
 
+  //   "<td>华夏族（汉族）</td>"+
 
+  //   "<td>公元前-372年</td>"+
 
+  //   "<td>猿强，则国强。国强，则猿更强！ </td>"+
 
+  //   "</tr>"+
 
+  //   "</tbody>"+
 
+  //   "</table>"+
 
+  //   "</div>";
 
+    return div;
 
+}
 
 </script>