瀏覽代碼

Merge remote-tracking branch 'origin/version1.3.3' into test

zhouna 5 年之前
父節點
當前提交
a21e243e28
共有 3 個文件被更改,包括 11 次插入8 次删除
  1. 5 3
      src/css/index.less
  2. 6 4
      src/css/qcScore.less
  3. 0 1
      src/js/utils.js

+ 5 - 3
src/css/index.less

@@ -101,7 +101,7 @@
     background: @themeColor;
     border-right: 1px @darkLightBorderColor solid;
     box-sizing: border-box;
-    overflow-y: auto;
+    overflow: hidden;
     padding-top: 5px;
     position: relative;
     padding-bottom: 50px;
@@ -123,7 +123,9 @@
     }
     &>ul{
       overflow-x: hidden;
+      overflow-y: auto;
       white-space: nowrap;
+      height: calc(100% - 90px);
       &>li{
         text-indent: 42px;
         background: url("../images/module.png") 16px 12px no-repeat;
@@ -227,8 +229,8 @@
       color: @fstColor;
     }
     .copy-right{
-      position: fixed;
-      bottom: 0px;
+      /*position: fixed;
+      bottom: 0px;*/
       width: @menuWt+(-1px);
       text-align: center;
       height: 50px;

+ 6 - 4
src/css/qcScore.less

@@ -36,8 +36,8 @@
   width: @menuWt+15px;
   height: 100%;
   float: left;
-  overflow-y: auto;
-  overflow-x: hidden;
+  /*overflow-y: auto;*/
+  overflow: hidden;
   background: @themeColor;
   border-right: 1px @frameBdColor solid;
   .logo{
@@ -53,7 +53,9 @@
   }
   &>ul{
     overflow-x: hidden;
+    overflow-y: auto;
     white-space: nowrap;
+    height:calc(100% - 140px);
   }
   &>ul>li{
     color: @fstColor;
@@ -154,8 +156,8 @@
     cursor: pointer;
   }
   .copy-right{
-    position: fixed;
-    bottom: 0px;
+    /*position: fixed;
+    bottom: 0px;*/
     width: @menuWt+15;
     text-align: center;
     background: @themeColor;

+ 0 - 1
src/js/utils.js

@@ -35,7 +35,6 @@ const pageMap={
   "YH-KSZR-BASYHGLZB_XQ":'partDetail.html',
 
   "YH-JCSJWH-ZKLXWH":'assertType.html',
-  "YH-ZKK-TMQXZB_XQ":'singleVeto.html?from=1',
 };
 
 //重写assign方法