显示调整。

public/web/sheet/sheet_creater.js

@@ -11,12 +11,11 @@ sheetObj = {
     create: function (container, colDef, datas){
         var me = this;
         me.spread = new GC.Spread.Sheets.Workbook(container, {sheetCount:1});
-        me.spread.suspendPaint();
-
         me.spread.options.tabStripVisible = false;
         me.spread.options.showHorizontalScrollbar = false;
-
         var sheet = me.spread.getSheet(0);
+        sheet.suspendPaint();
+        sheet.suspendEvent();
         var sheetArea = GC.Spread.Sheets.SheetArea;
         sheet.setRowCount(20, sheetArea.viewport);
         sheet.setRowHeight(0, 25, sheetArea.colHeader);
@@ -27,8 +26,8 @@ sheetObj = {
         me.setColAlign(colDef);
         me.lockCols(colDef);
         me.setRowHeight(datas, 23);
-
-        me.spread.resumePaint();
+        sheet.resumeEvent();
+        sheet.resumePaint();
         return me.spread;
     },
 

web/maintain/ration_repository/css/main.css

@@ -74,7 +74,7 @@ body {
 }
 .main-side {
     border-right: 1px solid #ccc;
-    overflow-y: auto;
+    overflow:hidden;
 }
 .main-side .tab-bar {
     padding:5px 10px;
@@ -271,5 +271,9 @@ body {
     overflow:auto;
 }
 .main-data-top,.main-data-bottom,.main-data{
-  overflow: auto;
+  overflow: hidden;
 }
+.modal-fixed-height {
+    height:400px;
+    overflow-y:auto;
+}

web/maintain/ration_repository/fuzhu.html

@@ -47,138 +47,10 @@
             <div class="container-fluid">
                 <div class="row">
                   <div class="main-side col-lg-7 p-0">
-                    <div class="main-data" id="mainSpread" style="height: 600px;">
-                   <!-- <table class="table table-sm table-bordered m-0">
-                      <thead>
-                        <tr>
-                          <th></th>
-                          <th>编号</th>
-                          <th>名称</th>
-                          <th>内容</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr class="table-active">
-                          <td>1</td>
-                          <td>1</td>
-                          <td>挖湿土时</td>
-                          <td>人工×1.18</td>
-                        </tr>
-                        <tr>
-                          <td>2</td>
-                          <td>2</td>
-                          <td>深2m以内</td>
-                          <td>人工×2.63</td>
-                        </tr>
-                        <tr>
-                          <td>3</td>
-                          <td>3</td>
-                          <td>深4m以内</td>
-                          <td>人工×14.71</td>
-                        </tr>
-                        <tr>
-                          <td>4</td>
-                          <td>4</td>
-                          <td>深6m以内</td>
-                          <td>人工×26.72</td>
-                        </tr>
-                        <tr>
-                          <td>5</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td>6</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td>7</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                      </tbody>
-                    </table>-->
-                    </div>
+                    <div class="main-data" id="mainSpread"  style="height:1000px;"></div>
                   </div>
                   <div class="main-content col-lg-5 p-0">
-                      <div id="contentSpread" style="height: 400px; margin-left:4px;margin-right:4px;" />
-                    <!--<div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 单个工料机调整</label></div></p>
-                    </div>
-                    <table class="table table-sm table-bordered m-0">
-                      <thead>
-                        <tr>
-                          <th>名称</th>
-                          <th>操作符</th>
-                          <th>数量</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>人工</td>
-                          <td>*</td>
-                          <td>1.18</td>
-                        </tr>
-                        <tr>
-                          <td>材料</td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td>机械</td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1"> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1" checked> 单个工料机调整</label></div></p>
-                    </div>
-                    <table class="table table-sm table-bordered m-0">
-                      <thead>
-                        <tr>
-                          <th></th>
-                          <th>编码</th>
-                          <th>名称</th>
-                          <th>操作符</th>
-                          <th>数量</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr>
-                          <td>1</td>
-                          <td>00010201</td>
-                          <td>人工</td>
-                          <td>*</td>
-                          <td>1.18</td>
-                        </tr>
-                        <tr>
-                          <td>2</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td>3</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td>4</td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                      </tbody>
-                    </table>-->
+                      <div class="main-data" id="contentSpread" style="height:1000px;"></div>
                   </div>
                 </div>
             </div>
@@ -203,8 +75,8 @@
     <script src="/public/debug.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
     <script type="text/javascript" src="/web/maintain/ration_repository/js/coe.js"></script>
-    <SCRIPT type="text/javascript">
-  		<!--
+   <!-- <SCRIPT type="text/javascript">
+  		&lt;!&ndash;
   		var setting = {
   			view: {
   				showIcon: false
@@ -255,11 +127,11 @@
   		$(document).ready(function(){
   			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
   		});
-  		//-->
-  	</SCRIPT>
+  		//&ndash;&gt;
+  	</SCRIPT>-->
 </body>
 <script type="text/javascript">
-//    autoFlashHeight();
+    autoFlashHeight();
 </script>
 
 </html>

web/users/login.html

@@ -6,7 +6,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>用户登录-Smartcost</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/building_saas/css/main.css">
+    <link rel="stylesheet" href="/web/maintain/ration_repository/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/public/web/url_util.js"></script>
@@ -126,7 +126,7 @@
 
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
+    <script src="/web/ration_repository/js/global.js"></script>
 </body>
 
 </html>