Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

web/css/main.css

@@ -1,7 +1,8 @@
 /*building SAAS 0.1*/
 /*bootstrap 初始化*/
 body {
-    font-size: 0.9rem
+    font-size: 0.9rem;
+    overflow: hidden;
 }
 .dropdown-menu {
     font-size: 0.9rem
@@ -26,12 +27,12 @@ body {
   width:100%;
   z-index: 999
 }
-.in-1{padding-left:0rem!important}
-.in-2{padding-left:1rem!important}
-.in-3{padding-left:1.5rem!important}
-.in-4{padding-left:2rem!important}
-.in-5{padding-left:2.5rem!important}
-.in-6{padding-left:3rem!important}
+.in-1{padding-left:0px!important}
+.in-2{padding-left:21px!important}
+.in-3{padding-left:42px!important}
+.in-4{padding-left:63px!important}
+.in-5{padding-left:84px!important}
+.in-6{padding-left:105px!important}
 .main {
     position: relative;
     background: #f7f7f9;
@@ -62,7 +63,12 @@ body {
     background: #fff;
     color: #333
 }
+.main-nav .nav-tabs{
+  border-bottom: none
+}
 .content {
+    border-left: 1px solid #ccc;
+    margin-left: 29px;
     background: #fff
 }
 .tools-btn {
@@ -73,29 +79,22 @@ body {
     background: #f7f7f9;
 }
 .main-side {
-    border-right: 1px solid #ccc;
-    overflow-y: auto;
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    overflow-y: hidden;
 }
-.main-side .tab-bar {
-    padding:5px 10px;
-    height:38px;
-    position:fixed;
-}
-.main-side .tab-content {
-    margin-top: 38px
+.sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
+  height:200px
 }
 .top-content, .fluid-content {
-    overflow: hidden;
+    overflow: auto;
     border-bottom: 1px solid #ccc;
 }
-.warp-p2 {
-    padding: 2px
-}
-.bottom-content .nav,.top-content .nav {
+.bottom-content .nav {
     background: #f7f7f9;
     padding:0 0 0 2px
 }
-.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link,.top-content .nav-tabs .nav-link {
+.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link {
     border-radius: 0;
     padding: 0.2em 0.5em
 }
@@ -212,14 +211,13 @@ body {
         transform: translateX(10px);
     }
 }
-.bottom-content {
-    height: 370px;
-    overflow: hidden;
-}
 .bottom-content .tab-content .main-data-bottom{
-    height: 340px;
+    height: 200px;
     overflow: auto;
 }
+.bottom-content .tab-content .ovf-hidden{
+    overflow: hidden;
+}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -228,9 +226,13 @@ body {
     overflow: auto;
 }
 .poj-list span.poj-icon {
-  padding-right:10px;
+  padding-right:7px;
   color:#ccc
 }
+.poj-list a.tree-open,.poj-list a.tree-close{
+  width:15px;
+  display: inline-block;
+}
 .print-toolsbar{
   padding:5px
 }
@@ -266,10 +268,7 @@ body {
   width:inherit;
   height: inherit;
 }
-.codeList{
-    max-height: 200px;
-    overflow:auto;
-}
-.main-data-top,.main-data-bottom,.main-data{
-  overflow: auto;
+.modal-fixed-height {
+  height: 400px;
+  overflow-y: auto;
 }

web/rationRepository/dinge.html

@@ -8,7 +8,7 @@
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/web/css/bootstrap/bootstrap.min.css">
    <!-- <link rel="stylesheet" href="/lib/css/bootstrap/themes.css">-->
-    <link rel="stylesheet" href="/web/css/main.css">
+    <link rel="stylesheet" href="/web/css/main_dinge.css">
     <link rel="stylesheet" href="/web/css/font-awesome/font-awesome.min.css">
     <!--zTree-->
   	<link rel="stylesheet" href="/web/css/ztree/zTreeStyle.css" type="text/css">
@@ -83,7 +83,7 @@
                                           <a class="nav-link" data-toggle="tab" href="#bfzd" role="tab">辅助定额调整</a>
                                       </li>
                                       <li class="nav-item">
-                                          <a class="nav-link active" data-toggle="tab" href="#bfzt" role="tab">附注条件调整</a>
+                                          <a class="nav-link" data-toggle="tab" href="#bfzt" role="tab">附注条件调整</a>
                                       </li>
                                       <li class="nav-item">
                                           <a class="nav-link" data-toggle="tab" href="#baz" role="tab">安装增加费</a>
@@ -119,7 +119,7 @@
                                           </div>
                                       </div>
                                       <!--附注条件调整-->
-                                      <div class="tab-pane active" id="bfzt" role="tabpanel">
+                                      <div class="tab-pane" id="bfzt" role="tabpanel">
                                           <div class="main-data-bottom">
                                               <table class="table table-sm table-bordered m-0">
                                                   <thead><tr><th width="30"></th><th width="40">编号</th><th width="120">本分项全部适用</th><th>调整顺序</th><th>名称</th><th>内容</th></tr></thead>

web/rationRepository/gongliao.html

@@ -7,7 +7,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="/web/css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/css/main.css">
+    <link rel="stylesheet" href="/web/css/main_dinge.css">
     <link rel="stylesheet" href="/web/css/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="/web/css/spreadjs/gc.spread.sheets.10.0.1.css" type="text/css">
     <!--zTree-->

web/rationRepository/js/ration.js

@@ -41,9 +41,9 @@ var rationOprObj = {
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.RangeChanged, me.onRangeChanged);
-        me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.CellClick, me.onCellClcik);
+        me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.CellClick, me.onCellClick);
     },
-    onCellClcik: function(sender, args) {
+    onCellClick: function(sender, args) {
         var me = rationOprObj, sheet = rationGLJOprObj.workBook.getSheet(0), setting = rationGLJOprObj.setting;
         if(args.sheetArea === GC.Spread.Sheets.SheetArea.colHeader || args.sheetArea === GC.Spread.Sheets.SheetArea.corner){
             sheetCommonObj.cleanSheet(sheet, setting, -1);
@@ -56,6 +56,7 @@ var rationOprObj = {
                 rationGLJOprObj.getGljItems(cacheSection[args.row]);
             }
         }
+        //me.workBook.focus(true);
     },
     getCache: function() {
         var me = this, rst = me.currentRations["_SEC_ID_" + me.currentSectionId];