Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/tender_showhide.js

@@ -51,6 +51,7 @@ function localHideList() {
     }
     setTopTr();
 }
+$(window).resize(setTopTr);
 // 设置表头固定并动态调整宽度高度
 function setTopTr() {
     for(let item = 0; item < $(".c-body table>thead>tr>th").length; item ++) {

app/view/setting/info.ejs

@@ -59,9 +59,13 @@
         </div>
     </div>
 </div>
+<script>
+    $(function () {
+        autoFlashHeight();
+    })
+</script>
 <% if (projectData.user_account === ctx.session.sessionUser.account) { %>
 <script type="text/javascript">
-    autoFlashHeight();
     function updateinfo()
     {
         $("#info-form").submit();

app/view/tender/index.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <% include ./sub_menu.ejs %>
     <div class="content-wrap">
-        <div class="sjs-height-0">
+        <div class="sjs-height-0" style="background-color: #fff">
             <div class="c-body" onselectstart="return false" style="{-moz-user-select:none}">
             </div>
         </div>

app/view/tender/info.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <% include ./sub_menu.ejs %>
     <div class="content-wrap">
-        <div class="sjs-height-0">
+        <div class="sjs-height-0" style="background-color: #fff">
             <div class="c-body" onselectstart="return false" style="{-moz-user-select:none}">
             </div>
         </div>

app/view/tender/manage.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <% include ./sub_menu.ejs %>
     <div class="content-wrap">
-        <div class="sjs-height-0">
+        <div class="sjs-height-0" style="background-color: #fff">
             <div class="c-body" onselectstart="return false" style="{-moz-user-select:none}">
             </div>
         </div>

app/view/tender/progress.ejs

@@ -1,7 +1,7 @@
 <div class="panel-content">
     <% include ./sub_menu.ejs %>
     <div class="content-wrap">
-        <div class="sjs-height-0">
+        <div class="sjs-height-0" style="background-color: #fff">
             <div class="c-body" onselectstart="return false" style="{-moz-user-select:none}">
             </div>
         </div>