1. 更新样式

2. 拖动改变窗口大小，本地记录信息增加版本号

app/public/css/main.css

@@ -46,29 +46,29 @@ font-size: .875rem;
 /* 滚动条 */
 ::-webkit-scrollbar-thumb:horizontal { /*水平滚动条的样式*/
 	width: 5px;
-	background-color: #ddd;
-	-webkit-border-radius: 6px;
+	background-color: #e9ecef;
+	-webkit-border-radius: 0;
 }
 ::-webkit-scrollbar-track-piece {
-	background-color: #fff; /*滚动条的背景颜色*/
+	background-color: #efefef; /*滚动条的背景颜色*/
 	-webkit-border-radius: 0; /*滚动条的圆角宽度*/
 }
 ::-webkit-scrollbar {
-	width: 10px; /*滚动条的宽度*/
-	height: 8px; /*滚动条的高度*/
+	width: 14px; /*滚动条的宽度*/
+	height: 14px; /*滚动条的高度*/
 }
 ::-webkit-scrollbar-thumb:vertical { /*垂直滚动条的样式*/
 	height: 50px;
-	background-color: #ddd;
-	-webkit-border-radius: 6px;
+	background-color: #e9ecef;
+	-webkit-border-radius: 0;
 	outline: 1px solid #fff;
 	outline-offset: -1px;
-	border: 1px solid #fff;
+	border: 1px solid #ced4da;
 }
 ::-webkit-scrollbar-thumb:hover { /*滚动条的hover样式*/
 	height: 50px;
-	background-color: #999;
-	-webkit-border-radius: 6px;
+	background-color: #ced4da;
+	-webkit-border-radius: 0;
 }
 .sjs-height-1,.sjs-height-2,.sjs-sh-1,.sjs-sh-2,.sjs-sh-3,.sjs-sh-4,.sjs-sh-5{
   overflow: hidden;
@@ -205,6 +205,7 @@ font-size: .875rem;
 .panel-content .content-wrap{
   margin:0 15px 15px;
   position: relative;
+  background-color: #d2d5da
 }
 .panel-sidebar+.panel-content{
   padding: 65px 0 0 200px;
@@ -261,6 +262,10 @@ font-size: .875rem;
 .panel-title>.title-main{
   padding-left: 15px
 }
+.panel-title .alert {
+  line-height: normal;
+  z-index: 999
+}
 .side-menu{
   position: fixed;
   right:15px;
@@ -268,7 +273,12 @@ font-size: .875rem;
 }
 .side-menu .nav-link{
   line-height: 16px;
-  font-size: 14px
+  font-size: 14px;
+  color:#666;
+}
+.side-menu .nav-link:hover{
+  background:#dcdee3;
+  color:#333;
 }
 .sub-content{
   margin:0;
@@ -518,7 +528,7 @@ font-size: .875rem;
   padding:0 0 5px
 }
 .c-body{
-  padding:15px;
+  padding:6px 6px 4px 6px;
   background:#fff;
 }
 .right-nav{

app/public/css/spreadjs/sheets/gc.spread.sheets.excelsmartcost.css

@@ -57,7 +57,7 @@
 .gc-columnHeader-normal {
     color: #444444;
     background-image: none;
-    background-color: white;
+    background-color:#e9ecef;
     border-style:solid;
     border-left-color: #dee2e6 !important;
     border-right-color: #dee2e6 !important;
@@ -66,7 +66,7 @@
 .gc-columnHeader-hover {
     color: #444444;
     background-image: none;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     border-style:solid;
     border-left-color: #efefef !important;
     border-right-color: #d5ded5 !important;
@@ -75,7 +75,7 @@
 .gc-columnHeader-selected {
     color: #73a2e3;
     background-image: none;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     border-style:solid;
     border-left-color: #efefef !important;
     border-right-color: #d5ded5 !important;
@@ -84,7 +84,7 @@
 .gc-columnHeader-highlight {
     color: #73a2e3;
     background-image: none;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     border-style:solid;
     border-left-color: #efefef !important;
     border-right-color: #d5ded5 !important;
@@ -92,7 +92,7 @@
 }
 .gc-rowHeader-normal {
     color: #444444;
-    background-color: white;
+    background-color: #e9ecef;
     background-image: none;
     border-style:solid;
     border-top-color: #efefef !important;
@@ -101,7 +101,7 @@
 }
 .gc-rowHeader-hover {
     color: #73a2e3;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     background-image: none;
     border-style:solid;
     border-top-color: #efefef !important;
@@ -110,7 +110,7 @@
 }
 .gc-rowHeader-selected {
     color: #73a2e3;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     background-image: none;
     border-style:solid;
     border-top-color: #dee2e6 !important;
@@ -119,7 +119,7 @@
 }
 .gc-rowHeader-highlight {
     color: #73a2e3;
-    background-color: #f5f5f5;
+    background-color: #dddfe1;
     background-image: none;
     border-style:solid;
     border-top-color: #efefef !important;
@@ -128,11 +128,11 @@
 }
 .gc-horizontal-scrollbar {
     background-color: #fff;
-    border-top-color: #efefef;
+    border-top-color: #fff
 }
 .gc-vertical-scrollbar {
     background-color: #fff;
-    border-left-color: #efefef;
+    border-left-color: #fff
 }
 .gc-footer-corner {
     background-color: #fff;
@@ -819,28 +819,28 @@ a.gc-filter-check:hover {
 
 .gc-scroll-bar {
     border-style:solid;
-    border-color:#bfbfbf;
-    background:  #bfbfbf;
+    border-color:#ced4da;
+    background:  #e9ecef;
     -moz-border-radius: 0px;
     -webkit-border-radius: 0px;
     border-radius: 0px;
 }
 .gc-scroll-arrow-hover {
     border-style:solid;
-    border-color:#a7a7a7;
-    background: #a7a7a7;
+    border-color:#ced4da;
+    background: #ced4da;
 }
 .gc-scrollbar-stateHover {
     border-style:solid;
-    border-color:#a7a7a7;
-    background: #a7a7a7;
+    border-color:#ced4da;
+    background: #ced4da;
 }
 
 .gc-scroll-arrow:active,
 .gc-scrollbar-stateActive {
     border-style:solid;
-    border-color:#a7a7a7;
-    background: #a7a7a7;
+    border-color:#ced4da;
+    background: #ced4da;
     -webkit-box-shadow: none;
           box-shadow: none;
 }

app/public/js/div_resizer.js

@@ -6,7 +6,7 @@
  *
  * 示例结构：
  * <div id="top-div"></div>
- * <div r-Type="height|width" div1="#top-div" div2="#bottom-div" store-id="XXX" min="100">
+ * <div r-Type="height|width" div1="#top-div" div2="#bottom-div" store-id="XXX" store-version="1.0.0" min="100">
  * <div id="bottom-div"></div>
  *
  * 其中：
@@ -37,12 +37,12 @@
         // }
         // 根据localStorage初始化
         if (obj.attr('store-id')) {
-            const rType = obj.attr('r-type');
-            const objSize1 = getLocalCache('v-resize-1-' + obj.attr('store-id'));
+            const rType = obj.attr('r-type'), version = obj.attr('store-version') ? ('-'+obj.attr('store-version')) : '' ;
+            const objSize1 = getLocalCache('v-resize-1-' + obj.attr('store-id') + version);
             if (objSize1) {
                 $(obj.attr('div1')).css(rType, objSize1);
             }
-            const objSize2 = getLocalCache('v-resize-2-' + obj.attr('store-id'));
+            const objSize2 = getLocalCache('v-resize-2-' + obj.attr('store-id') + version);
             if (objSize2) {
                 $(obj.attr('div2')).css(rType, objSize2);
             }

app/public/js/global.js

@@ -18,21 +18,21 @@ function autoFlashHeight(){
     var pBarz = getObjHeight($(".toolsbar-f"));
     var bdtopc = getObjHeight($(".body-height-top"));
     var bcontent = getObjHeight($(".bcontent-wrap"));
-    $(".sjs-height-0").height($(window).height()-cHeader-110);
-    $(".sjs-height-1").height($(window).height()-cHeader-bcontent-110);
+    $(".sjs-height-0").height($(window).height()-cHeader-90);
+    $(".sjs-height-1").height($(window).height()-cHeader-bcontent-90);
     $(".sjs-height-2").height($(window).height()-cHeader-sBarz-110);
-    $(".sjs-height-3").height($(window).height()-cHeader-sBar-510);
+    $(".sjs-height-3").height($(window).height()-cHeader-sBar-492);
     $(".sjs-height-4").height($(window).height()-cHeader-pBarz-110);
     $(".sjs-height-5").height($(window).height()-cHeader-sBart-555);
     $(".sjs-height-6").height($(window).height()-cHeader-bdtopc-156);
     $(".sjs-height-7").height($(window).height()-cHeader-sBar-110);
     $(".sp-wrap").height(bcontent-40);
     /*侧栏高度*/
-    $(".sjs-sh-1").height($(window).height()-cHeader-sBar1-110);
-    $(".sjs-sh-2").height($(window).height()-cHeader-sBar2-110);
-    $(".sjs-sh-3").height($(window).height()-cHeader-sBar3-110);
-    $(".sjs-sh-4").height($(window).height()-cHeader-sBar4-110);
-    $(".sjs-sh-5").height($(window).height()-cHeader-sBar5-110);
+    $(".sjs-sh-1").height($(window).height()-cHeader-sBar1-92);
+    $(".sjs-sh-2").height($(window).height()-cHeader-sBar2-92);
+    $(".sjs-sh-3").height($(window).height()-cHeader-sBar3-92);
+    $(".sjs-sh-4").height($(window).height()-cHeader-sBar4-92);
+    $(".sjs-sh-5").height($(window).height()-cHeader-sBar5-92);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/

app/view/ledger/audit.ejs

@@ -29,7 +29,7 @@
                 <div class="sjs-height-1" id="ledger-spread">
                 </div>
                 <% if (tender.measure_type === measureType.tz.value) { %>
-                <div id="main-resize" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="audit-main" min="100"></div>
+                <div id="main-resize" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="audit-main" store-version="1.0.0" min="100"></div>
                 <div class="bcontent-wrap" id="main-bottom">
                     <div class="bc-bar mb-1">
                         <ul class="nav nav-tabs">

app/view/stage/change.ejs

@@ -25,7 +25,7 @@
                 </div>
                 <!--下部分-->
                 <div class="bcontent-wrap" id="bottom-view">
-                    <div id="main-resize" class="resize-y" r-Type="height" div1="#bgl-spread" div2="#bottom-view" store-id="stage-change" min="150"></div>
+                    <div id="main-resize" class="resize-y" r-Type="height" div1="#bgl-spread" div2="#bottom-view" store-id="stage-change" store-version="1.0.0" min="150"></div>
                     <div class="bc-bar mb-1">
                         <ul class="nav nav-tabs">
                             <li class="nav-item">
@@ -57,7 +57,7 @@
                                     </div>
                                 </div>
                                 <div class="col-6" id="right-view">
-                                    <div id="bills-resize" class="resize-x" r-Type="width" div1="#left-spread" div2="#right-view" store-id="stage-change-bills" min="150"></div>
+                                    <div id="bills-resize" class="resize-x" r-Type="width" div1="#left-spread" div2="#right-view" store-id="stage-change-bills" store-version="1.0.0" min="150"></div>
                                     <div class="tab-content">
                                         <div class="tab-pane active" id="tz">
                                             <div class="sp-wrap" id="pos-spread">

app/view/stage/compare.ejs

@@ -21,7 +21,7 @@
             <div class="sjs-height-1" id="ledger-spread">
             </div>
             <div class="bcontent-wrap" id="main-bottom">
-                <div id="main-resize" class="resize-y" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="stage-compare" min="100"></div>
+                <div id="main-resize" class="resize-y" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="stage-compare" store-version="1.0.0" min="100"></div>
                 <div class="bc-bar mb-1">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">

app/view/stage/detail.ejs

@@ -31,7 +31,7 @@
             </div>
             <!--右栏-->
             <div class="c-body col">
-                <div class="side-bar-1 sjs-bar">
+                <div class="sjs-bar-1">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">
                             <a class="nav-link active" data-toggle="tab" href="#zhongjian" role="tab">中间计量数据</a>

app/view/stage/gather.ejs

@@ -40,7 +40,7 @@
             <div class="sjs-height-1" id="gcl-spread">
             </div>
             <div class="bcontent-wrap" id="main-bottom">
-                <div id="main-resize" class="resize-y" r-Type="height" div1="#gcl-spread" div2="#main-bottom" store-id="stage-gather" min="100"></div>
+                <div id="main-resize" class="resize-y" r-Type="height" div1="#gcl-spread" div2="#main-bottom" store-id="stage-gather" store-version="1.0.0" min="100"></div>
                 <div class="bc-bar mb-1">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">

app/view/stage/index.ejs

@@ -26,7 +26,7 @@
                 </div>
                 <!--下部分-->
                 <div class="bcontent-wrap" id="main-bottom">
-                    <div id="main-resize" class="resize-y" r-Type="height" div1="#stage-ledger" div2="#main-bottom" store-id="stage-main" min="100"></div>
+                    <div id="main-resize" class="resize-y" r-Type="height" div1="#stage-ledger" div2="#main-bottom" store-id="stage-main" store-version="1.0.0" min="100"></div>
                     <div class="bc-bar mb-1">
                         <ul class="nav nav-tabs">
                             <li class="nav-item">