特征及内容ui

web/building_saas/main/html/main.html

@@ -16,8 +16,6 @@
     <link rel="stylesheet" href="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css">
     <!-- jquery.contextmenu -->
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
-
-
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
     <script>
@@ -161,18 +159,12 @@
                               <!-- Tab panes -->
                               <div class="tab-content">
                                   <div class="tab-pane active" id="gl" role="tabpanel">
-                                      <div class="main-data-bottom ovf-hidden" id="subSpread">
+                                      <div class="main-data-bottom ovf-hidden" id="subSpread" style="display: none">
                                       </div>
-                                      <div id="tzjnrCon" class="row" style="display: none">
-                                          <div class="col-6">
-                                              <div class="row">
-                                                  <div class="main-data-bottom ovf-hidden col-5" id="jobSpread">
-                                                  </div>
-                                                  <div class="main-data-bottom ovf-hidden col-7" id="itemSpread">
-                                                  </div>
-                                              </div>
+                                      <div id="tzjnrCon" class="main-data-bottom">
+                                          <div class="main-data-bottom ovf-hidden" style="width: 40%; float: left;" id="jobSpread">
                                           </div>
-                                          <div class="col-6">
+                                          <div class="main-data-bottom ovf-hidden" style="width: 60%; float: left;" id="itemSpread">
                                           </div>
                                       </div>
                                   </div>

web/building_saas/main/js/views/sub_view.js

@@ -3,14 +3,16 @@
  */
 //modified by zhong on 2017-08-30
 // Tab panes 下有多个Spread时，相互之间不能正确显示。改成一个Spread下多个Sheet。
-var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 7);
-subSpread.getSheet(4).name('JSCX');
-
 //特征及内容spread，解决不能正确显示spread
-$("#jobSpread").width($("#subSpread").width() *0.5* 0.4);
-$("#itemSpread").width($("#subSpread").width() *0.5 - $("#jobSpread").width()-20);
 contentOprObj.buildSheet($("#jobSpread")[0]);
 characterOprObj.buildSheet($("#itemSpread")[0]);
+$("#tzjnrCon").hide();
+$("#subSpread").show();
+
+var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 7);
+subSpread.getSheet(4).name('JSCX');
+
+
 pageCCOprObj.active = false;
 
 // 工料机
@@ -111,6 +113,7 @@ $("#linkDESM").click(function(){
 $("#linkTZJNR").click(function () {
     $("#subSpread").hide();
     $("#tzjnrCon").show();
+    let indentWidth = $("#jobSpread")[0].clientWidth - $("#jobSpread table")[1].clientWidth;
     pageCCOprObj.active = true;
     let selectedNode = projectObj.mainController.tree.selected;
     pageCCOprObj.mainActiveCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];