修改大屏项目台账弹窗滚动条自适应

projects/src/main/webapp/asset/css/bigDialog.css

@@ -416,7 +416,7 @@
 
 .layui-table-body {
     /*height: auto !important;*/
-    max-height: 500px;
+    max-height: auto;
 }
 
 

projects/src/main/webapp/asset/css/style_new.css

@@ -174,8 +174,8 @@
 
 .table_box { padding: 0 20px; box-sizing: border-box; }
 .table_box .table_process { max-height: 100% !important; }
-.table_box .layui-laypage { margin: 15px 0 20px; }
-.table_box .layui-laypage > a, .table_box .layui-laypage .layui-laypage-btn { margin-right: 5px; color: #15294C; border: 1px solid #BAC8E0; border-radius: 4px; }
+.table_box .layui-laypage { margin: 15px 0; }
+.table_box .layui-laypage > a, .table_box .layui-laypage .layui-laypage-btn { margin-right: 5px; color: #fff; border: 1px solid #BAC8E0; border-radius: 4px; }
 .table_box .layui-btn-normal { color: #fff; background-color: #007EFF; }
 .table_box .table1 .label { background: #F4FAFF; border: 1px solid #E0EBF7; }
 

projects/src/main/webapp/asset/sass/style_new.scss

@@ -756,10 +756,10 @@
     max-height: 100% !important;
   }
   .layui-laypage {
-    margin: 15px 0 20px;
+    margin: 15px 0;
     & > a, .layui-laypage-btn {
       margin-right: 5px;
-      color: #15294C;
+      color: #fff;
       border: 1px solid #BAC8E0;
       border-radius: 4px;
     }

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -633,7 +633,7 @@
         var opt = {
             title: "项目台账",
             width: window.screen.availWidth - (flag ? 0 : 200),
-            heigt: window.screen.availHeight - (flag ? 50 : 150),
+            height: window.screen.availHeight - (flag ? 95 : 180),
             content: App.getUrl(projTz),
             maxmin: false,
             skin: "bigScreenDialog",

projects/src/main/webapp/vmodules/statics/layer/projInfo_new.jsp

@@ -7,7 +7,7 @@
     <jsp:include page="../../common/common-meta-include.jsp"></jsp:include>
     <jsp:include page="../../common/common-js-include.jsp"></jsp:include>
     <jsp:include page="../../common/common-css-include.jsp"></jsp:include>
-    <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/bigDialog.css" media="all">
+    <%-- <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/bigDialog.css" media="all">--%>
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/contentIframe.css" media="all">
     <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/bigTable.css" media="all">
     <!--[if lt IE 9]>
@@ -198,9 +198,9 @@
         </div>
 
         <div class="table_box">
-            <div class="table_process" style="position: relative">
-                <div class="export" style="background: transparent;top: 60px;">
-                    <div class="export" style="right: 0;top: 0;" @click="exportExcel">
+            <div class="table_process" style="position: relative; overflow-y: hidden;">
+                <div style="position: relative; display: inline-block;" @click="exportExcel">
+                    <div class="export">
                         <img src="${WebSite.asset}/css/images/left/export.svg"/>
                         <span>导出</span>
                     </div>
@@ -430,13 +430,13 @@
                     elem: '#table1', // 指定原始表格元素选择器（推荐id选择器）
                     even: true,
                     autoSort: false,
-                    toolbar: '#headerToolbar',
+                    // toolbar: '#headerToolbar',
                     defaultToolbar: [],
                     initSort: self.sort,
                     cols: columns,
                     data: self.dataList,
                     fixed: true,
-                    heigt: window.screen.availHeight - 250,
+                    height: window.screen.availHeight - 260,
                     done: function (res, curr, count) {
                         res.data.forEach(function (item, index) {
                             if (index % 2 == 0) {