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

src/css/abnormal.less

@@ -3,7 +3,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .abnormal {
     ul,li{
@@ -23,8 +23,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -269,7 +268,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/assertType.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .assertType {
     .dayFilter {
@@ -40,8 +40,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         // min-width: 1090px;
         /*width: 100%;*/
     }
@@ -271,7 +270,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/assertTypeDetail.less

@@ -3,7 +3,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .assertTypeDetail {
     
@@ -11,8 +11,7 @@
         margin-bottom: 15px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         // min-width: 1090px;
         /*width: 100%;*/
     }

src/css/common.less

@@ -28,4 +28,11 @@
 }
 input:disabled {
     background-color: @disColor;
+}
+
+.main-body-com{
+    background: #fff;
+    margin: 0;
+    padding: 20px 25px 0;
+    border:10px @disColor solid;
 }

src/css/dayDetail.less

@@ -6,7 +6,7 @@
     overflow: auto;
 }
 .dayDetail {
-    background-color: #fff;
+    background-color: @disColor;
     .dayFilter {
         .levelList {
             height: 80px;
@@ -38,8 +38,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -269,7 +268,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/deptScoreDetail.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .deptScoreDetail {
     .dayFilter {
@@ -37,8 +37,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -268,7 +267,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/deptScoreDetailControl.less

@@ -4,6 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    background: @disColor;
 }
 .deptScoreDetailControl {
     background-color: #fff;
@@ -38,7 +39,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        padding: 20px 35px 0 35px;
+        .main-body-com;
         min-width: 1090px;
         box-sizing: border-box;
         /*width: 100%;*/
@@ -269,7 +270,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/index.less

@@ -108,6 +108,7 @@
     .logo{
       margin-bottom: 44px;
       text-indent: 22px;
+      height: 45px;
       img {
         width: 150px;
         position: relative;
@@ -120,10 +121,15 @@
       right: 0;
       z-index: 1;
     }
-    &>ul>li{
-      text-indent: 42px;
-      background: url("../images/module.png") 16px 12px no-repeat;
-      margin-bottom: 10px;
+    &>ul{
+      overflow-x: hidden;
+      white-space: nowrap;
+      &>li{
+        text-indent: 42px;
+        background: url("../images/module.png") 16px 12px no-repeat;
+        margin-bottom: 10px;
+      }
+
     }
     .YH-KZT,.YH-KZTKS{
       background: url("../images/home.png") 16px 10px no-repeat;
@@ -242,6 +248,13 @@
     height: 100%;
     background: @themeColor;
     position: relative;
+    .logo{
+      height: 50px;
+      line-height: 50px;
+      text-align: center;
+      color: #DEE5EF;
+      margin-bottom: 44px;
+    }
     &>a{
       position: absolute;
       top: 50%;
@@ -254,30 +267,79 @@
       line-height: 40px;
       margin-bottom: 10px;
       background: url("../images/module.png") center no-repeat;
+      position: relative;
+      cursor: pointer;
+      &:hover{
+        ul{
+          display: block;
+        }
+      }
       & ul{
         display: none;
         left: 60px;
         position: absolute;
-        width: 140px;
+        width: 186px;
+        background: @themeColor;
+        border-radius:4px;
+        box-shadow:0px 2px 16px -4px rgba(15,28,59,1);
+        margin-left: 3px;
+        &:before{
+          content: "";
+          display: inline-block;
+          width: 8px;
+          height: 32px;
+          background: url("../images/ar.png") no-repeat;
+          position: absolute;
+          left: -8px;
+        }
+        li{
+          height: 40px;
+          line-height: 40px;
+          color: #A5ADBF;
+          text-indent: 30px;
+          border-radius: 4px;
+          &:hover,&.active{
+            background: @activeBg;
+            color: @activeColor;
+          }
+        }
       }
-      &.YH-KZT{
-        background: url("../images/home.png") 16px 12px no-repeat;
+    }
+
+    .YH-KZT,.YH-KZTKS{
+      background: url("../images/home.png") 20px 10px no-repeat;
+      &:hover,&.active{
+        background: url("../images/home_a.png") @activeBg 20px 10px no-repeat;
       }
-      &.YH-ZKK{
-        background: url("../images/module.png") 16px 12px no-repeat;
+    }
+    .YH-ZKK,.YH-KSZR{
+      background: url("../images/data.png") 21px 10px no-repeat;
+      &:hover,&.active{
+        background: url("../images/data_a.png") @activeBg 21px 10px no-repeat;
       }
-      &.YH-QBYH-JCGN{
-        background: url("../images/item.png") 16px 12px no-repeat;
+    }
+    .YH-JCSJWH{
+      background: url("../images/item.png") 22px 13px no-repeat;
+      &:hover,&.active{
+        background: url("../images/item_a.png") @activeBg 22px 13px no-repeat;
       }
-      &.YH-JCSJWH{
-        background: url("../images/data.png") 16px 10px no-repeat;
+    }
+    .YH-BLZK{
+      background: url("../images/ba.png") 23px 10px no-repeat;
+      &:hover,&.active{
+        background: url("../images/ba_a.png") @activeBg 23px 10px no-repeat;
       }
-      &.YH-BLZK{
-        background: url("../images/un.png") 16px 11px no-repeat;
+    }
+    .YH-QXGL{
+      background: url("../images/qxgl.png") 16px 11px no-repeat;
+      &:hover,&.active{
+        background: url("../images/qxgl_a.png") @activeBg 16px 11px no-repeat;
       }
-      &.active{
-        background-color: #EEF4FF;
-        border-left: 3px @activeColor solid;
+    }
+    .YH-YCSJJK{
+      background: url("../images/un.png") 16px 11px no-repeat;
+      &:hover,&.active,&.list-1-show{
+        background: url("../images/un_a.png") @activeBg 16px 11px no-repeat;
       }
     }
   }

src/css/itemManager.less

@@ -3,6 +3,7 @@
     width: 100%;
     height: 100%;
     overflow-y: auto;
+    background: @disColor;
     .selectUsed,.selectReject {
         float: right;
     }
@@ -15,8 +16,7 @@
         .h2;
     }
     .main-body{
-        margin: 20px 40px;
-        padding-bottom: 0px !important;
+        .main-body-com;
     }
     table{
         .table;
@@ -144,7 +144,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/jiaji.less

@@ -4,6 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    background: @disColor;
 }
 .jiaji {
     .dayFilter {
@@ -40,8 +41,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -271,7 +271,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/login.less

@@ -1,5 +1,6 @@
 @import './reset.less';
 body {
+  background: @themeColor;
   background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
 .login {
@@ -39,6 +40,7 @@ p.title {
   .message {
     width: 38%;
     height: 100%;
+    background: @activeBg;
     background:linear-gradient(180deg,rgba(0,25,82,1) 0%,rgba(0,24,78,0.94) 100%);
     box-sizing: border-box;
     position: relative;

src/css/moduleManager.less

@@ -1,4 +1,7 @@
 @import "./reset.less";
+body{
+    background: @disColor;
+}
 .container{
     width: 100%;
 }
@@ -6,8 +9,8 @@ h2{
     .h2;
 }
 .main-body{
-    margin: 20px 40px;
-    padding-bottom: 40px;
+    .main-body-com;
+    padding-bottom: 20px;
 }
 .totalSumBox{
     margin: 0 0 10px 0;

src/css/mukuai.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow-y: auto;
-    background-color: #fff;
+    background-color: @disColor;
     .filterDropList{
         position: absolute;
         right: 0;
@@ -88,8 +88,7 @@
         letter-spacing: 1px;
     }
     .main-body {
-        margin: 20px 40px;
-        padding-bottom: 40px;
+        .main-body-com;
     }
     table{
         .table;
@@ -209,7 +208,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0;
         text-align: right;
     }
     .totalSum{

src/css/partDetail.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .partDetail {
     .dayFilter {
@@ -40,8 +40,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -271,7 +270,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/partDetailControl.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .partDetailControl {
     .dayFilter {
@@ -40,8 +40,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -271,7 +270,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/payDetail.less

@@ -4,7 +4,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background-color: #fff;
+    background-color: @disColor;
 }
 .payDetail {
     .dayFilter {
@@ -41,8 +41,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        .main-body-com;
         min-width: 1090px;
         /*width: 100%;*/
     }
@@ -272,7 +271,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/css/qcList.less

@@ -3,6 +3,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    background: @disColor;
 }
 ul,li{
     list-style: none;
@@ -12,9 +13,9 @@ h2{
     position: absolute;
 }
 .main-body{
-    margin: 75px 0 0 10px;
+    .main-body-com;
+    margin: 44px 0 0;
     min-width: 1090px;
-    padding: 0 35px;
     // overflow: auto;
 }
 table{
@@ -93,9 +94,26 @@ table{
     border: 1px solid @activeColor;
     color: @activeColor;
 }
-/*.filterBox{
-    margin-bottom: 15px;
-}*/
+.filterBox{
+    position: relative;
+}
+.overAuto{
+    overflow: auto;
+}
+.filter-toggler{
+    position: absolute;
+    left: 960px;
+    top: 8px;
+    color: #aaa;
+    font-size: 14px;
+    background: url("../images/arrow_up.png") 60px center no-repeat;
+    padding-right: 15px;
+    background-size: 10px 6px;
+    &.up{
+        background: url("../images/arrow_down.png") 60px center no-repeat;
+        background-size: 10px 6px;
+    }
+}
 .filterItem{
     position: relative;
     display: inline-block;
@@ -259,7 +277,7 @@ table{
 
 
 .pagination{
-    margin: 35px 0 0 0  ;
+    margin: 35px 0 20px 0  ;
     text-align: right;
 }
 .totalSum{

src/css/qcListDept.less

@@ -3,6 +3,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    background: @disColor;
 }
 ul,li{
     list-style: none;
@@ -12,8 +13,8 @@ h2{
     position: absolute;
 }
 .main-body{
-    margin: 75px 0 0 10px;   
-    padding: 0 35px;
+    .main-body-com;
+    margin: 44px 0 0;
     min-width: 1090px;
     /*width: 100%;*/
 }
@@ -91,9 +92,26 @@ table{
     border: 1px solid @activeColor;
     color: @activeColor;
 }
-/*.filterBox{
-    margin-bottom: 15px;
-}*/
+.filterBox{
+    position: relative;
+}
+.overAuto{
+    overflow: auto;
+}
+.filter-toggler{
+    position: absolute;
+    left: 960px;
+    top: 8px;
+    color: #aaa;
+    font-size: 14px;
+    background: url("../images/arrow_up.png") 60px center no-repeat;
+    padding-right: 15px;
+    background-size: 10px 6px;
+    &.up{
+        background: url("../images/arrow_down.png") 60px center no-repeat;
+        background-size: 10px 6px;
+    }
+}
 .filterItem{
     position: relative;
     display: inline-block;
@@ -259,7 +277,7 @@ table{
 
 
 .pagination{
-    margin: 35px 0 0 0  ;
+    margin: 35px 0 20px 0  ;
     text-align: right;
 }
 .totalSum{

src/css/qcListPerson.less

@@ -3,6 +3,7 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    background: @disColor;
 }
 ul,li{
     list-style: none;
@@ -12,8 +13,8 @@ h2{
     position: absolute;
 }
 .main-body{
-    margin: 75px 0 0 10px;
-    padding: 0 35px;
+    .main-body-com;
+    margin: 44px 0 0;
     min-width: 1090px;
     /*width: 100%;*/
 }
@@ -96,9 +97,26 @@ table{
     border: 1px solid @activeColor;
     color: @activeColor;
 }
-/*.filterBox{
-    margin-bottom: 15px;
-}*/
+.filterBox{
+    position: relative;
+}
+.overAuto{
+    overflow: auto;
+}
+.filter-toggler{
+    position: absolute;
+    left: 960px;
+    top: 8px;
+    color: #aaa;
+    font-size: 14px;
+    background: url("../images/arrow_up.png") 60px center no-repeat;
+    padding-right: 15px;
+    background-size: 10px 6px;
+    &.up{
+        background: url("../images/arrow_down.png") 60px center no-repeat;
+        background-size: 10px 6px;
+    }
+}
 .filterItem{
     position: relative;
     display: inline-block;
@@ -263,7 +281,7 @@ table{
 
 
 .pagination{
-    margin: 35px 0 0 0  ;
+    margin: 35px 0 20px 0  ;
     text-align: right;
 }
 .totalSum{

src/css/qcScore.less

@@ -19,6 +19,7 @@
 }
 .patient-info{
   /*height: 50px;*/
+  background: #fff;
   line-height: 50px;
   border-bottom: 10px #EFF1F6 solid;
   text-align: center;
@@ -41,6 +42,7 @@
   .logo{
     margin:8px 0 44px;
     text-indent: 22px;
+    height: 42px;
   }
   &>a{
     position: absolute;
@@ -48,8 +50,13 @@
     right: 0;
     z-index: 1;
   }
+  &>ul{
+    overflow-x: hidden;
+    white-space: nowrap;
+  }
   &>ul>li{
     color: @fstColor;
+    margin-bottom: 10px;
     &.menu-0{
       background: url("../images/total.png") 20px 9px no-repeat;
       &.active{
@@ -133,7 +140,7 @@
       display: none;
       li.page{
         text-indent: 55px;
-        color: @fstColor;
+        color: @greyColor;
         &.active{
           color: @activeColor;
         }
@@ -162,35 +169,105 @@
 .menu-mini{
   display: none;
   width: 60px;
+  height: 100%;
+  background: @themeColor;
+  position: relative;
+  .logo{
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+    color: #DEE5EF;
+    margin-bottom: 44px;
+  }
+  &>a{
+    position: absolute;
+    top: 50%;
+    right: 0;
+    z-index: 1;
+  }
   &>ul>li{
     width: 100%;
     height: 40px;
     line-height: 40px;
-    background: url("../images/icon3.png") center no-repeat;
+    background: url("../images/module.png") center no-repeat;
+    cursor: pointer;
+    margin-bottom: 10px;
+    &:hover{
+      ul{
+        display: block;
+      }
+    }
     & ul{
       display: none;
       left: 60px;
       position: absolute;
-      width: 140px;
+      width: 186px;
+      background: @themeColor;
+      border-radius:4px;
+      box-shadow:0px 2px 16px -4px rgba(15,28,59,1);
+      margin-left: 3px;
+      z-index: 9;
+      &:before{
+        content: "";
+        display: inline-block;
+        width: 8px;
+        height: 32px;
+        background: url("../images/ar.png") no-repeat;
+        position: absolute;
+        left: -8px;
+      }
+      li{
+        height: 40px;
+        line-height: 40px;
+        color: @greyColor;
+        text-indent: 30px;
+        border-radius: 4px;
+        &:hover,&.active{
+          background: @activeBg;
+          color: @activeColor;
+        }
+      }
     }
-    &.YH-KZT{
-      background: url("../images/icon3.png") center no-repeat;
+    &.menu-0{
+      background: url("../images/total.png") 20px 9px no-repeat;
+      &:hover,&.active{
+        background: url("../images/total_a.png") @activeBg 20px 9px no-repeat;
+      }
+    }
+    &.menu-6{
+      background: url("../images/index.png") 20px 11px no-repeat;
+      &:hover,&.active{
+        background: url("../images/index_a.png") @activeBg 20px 11px no-repeat;
+      }
+    }
+    &.menu-1{
+      background: url("../images/inhis.png") 19px 11px no-repeat;
+      &:hover,&.active{
+        background: url("../images/inhis_a.png") @activeBg 19px 11px no-repeat;
+      }
     }
-    &.YH-QBYH-JCGN{
-      background: url("../images/icon2.png") center no-repeat;
+    &.menu-37{
+      background: url("../images/prod.png") 20px 10px no-repeat;
+      &:hover,&.active{
+        background: url("../images/prod_a.png") @activeBg 20px 10px no-repeat;
+      }
     }
-    &.active{
-      background-color: #EEF4FF;
-      border-left: 3px @activeColor solid;
+    &.menu-5{
+      background: url("../images/out.png") 21px 11px no-repeat;
+      &:hover,&.active{
+        background: url("../images/out_a.png") @activeBg 21px 11px no-repeat;
+      }
     }
   }
 }
 .tab-container{
   margin-left: @menuWt+15px;
+  background: @disColor;
   /*height: 100%;*/
   .content-box{
     width:78%;
     height: 100%;
+    background: #fff;
     position: relative;
     overflow-y: auto;
     border-right: 10px #EFF1F6 solid;
@@ -303,7 +380,7 @@
         box-sizing: border-box;
         padding-left: 5px;
         &.active{
-          background: #FFF0DA;
+          background: #FEE6C4;
         }
         span{
           line-height: 20px;
@@ -349,10 +426,11 @@
     }
   }
   .operation{
-    width:20%;
+    width:calc(22% - 11px);
     height: 100%;
     margin-right: 10px;
     position: relative;
+    background: #fff;
     .flaw-title{
       position: absolute;
       top:0;
@@ -411,7 +489,7 @@
           margin-right: 6px;
         }
         &.active{
-          background: #FFF0DA;
+          background: #FEE6C4;
         }
       }
     }
@@ -575,22 +653,29 @@
 
 /********缺陷总览*********/
 .flaw-table{
+  display: none;
   height: 97%;
-  overflow-y: auto;
-  /*margin: 0 30px 0 20px;*/
+  background: #fff;
+  margin: 0 10px 10px;
+  /*overflow-y: auto;
+  margin: 0 30px 0 20px;*/
   .slide-up{
     cursor: pointer;
     color: @activeColor;
     &:before{
       display: inline-block;
       width: 14px;
-      content: "-";
+      height: 14px;
+      content: "";
       font-size: 18px;
       color: @activeColor;
       text-align: center;
+      vertical-align: middle;
+      margin-right: 4px;
+      background: url("../images/slice.png") no-repeat;
     }
     &.down:before{
-      content: "+";
+      background: url("../images/add.png") no-repeat;
     }
   }
   .page-item{
@@ -643,3 +728,50 @@
     }
   }
 }
+.scroll-table{
+  thead,tbody{
+    display: block;
+    width: 100%;
+    box-sizing: border-box;
+    th,td{
+      width: 49%;
+      display: inline-block;
+      box-sizing: border-box;
+      border: none;
+      line-height: 32px;
+      &:first-child{
+        width: 30%;
+        border-right: 1px @tableBorderColor solid;
+      }
+      &:last-child{
+        width: 20%;
+        border-left: 1px @tableBorderColor solid;
+      }
+    }
+    td[colspan]{
+      border-right: none;
+      border-left: none;
+    }
+  }
+  thead{
+    border-bottom: 1px @tableBorderColor solid;
+    tr{
+      width: calc(100% - 18px);
+      border-bottom:none;
+    }
+  }
+  tbody{
+    overflow-y: auto;
+  }
+  tr{
+    display: block;
+    border-bottom: 1px @tableBorderColor solid;
+    &:last-child{
+      border-bottom: none;
+    }
+  }
+  tr,td[colspan]{
+    width: 100%;
+    box-sizing: border-box;
+  }
+}

src/css/reset.less

@@ -147,8 +147,8 @@ textarea {
   color: @titleColor;
   height: 44px;
   line-height: 44px;
-  /*padding: 0 0 0 15px;*/
-  border-bottom: 10px solid #EFF1F6;
+  /*padding: 0 0 0 15px;
+  border-bottom: 10px solid #EFF1F6;*/
   font-size: 14px;
   text-indent: 20px;
   font-weight: normal;

src/css/roleManager.less

@@ -8,9 +8,10 @@
     background-color: #fff;
 }
 .managerContainer {
-    .main-body {
+    overflow-y: hidden;
+   /* .main-body {
         margin-top: 10px;
-    } 
+    } */
 }
 .pubStyleMeun {
     .roleLis li {
@@ -41,8 +42,8 @@
 .rightMenu {
     position: absolute;
     width: 100%;
-    top: 64px;
-    right: 40px;
+    top: 74px;
+    right: 30px;
     border: 1px solid #ccc;
     // overflow: auto;
     .toptools {

src/css/tiaomu.less

@@ -4,6 +4,7 @@
     width: 100%;
     height: 100%;
     overflow-y: auto;
+    background: @disColor;
     .filterDropList{
         position: absolute;
         right: 0;
@@ -90,8 +91,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 40px;
-        padding-bottom: 0px !important;
+        .main-body-com;
     }
     table{
         .table;
@@ -211,7 +211,7 @@
     
     
     .pagination{
-        margin: 35px 0 0 0  ;
+        margin: 35px 0 20px 0  ;
         text-align: right;
     }
     .totalSum{

src/html/abnormal.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/assertType.html

@@ -17,7 +17,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/assertTypeDetail.html

@@ -14,7 +14,6 @@
             </div>
           </div>
           <div class="partTitleT"></div>
-          <div class="grayLine"></div>     
           <div class="main-body">
             <div class="filterBox clearfix">
                 <!-- <div class="filterItem typeFilter deptListWrap">

src/html/dayDetail.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/deptScoreDetail.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/index.html

@@ -22,17 +22,21 @@
     </li>
 </script>
 <script type="text/html" id="miniMenuTmpl">
+    {{if showStatus}}
     {{if subMenuList.length}}
     <li class="list-1 ${code}">
         {{else}}
     <li class="page ${code}" code="${code}">
         {{/if}}
+        {{if subMenuList.length}}
         <ul>
             {{each subMenuList}}
             <li class="page" code="${code}">${name}</li>
             {{/each}}
         </ul>
+        {{/if}}
     </li>
+    {{/if}}
 </script>
 <body>
   <div class="container">
@@ -41,16 +45,19 @@
               <div class="logo">
                   <img src="../images/lantone.png" alt="">
               </div>
-              <!--<a href="javescript:void(0);" class="slide-hide">
+              <a href="javescript:void(0);" class="slide-hide">
                   <img src="../images/down.png" alt="">
-              </a>-->
+              </a>
               <ul></ul>
               <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
           </div>
           <div class="menu-mini fl">
-              <!--<a href="javescript:void(0);" class="slide-show">
+              <div class="logo">
+                  朗通
+              </div>
+              <a href="javescript:void(0);" class="slide-show">
                   <img src="../images/up.png" alt="">
-              </a>-->
+              </a>
               <ul></ul>
           </div>
           <div class="main" id="mainBox">

src/html/mukuai.html

@@ -22,7 +22,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">

src/html/mukuaiControl.html

@@ -22,7 +22,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">

src/html/partDetail.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/partDetailControl.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/payDetail.html

@@ -21,7 +21,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">

src/html/qcList.html

@@ -13,38 +13,45 @@
     <div class="container">
         <h2>质控评分</h2>
         <div class="main-body">
-            <div class="filterBox clearfix">
-                <span class="filterItem typeFilter">
+            <div class="filterBox">
+                <div class="clearfix">
+                    <span class="filterItem typeFilter">
                     <span>病人住院序号：</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
                 </span>
-                <span class="filterItem typeFilter">
+                    <span class="filterItem typeFilter">
                     <span>病人姓名：</span>
                     <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
                 </span>
-                <span class="filterItem typeFilter deptListWrap">
+                    <span class="filterItem typeFilter deptListWrap">
                     <span>科室：</span>
                     <span class="selectDept">
                         全部
                     </span>
-                   
+
                     <ul class="deptList filterDropList"></ul>
                 </span>
-                <span class="filterItem doctorFilter">
+                    <span class="filter">查询</span>
+                    <span class="export">导出</span>
+                    <span class="filterclear abnormalClear filterclearT">重置</span>
+                </div>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+                <div class="toggle-item clearfix">
+                    <span class="filterItem doctorFilter">
                     <span>医生姓名：</span>
                     <input class="doctorInp" type="text" placeholder="请输入医生姓名">
                 </span>
-                <span class="filterItem doctorFilter">
+                    <span class="filterItem doctorFilter">
                     <span>医生工号：</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                    <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
                 </span>
-                <span class="filterItem">
+                    <span class="filterItem">
                     <span>病历等级：</span>
                     <span class="selectLevel">全部</span>
                     <ul class="levelList filterDropList">
@@ -55,10 +62,7 @@
                         <li class="levelItem" data-name="丙" data-id=丙>丙</li>
                     </ul>
                 </span>
-               
-                <span class="filter">查询</span>
-                <span class="export">导出</span>
-                <span class="filterclear abnormalClear filterclearT">重置</span>
+                </div>
             </div>
             <div class="overAuto">
                 <table>

src/html/qcListDept.html

@@ -13,53 +13,58 @@
     <div class="container">
         <h2>质控评分</h2>
         <div class="main-body">
-            <div class="filterBox clearfix">
-                <span class="filterItem typeFilter">
-                    <span>病人住院序号：</span>
-                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
-                </span>
-                <span class="filterItem typeFilter">
-                    <span>病人姓名：</span>
-                    <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
-                </span>
-                <span class="filterItem typeFilter">
-                    <span>科室：</span>
-                    <span class="selectDept">
-                        全部
+            <div class="filterBox">
+                <div class="clearfix">
+                    <span class="filterItem typeFilter">
+                        <span>病人住院序号：</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
                     </span>
-                   
-                    <ul class="deptList filterDropList"></ul>
-                </span>
-                <span class="filterItem typeFilter">
-                    <span>医生姓名：</span>
-                    <input class="doctorInp" type="text" placeholder="请输入医生姓名">
-                </span>
-                <span class="filterItem doctorFilter">
-                    <span>医生工号：</span>
-                    <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
-                </span>
-                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
-                    <span class="fl">出院日期：</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
-                    <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
-                </span>
-                <span class="filterItem">
-                    <span>病历等级：</span>
-                    <span class="selectLevel">全部</span>
-                    <ul class="levelList filterDropList">
-                        <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
-                        <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
-                        <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
-                        <li class="levelItem" data-name="乙" data-id=乙>乙</li>
-                        <li class="levelItem" data-name="丙" data-id=丙>丙</li>
-                    </ul>
-                </span>
-                <span class="filter">查询</span>
-                <span class="export">导出</span>
-                <span class="filterclear abnormalClear filterclearT">重置</span>
+                    <span class="filterItem typeFilter">
+                        <span>病人姓名：</span>
+                        <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                    </span>
+                    <span class="filterItem typeFilter">
+                        <span>科室：</span>
+                        <span class="selectDept">
+                            全部
+                        </span>
+
+                        <ul class="deptList filterDropList"></ul>
+                    </span>
+                    <span class="filter">查询</span>
+                    <span class="export">导出</span>
+                    <span class="filterclear abnormalClear filterclearT">重置</span>
+                </div>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+                <div class="toggle-item clearfix">
+                    <span class="filterItem typeFilter">
+                        <span>医生姓名：</span>
+                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                    </span>
+                    <span class="filterItem doctorFilter">
+                        <span>医生工号：</span>
+                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                        <span class="fl">出院日期：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
+                    </span>
+                    <span class="filterItem">
+                        <span>病历等级：</span>
+                        <span class="selectLevel">全部</span>
+                        <ul class="levelList filterDropList">
+                            <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
+                            <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
+                            <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
+                            <li class="levelItem" data-name="乙" data-id=乙>乙</li>
+                            <li class="levelItem" data-name="丙" data-id=丙>丙</li>
+                        </ul>
+                    </span>
+                </div>
             </div>
-            <div>
+            <div class="overAuto">
                 <table>
                     <thead>
                         <tr>

src/html/qcListPerson.html

@@ -13,7 +13,8 @@
     <div class="container">
         <h2>质控评分</h2>
         <div class="main-body">
-            <div class="filterBox clearfix">
+            <div class="filterBox">
+                <div class="clearfix">
                 <span class="filterItem typeFilter">
                     <span>病人住院序号：</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
@@ -30,6 +31,11 @@
                    
                     <ul class="deptList filterDropList"></ul>
                 </span>
+                <span class="filter">查询</span>
+                <span class="filterclear abnormalClear filterclearT">重置</span>
+            </div>
+            <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
+            <div class="toggle-item clearfix">
                 <span class="filterItem doctorFilter">
                     <span>医生：</span>
                     <span class="selectDoctor"> 
@@ -55,11 +61,9 @@
                         <li class="levelItem" data-name="丙" data-id=丙>丙</li>
                     </ul>
                 </span>
-                <span class="filter">查询</span>
-                <!-- <span class="reset">重置</span> -->
-                <span class="filterclear abnormalClear filterclearT">重置</span>
             </div>
-            <div>
+            </div>
+            <div class="overAuto">
                 <table>
                     <thead>
                         <tr>

src/html/qcScore.html

@@ -21,15 +21,17 @@
     </script>
     <script type="text/html" id="miniMenuTmpl">
         {{if sonMode.length}}
-        <li class="list-1 ${code}">
+        <li class="list-1  menu-${id}">
             {{else}}
-        <li class="page ${code}" code="${name}">
+        <li class="page  menu-${id}" code="${name}">
             {{/if}}
+            {{if sonMode.length}}
             <ul>
                 {{each sonMode}}
                 <li class="page" code="${name.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')}">${name}</li>
                 {{/each}}
             </ul>
+            {{/if}}
         </li>
     </script>
     <script type="text/html" id="infoTmpl">
@@ -50,7 +52,7 @@
                          <tr>
                              <th>出院诊断</th>
                              <th>疾病编码</th>
-                             <th>入院病情</th>
+                             <th>出院病情</th>
                          </tr>
                          {{each(i,v) data}}
                          {{if i<(data.length/2)}}
@@ -68,7 +70,7 @@
                          <tr>
                              <th>出院诊断</th>
                              <th>疾病编码</th>
-                             <th>入院病情</th>
+                             <th>出院病情</th>
                          </tr>
                          {{each(i,v) data}}
                          {{if i>=(data.length/2)}}
@@ -89,7 +91,7 @@
                      </table>
                  </td>
              </tr>
-             <tr><td colspan="2" class="table-tip">入院病情：1.有，2.临床未确定，3.情况不明，4.无。</td></tr>
+             <tr><td colspan="2" class="table-tip">出院病情：1、"治愈"  2、"好转"  3、"未愈"  4、"死亡"  9、"其它"</td></tr>
          </table>
          {{else}}
              <table>
@@ -159,7 +161,7 @@
             <p><span>质控条目: </span><input disabled type="text" class="ellipsis" title="${standardMsg}" value="${standardMsg}" /></p>
             <!--<p><span>模块名称: </span><input type="text" value="${modelName}" /></p>-->
             <p><span>提示信息: </span><input id="qcMsg" class="ellipsis" type="text" title="${msg}" value="${msg}" /></p>
-            <p><span>分值: </span> <input id="qcScore" type="text" value="${score}" /></p>
+            <p><span style="margin-right: 8px">分值: </span> <input id="qcScore" type="text" value="${score}" /></p>
             <p class="warning"><span></span><span class="red">支持≥0的数字输入，最多保留小数点后1位~</span></p>
         </div>
     </script>
@@ -225,7 +227,7 @@
             </div>
             {{else}}
             {{if title==='缺陷总览'}}
-            <table>
+            <table class="scroll-table">
                 <thead>
                 <tr>
                     <th width="250">来源</th>
@@ -273,16 +275,19 @@
             <div class="logo">
                 <img src="../images/lantone.png" alt="" style="width: 150px;">
             </div>
-            <!--<a href="javescript:void(0);" class="slide-show">
-                <img src="../images/up.png" alt="">
-            </a>-->
+            <a href="javescript:void(0);" class="slide-show">
+                <img src="../images/down.png" alt="">
+            </a>
             <ul id="subMenu"></ul>
             <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
         </div>
         <div class="menu-mini fl">
-           <!-- <a href="javescript:void(0);" class="slide-show">
-                <img src="../images/down.png" alt="">
-            </a>-->
+            <div class="logo">
+                朗通
+            </div>
+            <a href="javescript:void(0);" class="slide-hide">
+                <img src="../images/up.png" alt="">
+            </a>
             <ul></ul>
         </div>
         <div class="tab-container clearfix">

src/html/tiaomuControl.html

@@ -22,7 +22,6 @@
           </div>
         </div>
         <div class="partTitleT"></div>
-        <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">

src/js/index.js

@@ -63,15 +63,15 @@ function initMenu(data,userInfo){
     $(".container").addClass("console-cont");
   }
   //菜单收起展开
-  $(".list-1").on("click",function(){
+  $(".menu .list-1").on("click",function(){
     if($(this).is(".list-1-show")){
       $(this).removeClass("list-1-show")
       $(this).find("ul").slideToggle();
       return;
     }
 
-    $(".list-1-show ul").slideUp();
-    $(".list-1").removeClass("list-1-show");
+    $(".menu .list-1-show ul").slideUp();
+    $(".menu .list-1").removeClass("list-1-show");
     const ulShow =  $(this).find("ul").css("display")
     if(ulShow == "none"){
       $(this).addClass("list-1-show")
@@ -80,11 +80,12 @@ function initMenu(data,userInfo){
   });
 //收起菜单
   $(".slide-hide").click(function(){
-    $(".menu").animate({"width":"45px"},function(){
+
+    $(".menu").animate({"width":"60px"},function(){
       $(this).hide();
       $(".menu-mini").show();
     });
-    $(".main").animate({"margin-left":"45px"});
+    $(".main").animate({"margin-left":"60px"});
   });
   //展开菜单
   $(".slide-show").click(function(){
@@ -94,15 +95,16 @@ function initMenu(data,userInfo){
     $(".main").animate({"margin-left":"205px"});
   });
 
-  $(".list-1 li").on("click",function(e){
+  $(".menu .list-1 li").on("click",function(e){
     e.stopPropagation();
   });
   //右侧页面切换
   $(".page").on("click",function(){
-    $(".menu .active").removeClass('active');
-    $(this).addClass("active");
-    $(this).parents(".list-1-show").addClass("active");
-    const code = $(this).attr("code");
+    $(".menu .active,.menu-mini .active").removeClass('active');
+    const code=$(this).attr("code");
+    const mItems = $(".menu .page[code="+code+"],.menu-mini .page[code="+code+"]");
+    mItems.addClass("active");
+    mItems.parents(".list-1").addClass("active");
     let url = './'+pageMap[code];
     if(code === 'YH-BLZK-ZKPFGR'){
       url += `?doctorName=${userInfo.linkman}`

src/js/qcList.js

@@ -61,9 +61,12 @@ $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
-// $(".abnormalClear").click(function(){
-//     window.location.reload()
-// })
+
+$("#filterToggler").click(function(){
+    const text = $(this).text();
+    $(".toggle-item").slideToggle();
+    $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
+});
 //判断有无某一权限
   function hasData(data){
     let trdObj = JSON.parse(getCookie("trdObj"))

src/js/qcListDept.js

@@ -27,9 +27,12 @@ let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=["leave_hospital_date"],data_asc=[];
-//   $(".abnormalClear").click(function(){
-//     window.location.reload()
-// })
+
+$("#filterToggler").click(function(){
+  const text = $(this).text();
+  $(".toggle-item").slideToggle();
+  $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
+});
 
 console.log('docName',docName)
 if(chengdu){

src/js/qcListPerson.js

@@ -18,9 +18,12 @@ let doctorName_global = getUrlArgObject("doctorName")
 
 // console.log('doctorName_global',doctorName_global)
 $('.selectDoctor').html(doctorName_global)
-// $(".abnormalClear").click(function(){
-//     window.location.reload()
-// })
+
+$("#filterToggler").click(function(){
+  const text = $(this).text();
+  $(".toggle-item").slideToggle();
+  $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
+});
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 

src/js/qcScore.js

@@ -26,28 +26,28 @@ function initMenu(data){
   $("#subMenuTmpl").tmpl(menu).appendTo("#subMenu");
   $("#miniMenuTmpl").tmpl(menu).appendTo(".menu-mini ul");
   //菜单收起展开
-  $(".list-1").on("click",function(){
-    $(".list-1 .slide-up").removeClass('slide-up');
+  $(".sub-menu .list-1").on("click",function(){
+    $(".sub-menu .list-1 .slide-up").removeClass('slide-up');
     $(this).toggleClass('slide-up');
     $(this).find("ul").slideToggle();
   });
-  $(".list-1 li").on("click",function(e){
+  $(".sub-menu .list-1 li").on("click",function(e){
     e.stopPropagation();
   });
 //收起菜单
-  $(".slide-hide").click(function(){
-    $(".sub-menu").animate({"width":"45px"},function(){
+  $(".slide-show").click(function(){
+    $(".sub-menu").animate({"width":"60px"},function(){
       $(this).hide();
       $(".menu-mini").show();
     });
-    $(".tab-container").animate({"margin-left":"45px"});
+    $(".tab-container").animate({"margin-left":"60px"});
   });
   //展开菜单
-  $(".slide-show").click(function(){
+  $(".slide-hide").click(function(){
     $(".menu-mini").hide();
-    $(".sub-menu").show().animate({"width":"205px"},function(){
+    $(".sub-menu").show().animate({"width":"220px"},function(){
     });
-    $(".tab-container").animate({"margin-left":"205px"});
+    $(".tab-container").animate({"margin-left":"220px"});
   });
   //右侧内容切换
   $(".page").on("click",function(){
@@ -60,9 +60,10 @@ function initMenu(data){
     }
 
     //选中样式
-    $(".sub-menu .active").removeClass('active');
-    $(this).parents(".list-1").addClass("active");
-    $(this).addClass("active");
+    $(".sub-menu .active,.menu-mini .active").removeClass('active');
+    const mItems = $(".sub-menu .page[code="+title+"],.menu-mini .page[code="+title+"]");
+    mItems.addClass("active");
+    mItems.parents(".list-1").addClass("active");
     //显示对应内容
     const code=$(this).attr("code");
     global_activeTab=code;
@@ -93,7 +94,7 @@ function getRecordDetail(){
       const {beHospital,result,msg} = data;
       const info=Object.assign(beHospital,result);
       initMenu(JSON.parse(result.menuData));
-      $(".sub-menu>ul>li:first-child.page").addClass("active");
+      $(".sub-menu>ul>li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
      global_activeTab=$(".sub-menu .page.active").attr("code");
       initPatientInfo(info);
       initContent(result.pageData);
@@ -168,6 +169,7 @@ function formatInfoData(k,data){
 function initList(data){
   //$("#flawTotalList").tmpl({title:"缺陷总览",data:data}).appendTo(".flaw-table");
   formatSpecPage(data,"缺陷总览");
+  $(".flaw-table").show();
   $(".flaw-table .page-item[code="+global_activeTab+"]").show();
   $(".slide-up").off("click").on("click",function(){
     const name = $(this).text();

src/js/utils.js

@@ -247,8 +247,10 @@ $(".modal .close").click(function(){
 //计算容器高度
 function setBoxHeight(){
   const ht=window.innerHeight;
-  $(".content-box,.flaw-table").height((ht-55)+'px');
+  $(".content-box").height((ht-55)+'px');
+  $(".flaw-table").height((ht-70)+'px');
   $(".content-ht").height((ht-120)+"px");
+  $(".scroll-table tbody").css("max-height",(ht-200)+"px")
 }
 setBoxHeight();
 $(window).resize(function(){