Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/test'

zhouna 5 gadi atpakaļ
vecāks
revīzija
c372054957
69 mainītis faili ar 798 papildinājumiem un 602 dzēšanām
  1. 0 3
      src/css/abnormal.less
  2. 57 11
      src/css/console.less
  3. 2 17
      src/css/dayDetail.less
  4. 52 30
      src/css/deptConsole.less
  5. 2 17
      src/css/deptScoreDetail.less
  6. 3 18
      src/css/deptScoreDetailControl.less
  7. 38 34
      src/css/index.less
  8. 5 25
      src/css/itemManager.less
  9. 2 17
      src/css/jiaji.less
  10. 13 4
      src/css/login.less
  11. 2 19
      src/css/moduleManager.less
  12. 2 22
      src/css/mukuai.less
  13. 2 17
      src/css/partDetail.less
  14. 2 17
      src/css/partDetailControl.less
  15. 2 17
      src/css/payDetail.less
  16. 9 20
      src/css/qcList.less
  17. 8 20
      src/css/qcListDept.less
  18. 7 19
      src/css/qcListPerson.less
  19. 43 7
      src/css/qcScore.less
  20. 1 0
      src/css/quexianDetail.less
  21. 1 0
      src/css/quexianDetailControl.less
  22. 1 1
      src/css/quexianXQ.less
  23. 67 5
      src/css/reset.less
  24. 2 22
      src/css/tiaomu.less
  25. 10 9
      src/html/console.html
  26. 7 16
      src/html/deptConsole.html
  27. 1 1
      src/html/deptScoreDetail.html
  28. 1 1
      src/html/index.html
  29. 5 3
      src/html/itemManager.html
  30. 1 0
      src/html/login.html
  31. 2 2
      src/html/mukuai.html
  32. 2 3
      src/html/partDetail.html
  33. 0 1
      src/html/partDetailControl.html
  34. 7 6
      src/html/qcList.html
  35. 6 5
      src/html/qcListDept.html
  36. 6 5
      src/html/qcListPerson.html
  37. 3 3
      src/html/qcScore.html
  38. 2 2
      src/html/tiaomu.html
  39. BIN
      src/images/arrow_down11.png
  40. BIN
      src/images/btn_open.png
  41. BIN
      src/images/details.png
  42. BIN
      src/images/empty.png
  43. BIN
      src/images/icon_check.png
  44. BIN
      src/images/下收起_深色背景@2x.png
  45. 1 1
      src/js/abnormal.js
  46. 38 27
      src/js/console.js
  47. 11 5
      src/js/dayDetail.js
  48. 36 30
      src/js/deptConsole.js
  49. 16 6
      src/js/deptScoreDetail.js
  50. 9 3
      src/js/deptScoreDetailControl.js
  51. 14 12
      src/js/index.js
  52. 1 0
      src/js/itemManager.js
  53. 8 2
      src/js/jiaji.js
  54. 28 5
      src/js/mukuai.js
  55. 18 3
      src/js/mukuaiControl.js
  56. 29 14
      src/js/partDetail.js
  57. 12 10
      src/js/partDetailControl.js
  58. 14 9
      src/js/payDetail.js
  59. 14 11
      src/js/qcList.js
  60. 14 12
      src/js/qcListDept.js
  61. 14 11
      src/js/qcListPerson.js
  62. 2 0
      src/js/qcScore.js
  63. 50 5
      src/js/quexianDetail.js
  64. 31 1
      src/js/quexianDetailControl.js
  65. 4 1
      src/js/quexianXQ.js
  66. 31 7
      src/js/tiaomu.js
  67. 8 2
      src/js/tiaomuControl.js
  68. 4 1
      src/js/userManager.js
  69. 15 5
      src/js/utils.js

+ 0 - 3
src/css/abnormal.less

@@ -357,6 +357,3 @@
         -moz-appearance: textfield;
     }
 }
-.abnormalClear {
-    top: 2px !important;
-}

+ 57 - 11
src/css/console.less

@@ -2,6 +2,7 @@
 
 body.console {
   overflow: auto;
+  overflow-y: hidden;
   background: @activeBg;
 }
 .echarts {
@@ -26,11 +27,13 @@ body.console {
   background-color: #fff;
 }
 .partWrap {
-  // overflow: auto;
+  overflow: auto;
   height: auto;
   background: @activeBg;
   min-width: 1185px;
   padding: 10px;
+  padding-bottom: 0px;
+  box-sizing: border-box;
   ul {
     padding: 0 40px;
   }
@@ -73,13 +76,26 @@ body.console {
     font-size: 16px;
     font-weight: bold;
     color: @themeFontClr;
+    opacity: .9;
     border-bottom: 1px solid @themeBorderClr;
     height: 40px;
     line-height: 40px;
     padding-left: 15px;
     cursor: pointer;
+    img {
+      width: 16px;
+      position: relative;
+      top: 3px;
+      left: 7px;
+    }
   }
 }
+.detailGo {
+  width: 16px;
+  position: relative;
+  top: 3px;
+  left: 7px;
+}
 .swiperWrap {
   width: 300px;
   border: 1px solid #ccc;
@@ -110,14 +126,17 @@ body.console {
     display: inline-block;
     font-size: 16px;
     color: @themeFontClr;
+    opacity: .9;
     span {
       font-size: 16px;
       color: #fff;
+      opacity: .9;
     }
   }
   .dateDetail {
     font-size: 12px;
     color: @themeFontClr;
+    opacity: .6;
     margin-right: 30px;
     font-weight: normal;
   }
@@ -142,9 +161,11 @@ body.console {
     .year {
       background-color: #00A1FF;
       color: #fff;
+      opacity: .9;
     }
     .mon {
       color: @themeFontClr;
+      opacity: .6;
     }
   }
 }
@@ -164,7 +185,6 @@ body.console {
 .pubEchartB {
   width: 55%;
   display: inline-block;
-  margin-bottom: 10px;
   background-color: #fff;
   border-top: 10px solid @activeBg;
   border-left: 10px solid @activeBg;
@@ -206,8 +226,9 @@ body.console {
   right: 0;
   padding-right: 30px;
   box-sizing: border-box;
-  max-height: 180px;
-  overflow: hidden;
+  height: 180px;
+  overflow: auto;
+  margin-top: -90px;
   table {
     width: 100%;
   }
@@ -233,6 +254,7 @@ body.console {
         text-overflow: ellipsis;
         white-space: nowrap;
         color: @themeFontClr;
+        opacity: .6;
       }
       .smp {
         width: 100px;
@@ -240,6 +262,7 @@ body.console {
     }
     .deptNum {
       color: @themeFontClr;
+      opacity: .6;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -248,6 +271,7 @@ body.console {
     }
     .percent {
       color: @themeFontClr;
+      opacity: .6;
       width: 40px;
     }
   }
@@ -260,13 +284,14 @@ body.console {
   border-right: 10px solid @activeBg;
   box-sizing: border-box;
   ul {
-    padding: 28px 20px;
+    padding: 15px 20px;
     border-bottom: 10px solid @activeBg;
     /*background: @themeColor;*/
     li {
       float: left;
       width: 33.33%;
       color: #fff;
+      opacity: .9;
       border-left: 3px solid #F2637B;
       height: 72px;
       box-sizing: border-box;
@@ -282,15 +307,18 @@ body.console {
   
   .defect {
     /*background-color: @themeColor;*/
-    height: 385px;
+    height: 410px;
     overflow: hidden;
+    .partTitlePub{
+      opacity: .9;
+    }
     .list {
-      padding: 13px 5px;
+      padding: 6px 5px;
       width: 100%;
       box-sizing: border-box;
       overflow-y: auto;
       overflow-x: hidden;
-      height: 405px;
+      height: 410px;
     }
     /*.thead {
       td {
@@ -301,12 +329,14 @@ body.console {
       width: 100%;
       overflow: auto;
       .thead{
-        background: #142753;
+        background: #192D5B;
+        padding: 1px 0;
       }
     }
     td {
-      padding: 8px 10px;
+      padding: 7px 10px;
       color: @themeFontClr;
+      opacity: .9;
       i {
         width: 17px;
         height: 17px;
@@ -314,6 +344,7 @@ body.console {
         border-radius: 8px;
         background-color: #526186;
         color: #fff;
+        opacity: .9;
         display: inline-block;
         text-align: center;
         font-size: 12px;
@@ -331,6 +362,7 @@ body.console {
     .td02name {
       min-width: 113px;
       color: @themeFontClr;
+      opacity: .9;
     }
     .td02 {
     }
@@ -349,6 +381,7 @@ body.console {
   background-color: @themeColor;
   .bingli {
     padding: 10px 20px;
+    cursor: pointer;
     li {
       float: left;
       width: 23%;
@@ -366,12 +399,18 @@ body.console {
     padding: 15px 30px;
     height: 168px;
     box-sizing: border-box;
+    cursor: pointer;
     p {
       text-align: center;
       color: @themeFontClr;
+      opacity: .9;
       font-weight: bold;
       font-size: 16px;
       padding-bottom: 5px;
+      cursor: pointer;
+      img {
+        top: 1px;
+      }
     }
   }
   .panPartPub {
@@ -383,6 +422,7 @@ body.console {
       text-align: center;
       font-size: 12px;
       color: @themeFontClr;
+      opacity: .6;
       font-weight: normal;
       width: 78px;
       position: absolute;
@@ -413,6 +453,7 @@ body.console {
     // width: 100%;
     padding-left: 15px;
     background: @themeColor;
+    box-sizing: border-box;
   }
 }
 
@@ -429,6 +470,7 @@ body.console {
   cursor: pointer;
   span{
     color: @themeFontClr;
+    opacity: .9;
   }
   .name {
     float: left;
@@ -437,6 +479,7 @@ body.console {
   .personNum {
     float: right;
     color: @themeFontClr;
+    opacity: .9;
   }
 }
 
@@ -447,10 +490,12 @@ body.console {
   line-height: 40px;
   font-weight: bold;
   color: @themeFontClr;
+  opacity: .9;
 }
 .explainNum {
   margin-top: 8px;
   color: @themeFontClr;
+  opacity: .6;
 }
 
 .toggleSlide {
@@ -462,7 +507,7 @@ body.console {
     width: 100px;
     height: 26px;
     line-height: 28px;
-    border: 1px solid #E2E5EF;
+    border: 1px solid #506597;
     padding-right: 20px;
     padding-left: 10px;
     position: relative;
@@ -470,6 +515,7 @@ body.console {
     border-radius: 4px;
     span{
       color: @themeFontClr;
+      opacity: .9;
     }
     img {
       width: 10px;

+ 2 - 17
src/css/dayDetail.less

@@ -39,30 +39,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -84,8 +71,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 52 - 30
src/css/deptConsole.less

@@ -2,7 +2,7 @@
 
 body.console {
   overflow: auto;
-  background-color: #f5f5f5;
+  background-color: @themeColor;
 }
 .echarts {
   width: 100%;
@@ -28,7 +28,7 @@ body.console {
 .partWrap {
   // overflow: auto;
   height: auto;
-  background: #f5f5f5;
+  background: @themeBorderClr;
   min-width: 1080px;
   ul {
     padding: 0 40px;
@@ -71,7 +71,7 @@ body.console {
   .title {
     font-size: 16px;
     font-weight: bold;
-    border-bottom: 1px solid #E2E5EF;
+    border-bottom: 1px solid @themeBorderClr;
     height: 36px;
     line-height: 36px;
     padding-left: 15px;
@@ -83,7 +83,7 @@ body.console {
 }
 .grayLine {
   height: 10px;
-  background-color: #f5f5f5;
+  background-color: @themeBorderClr;
 }
 .partTitleT {
   height: 44px;
@@ -95,7 +95,7 @@ body.console {
   width: 100%;
   min-width: 1080px;
   box-sizing: border-box;
-  background-color: #fff;
+  background-color: @themeColor;
   z-index: 20;
   height: 44px;
   line-height: 44px;
@@ -106,13 +106,15 @@ body.console {
   p {
     display: inline-block;
     font-size: 16px;
+    color: #fff;
     span,i {
+      color: #fff;
       font-size: 16px;
     }
   }
   .dateDetail {
     font-size: 12px;
-    color: #777777;
+    color: #fff;
     margin-right: 30px;
     font-weight: normal;
   }
@@ -139,7 +141,7 @@ body.console {
       color: #fff;
     }
     .mon {
-      color: @activeColor;
+      color: #fff;
     }
   }
 }
@@ -154,15 +156,15 @@ body.console {
   display: inline-block;
   margin-bottom: 10px;
   background-color: #fff;
-  border-top: 10px solid #f5f5f5;
+  border-top: 10px solid @themeBorderClr;
 }
 .pubEchartB {
   width: 55%;
   display: inline-block;
   margin-bottom: 10px;
   background-color: #fff;
-  border-top: 10px solid #f5f5f5;
-  border-left: 10px solid #f5f5f5;
+  border-top: 10px solid @themeBorderClr;
+  border-left: 10px solid @themeBorderClr;
   box-sizing: border-box;
 }
 .paymoney {
@@ -176,7 +178,7 @@ body.console {
   height: 304px;
   width: 100%;
   display: inline-block;
-  background-color: #fff;
+  background-color: @themeColor;
   box-sizing: border-box;
   position: relative;
 }
@@ -184,12 +186,13 @@ body.console {
   height: 350px;
   width: 100%;
   display: inline-block;
-  background-color: #fff;
+  background-color: @themeColor;
   box-sizing: border-box;
-  border-top: 10px solid #f5f5f5;
+  border-top: 10px solid @themeBorderClr;
   position: relative;
   .title {
     cursor: pointer;
+    color: #fff;
   }
 }
 .btmWrap {
@@ -224,19 +227,20 @@ body.console {
       margin-right: 10px;
     }
     .deptName {
-      color: #777;
+      color: #fff;
       p {
         width: 110px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
+        color: #fff;
       }
       .smp {
         width: 100px;
       }
     }
     .deptNum {
-      color: #333;
+      color: #fff;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -244,7 +248,7 @@ body.console {
       text-align: right;
     }
     .percent {
-      color: #777;
+      color: #fff;
       width: 40px;
     }
   }
@@ -253,17 +257,24 @@ body.console {
   width: 220px;
 }
 
+.detailGo {
+  width: 16px;
+  position: relative;
+  top: 3px;
+  left: 7px;
+}
 .part01 {
   width: 38%;
-  background-color: #fff;
-  border-right: 10px solid #f5f5f5;
+  background-color: @themeColor;
+  border-right: 10px solid @themeBorderClr;
   box-sizing: border-box;
   ul {
     padding: 40px 20px;
-    border-bottom: 10px solid #f5f5f5;
+    border-bottom: 10px solid @themeBorderClr;
     li {
       width: 50%;
       float: left;
+      color: #fff;
     }
     .lis {
       border-left: 3px solid #F2637B;
@@ -272,18 +283,16 @@ body.console {
       padding-left: 12px;
       margin-left: 60px;
       &.li02 {
-        border-left: 3px solid #37CBCB;
-      }
-      &.li03 {
         border-left: 3px solid #FAD336;
       }
     }
   }
   
   .defect {
-    background-color: #fff;
+    background-color: @themeColor;
     height: 452px;
     overflow: hidden;
+    border-bottom: 10px solid @themeBorderClr;
     .list {
       padding: 15px 5px;
       width: 100%;
@@ -293,7 +302,7 @@ body.console {
     }
     .thead {
       td {
-        color: #51649C;
+        color: #fff;
       }
     }
     .qtable {
@@ -302,6 +311,7 @@ body.console {
     }
     td {
       padding: 7px 10px;
+      color: #fff;
       i {
         width: 17px;
         height: 17px;
@@ -315,7 +325,7 @@ body.console {
       }
     }
     tr {
-      border-bottom: 1px solid #f5f5f5;
+      border-bottom: 1px solid @themeBorderClr;
       box-sizing: border-box;
     }
     .td01 {
@@ -336,14 +346,15 @@ body.console {
   // border-right: 10px solid #f5f5f5;
   box-sizing: border-box;
   width: 62%;
-  background-color: #fff;
+  background-color: @themeColor;
   .bingli {
     padding: 20px;
+    cursor: pointer;
     li {
       float: left;
       width: 23%;
       text-align: center;
-      border-right: 1px solid #E2E5EF;
+      border-right: 1px solid @themeBorderClr;
     }
     .fst {
       // border-right: 1px solid #E2E5EF;
@@ -355,14 +366,20 @@ body.console {
     }
   }
   .bingliLis {
-    border-top: 1px solid #E2E5EF;
+    border-top: 1px solid @themeBorderClr;
     padding: 20px 30px;
+    cursor: pointer;
     p {
       text-align: center;
       font-weight: bold;
       font-size: 16px;
       padding-bottom: 2px;
       margin-bottom: 10px;
+      cursor: pointer;
+      color: #fff;
+      img {
+        top: 1px;
+      }
     }
   }
   .panPartPub {
@@ -395,17 +412,20 @@ body.console {
   line-height: 44px;
   padding: 0 15px;
   box-sizing: border-box;
-  border-bottom: 1px solid #E2E5EF;
+  border-bottom: 1px solid @themeBorderClr;
   font-weight: bold;
   font-size: 16px;
+  color: #fff;
   cursor: pointer;
   .name {
     float: left;
     font-size: 16px;
+    color: #fff;
   }
   .personNum {
     float: right;
     color: #51649C;
+    color: #fff;
   }
 }
 
@@ -415,9 +435,11 @@ body.console {
   height: 36px;
   line-height: 40px;
   font-weight: bold;
+  color: #fff;
 }
 .explainNum {
   margin-top: 8px;
+  color: #fff;
 }
 
 .toggleSlide {
@@ -481,7 +503,7 @@ body.console {
   position: relative;
   .homePage {
     width: 45%;
-    border-right: 10px solid #f5f5f5;
+    border-right: 10px solid @themeBorderClr;
     box-sizing: border-box;
   }
   .homePageNo {

+ 2 - 17
src/css/deptScoreDetail.less

@@ -38,30 +38,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -83,8 +70,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 3 - 18
src/css/deptScoreDetailControl.less

@@ -37,31 +37,18 @@
         letter-spacing: 1px;
     }
     .main-body{
-        margin: 20px 0;
-        padding: 0 35px;
+        padding: 20px 35px 50px 35px;
         min-width: 1090px;
+        box-sizing: border-box;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -83,8 +70,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 38 - 34
src/css/index.less

@@ -99,6 +99,8 @@
     width: @menuWt;
     height: 100%;
     background: @themeColor;
+    border-right: 1px @themeBorderClr solid;
+    box-sizing: border-box;
     overflow-y: auto;
     padding-top: 15px;
     position: relative;
@@ -113,58 +115,44 @@
       z-index: 1;
     }
     &>ul>li{
-      padding-left: 28px;
+      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;
       &.active{
-        background: url("../images/home_a.png") 16px 10px no-repeat;
+        background: url("../images/home_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-ZKK,.YH-KSZR{
       background: url("../images/data.png") 16px 10px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/data_a.png") 16px 10px no-repeat;
+      &.active{
+        background: url("../images/data_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-JCSJWH{
       background: url("../images/item.png") 16px 13px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/item_a.png") 16px 13px no-repeat;
+      &.active{
+        background: url("../images/item_a.png") @activeBg 16px 13px no-repeat;
       }
     }
     .YH-BLZK{
       background: url("../images/ba.png") 16px 10px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/ba_a.png") 16px 10px no-repeat;
+      &.active{
+        background: url("../images/ba_a.png") @activeBg 16px 10px no-repeat;
       }
     }
     .YH-QXGL{
       background: url("../images/qxgl.png") 16px 11px no-repeat;
-      &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/qxgl_a.png") 16px 11px no-repeat;
+      &.active{
+        background: url("../images/qxgl_a.png") @activeBg 16px 11px no-repeat;
       }
     }
     .YH-YCSJJK{
       background: url("../images/un.png") 16px 11px no-repeat;
       &.active,&.list-1-show{
-        p{
-          color: @activeColor;
-        }
-        background: url("../images/un_a.png") 16px 11px no-repeat;
+        background: url("../images/un_a.png") @activeBg 16px 11px no-repeat;
       }
     }
     .slide-btn{
@@ -192,6 +180,7 @@
       }
       p{
         color: #fff;
+        opacity: .9;
       }
       p:hover {
         color: @activeColor;
@@ -203,10 +192,12 @@
       ul{
         display: none;
         li.page{
-          text-indent: 24px;
+          text-indent: 52px;
           color: #fff;
+          opacity: .6;
           &.active{
             color: @activeColor;
+            opacity: 1;
           }
         }
       }
@@ -214,7 +205,8 @@
     .list-1-show{
       background-color: @activeBg;
       &:after{
-        background: url("../images/icon_up.png") no-repeat;
+        transform: rotate(180deg);
+        -webkit-transform: rotate(180deg);
       }
     }
     li{
@@ -226,14 +218,18 @@
     .copy-right{
       position: fixed;
       bottom: 0px;
-      width: @menuWt;
+      width: @menuWt+(-1px);
       text-align: center;
-      font-size:12px;
-      color: #F0F0F0;
       height: 50px;
       line-height: 50px;
       background: @themeColor;
       border-top: 1px @themeBorderClr solid;
+      border-right: 1px rgba(74, 93, 142, 0.5) solid;
+      p{
+        font-size:12px;
+        opacity: .3;
+        color: #fff;
+      }
     }
   }
   .menu-mini{
@@ -284,10 +280,12 @@
   .main{
     margin-left:@menuWt;
     height: 100%;
+    // overflow: auto;
     /*border: 10px solid #f5f5f5;*/
     iframe {
       width: 100%;
       height: 100%;
+      overflow: auto;
     }
   }
   //修改密码
@@ -296,8 +294,8 @@
     input {
       border: 1px solid #E2E5EF;
       width: 300px;
-      height: 40px;
-      line-height: 40px;
+      height: 34px;
+      line-height: 34px;
       border-radius: 3px;
       margin-bottom: 30px;
       padding: 0 10px;
@@ -412,6 +410,9 @@
         line-height: 40px;
         border-radius: 2px;
         padding: 0 10px;
+        &:focus{
+          border-color: @activeColor;
+        }
       }
     }
     .itemMsgLab{
@@ -496,6 +497,9 @@
         line-height: 40px;
         border-radius: 2px;
         padding: 0 10px;
+        &:focus{
+          border-color: @activeColor;
+        }
       }
     }
     .itemMsgLab{
@@ -751,4 +755,4 @@
   .midifyMsgContentDel {
     height: 220px !important;
     width: 300px !important;
-  }
+  }

+ 5 - 25
src/css/itemManager.less

@@ -16,38 +16,18 @@
     }
     .main-body{
         margin: 10px 40px;
+        padding-bottom: 50px;
     }
     table{
-        width: 100%;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
-        th,td{
-            height: 32px;
-            box-sizing: border-box;
-            padding:0 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
-        }
-        th{
-            font-size: 14px;
-            font-weight: 500;
-        }
-        td{
-            font-size: 14px;
-            font-weight: 400 
-        }
+        .table;
         .moduleNumber{
             text-align: center;
         }
         
     }
-    // .filterBox{
-    //     margin: 0 0 20px 0;
-    // }
+    .filterBox{
+        margin-bottom:10px;
+    }
     .filterItem{
         position: relative;
         display: inline-block;

+ 2 - 17
src/css/jiaji.less

@@ -41,30 +41,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -86,8 +73,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 13 - 4
src/css/login.less

@@ -3,7 +3,6 @@ body {
   background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
 .login {
-  cursor: pointer;
   height: 100%;
   .bg{
     width: 62%;
@@ -24,17 +23,18 @@ body {
     text-align: center;
     background-color: #00A1FF;
     color: #fff;
+    cursor: pointer;
     border-radius:4px;
     margin: 20px auto 0;
   }
 }
 p.title {
-  font-size: 28px;
+  font-size: 30px;
   color: #fff;
   font-weight: bold;
   position: absolute;
   top: 90px;
-  left: 50px;
+  left: 5%;
 }
   .message {
     width: 38%;
@@ -51,11 +51,20 @@ p.title {
       margin-left: -150px;
     }
     .welcome {
-      font-size: 20px;
+      font-size: 30px;
       font-weight: bold;
       color: #fff;
       margin-bottom: 50px;
     }
+    .copy-right{
+      position: absolute;
+      bottom: 50px;
+      width: 100%;
+      font-size:12px;
+      text-align: center;
+      color: #fff;
+      opacity: .6;
+    }
   }
   .perPub {
     width: 300px;

+ 2 - 19
src/css/moduleManager.less

@@ -7,6 +7,7 @@ h2{
 }
 .main-body{
     margin: 10px 40px;
+    padding-bottom: 40px;
 }
 .totalSumBox{
     margin: 0 0 10px 0;
@@ -17,28 +18,10 @@ h2{
     }
 }
 table{
-    width: 100%;
-    border:1px solid #E2E5EF;
-    border-collapse: collapse;/*关键代码*/
+    .table;
     min-width: 800px;
-    thead{
-        background: #EFF0F9;
-       
-    }
     th,td{
-        height: 32px;
-        box-sizing: border-box;
         padding: 0 20px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;/*关键代码*/
-    }
-    th{
-        font-size: 14px;
-        font-weight: 500;
-    }
-    td{
-        font-size: 14px;
-        font-weight: 400 
     }
     .moduleNumber{
         text-align: center;

+ 2 - 22
src/css/mukuai.less

@@ -89,30 +89,10 @@
     }
     .main-body {
         margin: 20px 40px;
+        padding-bottom: 40px;
     }
     table{
-        width: 100%;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
-        th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
-        }
-        th{
-            font-size: 14px;
-            font-weight: 500;
-        }
-        td{
-            font-size: 14px;
-            font-weight: 400 
-        }
+        .table;
         .moduleNumber{
             text-align: center;
         }

+ 2 - 17
src/css/partDetail.less

@@ -41,30 +41,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -86,8 +73,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 2 - 17
src/css/partDetailControl.less

@@ -41,30 +41,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -86,8 +73,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 2 - 17
src/css/payDetail.less

@@ -42,30 +42,17 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }
     table{
-        width: 100%;
+        .table;
         min-width: 1090px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
         th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
             text-align: center;
         }
         th{
-            font-size: 14px;
-            font-weight: 500;
             white-space: nowrap;
         }
         th[code]{
@@ -87,8 +74,6 @@
             }
         }
         td{
-            font-size: 14px;
-            font-weight: 400;
             white-space: nowrap;
         }
         .moduleNumber{

+ 9 - 20
src/css/qcList.less

@@ -12,28 +12,17 @@ h2{
 }
 .main-body{
     margin: 10px 0;
-    padding: 0 35px;
     min-width: 1090px;
-    /*width: 100%;*/
+    padding: 0 35px 50px 35px;
+    // overflow: auto;
 }
 table{
-    width: 100%;
+    .table;
     min-width: 1090px;
-    border:1px solid #E2E5EF;
-    border-collapse: collapse;
-    thead th{
-        background: #EFF0F9;
-       
-    }
     th,td{
-        box-sizing: border-box;
-        padding:6px 10px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
+        padding:5px 10px;
     }
     th{
-        font-size: 14px;
-        font-weight: 500;
         white-space: nowrap;
     }
     th[code]{
@@ -55,8 +44,6 @@ table{
         }
     }
     td{
-        font-size: 14px;
-        font-weight: 400;
         white-space: nowrap;
     }
     .moduleNumber{
@@ -70,6 +57,7 @@ table{
 }
 .tabFoot{
     height: 40px;
+    background: none;
     /*border: 1px solid #E2E5EF;
     border-top: none;
     box-sizing: border-box;*/
@@ -81,6 +69,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 
@@ -109,7 +98,7 @@ table{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 5px 0;
+    margin: 0 20px 10px 0;
     span{
         display: inline-block;
         line-height: 32px;
@@ -154,7 +143,7 @@ table{
 }
 .levelList{
     width: 120px;
-    height: 200px;
+    // height: 200px;
     li:hover{
         background-color: #EEF4FF;
         cursor: pointer;
@@ -188,7 +177,7 @@ table{
     top: 2px;
     cursor: pointer;
     float: left;
-    margin: 0 20px 22px 0;
+    margin: 0 0px 22px 0;
 }
 .arrow{
     position: absolute;

+ 8 - 20
src/css/qcListDept.less

@@ -11,29 +11,18 @@ h2{
     .h2;
 }
 .main-body{
-    margin: 10px 0;
-    padding: 0 35px;
+    margin: 10px 0;    
+    padding: 0 35px 50px 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }
 table{
-    width: 100%;
+    .table;
     min-width: 1090px;
-    border:1px solid #E2E5EF;
-    border-collapse: collapse;
-    thead th{
-        background: #EFF0F9;
-       
-    }
     th,td{
-        box-sizing: border-box;
-        padding:6px 10px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
+        padding:5px 10px;
     }
     th{
-        font-size: 14px;
-        font-weight: 500;
         white-space: nowrap;
     }
     th[code]{
@@ -55,8 +44,6 @@ table{
         }
     }
     td{
-        font-size: 14px;
-        font-weight: 400;
         white-space: nowrap;
     }
     .moduleNumber{
@@ -81,6 +68,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 
@@ -109,7 +97,7 @@ table{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 5px 0;
+    margin: 0 20px 10px 0;
     span{
         display: inline-block;
         line-height: 32px;
@@ -154,7 +142,7 @@ table{
 }
 .levelList{
     width: 120px;
-    height: 200px;
+    // height: 200px;
     li:hover{
         background-color: #EEF4FF;
         cursor: pointer;
@@ -189,7 +177,7 @@ table{
     top: 2px;
     cursor: pointer;
     float: left;
-    margin: 0 20px 22px 0;
+    margin: 0 0px 22px 0;
 }
 .arrow{
     position: absolute;

+ 7 - 19
src/css/qcListPerson.less

@@ -12,28 +12,17 @@ h2{
 }
 .main-body{
     margin: 10px 0;
-    padding: 0 35px;
+    padding: 0 35px 50px 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }
 table{
-    width: 100%;
+    .table;
     min-width: 1090px;
-    border:1px solid #E2E5EF;
-    border-collapse: collapse;
-    thead th{
-        background: #EFF0F9;
-       
-    }
     th,td{
-        box-sizing: border-box;
-        padding:6px 10px;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
+        padding:5px 10px;
     }
     th{
-        font-size: 14px;
-        font-weight: 500;
         white-space: nowrap;
     }
     th[code]{
@@ -55,8 +44,6 @@ table{
         }
     }
     td{
-        font-size: 14px;
-        font-weight: 400;
         white-space: nowrap;
     }
     .moduleNumber{
@@ -81,6 +68,7 @@ table{
     cursor: pointer;
     img{
         margin: 0 10px 0 0;
+        vertical-align: middle;
     }
 }
 
@@ -109,7 +97,7 @@ table{
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 5px 0;
+    margin: 0 20px 10px 0;
     span{
         display: inline-block;
         line-height: 32px;
@@ -154,7 +142,7 @@ table{
 }
 .levelList{
     width: 120px;
-    height: 200px;
+    // height: 200px;
     li:hover{
         background-color: #EEF4FF;
         cursor: pointer;
@@ -201,7 +189,7 @@ table{
     top: 2px;
     cursor: pointer;
     float: left;
-    margin: 0 20px 22px 0;
+    margin: 0 0px 22px 0;
 }
 .arrow{
     position: absolute;

+ 43 - 7
src/css/qcScore.less

@@ -25,7 +25,7 @@
 }
 .sub-menu{
   position: relative;
-  width: @menuWt;
+  width: @menuWt+15px;
   height: 100%;
   float: left;
   overflow-y: auto;
@@ -44,6 +44,36 @@
   }
   &>ul>li{
     color: @themeFontClr;
+    &.menu-0{
+      background: url("../images/total.png") 20px 9px no-repeat;
+      &.active{
+        background: url("../images/total_a.png") 20px 9px no-repeat;
+      }
+    }
+    &.menu-6{
+       background: url("../images/index.png") 20px 11px no-repeat;
+      &.active{
+        background: url("../images/index_a.png") 20px 11px no-repeat;
+      }
+     }
+    &.menu-1{
+      background: url("../images/inhis.png") 19px 11px no-repeat;
+      &.active{
+        background: url("../images/inhis_a.png") 19px 11px no-repeat;
+      }
+    }
+    &.menu-37{
+      background: url("../images/prod.png") 20px 10px no-repeat;
+      &.active{
+        background: url("../images/prod_a.png") 20px 10px no-repeat;
+      }
+    }
+    &.menu-5{
+      background: url("../images/out.png") 20px 11px no-repeat;
+      &.active{
+        background: url("../images/out_a.png") 20px 11px no-repeat;
+      }
+    }
   }
   .active{
     color: @activeColor;
@@ -78,7 +108,7 @@
     ul{
       display: none;
       li.page{
-        text-indent: 30px;
+        text-indent: 55px;
         color: @themeFontClr;
         &.active{
           color: @activeColor;
@@ -88,7 +118,7 @@
   }
   li{
     line-height: @menuLiHt;
-    text-indent: 15px;
+    text-indent: 45px;
     cursor: pointer;
   }
   .copy-right{
@@ -96,11 +126,14 @@
     bottom: 0px;
     width: @menuWt;
     text-align: center;
-    font-size:12px;
-    color: #F0F0F0;
     background: @themeColor;
     padding: 10px 0 20px;
     border-top: 1px @themeBorderClr solid;
+    p{
+      font-size:12px;
+      color: #fff;
+      opacity: .3;
+    }
   }
 }
 .menu-mini{
@@ -130,8 +163,8 @@
   }
 }
 .tab-container{
-  margin-left: @menuWt;
-  height: 100%;
+  margin-left: @menuWt+15px;
+  /*height: 100%;*/
   .content-box{
     width:78%;
     height: 100%;
@@ -353,6 +386,9 @@
   /*display: none;*/
   margin-top: 120px;
   text-align: center;
+  img{
+    width: 86px;
+  }
   p{
     margin-top: 15px;
     font-size: 12px;

+ 1 - 0
src/css/quexianDetail.less

@@ -91,6 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

+ 1 - 0
src/css/quexianDetailControl.less

@@ -91,6 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
         width: 100%;

+ 1 - 1
src/css/quexianXQ.less

@@ -42,7 +42,7 @@
     }
     .main-body{
         margin: 20px 0;
-        padding: 0 35px;
+        padding: 0 35px 50px 35px;
         min-width: 1090px;
         /*width: 100%;*/
     }

+ 67 - 5
src/css/reset.less

@@ -64,6 +64,29 @@ table {
   border-spacing: 0;
 }
 
+.table{
+  width: 100%;
+  border:1px solid #E2E5EF;
+  border-collapse: collapse;
+  thead{
+    background: #EFF0F9;
+  }
+  th,td{
+    height: @trHeight;
+    box-sizing: border-box;
+    padding:0 10px;
+    border:1px solid #E2E5EF;
+    border-collapse: collapse;
+  }
+  th{
+    font-size: 14px;
+    font-weight: 500;
+  }
+  td{
+    font-size: 14px;
+    font-weight: 400
+  }
+}
 input,
 textarea {
   border: none;
@@ -96,7 +119,7 @@ textarea {
 @menuWt:205px;   /*菜单宽度*/
 @themeColor:#203463;    //主题背景色
 @themeFontClr:#fff;   //主题字体色
-@themeBorderClr:#4A5D8E;    //主题边框色
+@themeBorderClr:rgba(74, 93, 142, 0.5);    //主题边框色
 @activeColor:#00A1FF;   /*菜单项选中颜色*/
 @activeBg:#142753;   /*菜单项选中背景*/
 @borderColor:#E2E5EF; /**边框颜色**/
@@ -104,6 +127,7 @@ textarea {
 @warnColor:#FF4D4F;  /**重点红色**/
 @thBgColor:#EFF0F9; /**标题背景色**/
 @tableBorderColor:#E2E5EF;  /**表格边框**/
+@trHeight:30px;   /**表格行高**/
 .h2{
   width: 100%;
   /*box-sizing: border-box;*/
@@ -115,7 +139,7 @@ textarea {
   border-bottom: 10px solid #F5F6FA;
   font-size: 16px;
   text-indent: 20px;
-  font-weight: bold;
+  font-weight: normal;
   letter-spacing: 1px;
 }
 
@@ -208,7 +232,7 @@ textarea {
     left: 50%;
     top: 30%;
     margin-left: -200px;
-    padding-bottom: 20px;
+    padding-bottom: 34px;
     border-radius: 4px;
     overflow: hidden;
   }
@@ -328,7 +352,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   line-height: 44px;
   padding-left: 15px;
   font-size: 14px;
-  font-weight: bold;
+  font-weight: normal;
   letter-spacing: 1px;
   min-width: 100px;
   p {
@@ -413,7 +437,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   }
 }
 .filterclearT {
-  height: 30px !important;
+  height: 32px !important;
   line-height: 32px !important;
   float: left;
   position: relative;
@@ -422,4 +446,42 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
 .goHomeDetail {
   color: #00A1F0;
   cursor: pointer;
+}
+
+.filterclear.abnormalClear {
+  display: inline-block;
+  width: 60px;
+  height: 32px;
+  line-height: 32px;
+  background: #fff;
+  border-radius: 4px;
+  color: #777;
+  border: 1px solid #777;
+  box-sizing: border-box;
+  text-align: center;
+  position: relative;
+  top: 0px !important;
+  cursor: pointer;
+  margin-left: 10px;
+  float: left;
+}
+
+.filterItem,.patientNumInp,.filter,.moduleItemInp,.selectDept, .filterItem span {
+  height: 32px !important;
+  line-height: 32px !important;
+  float: left;
+}
+.filterItem ,.filter {
+  top: 0px !important;
+  float: left !important;
+}
+.arrow{
+  top: 13px !important;
+}
+
+.filterDropList {
+  top: 31px !important;
+}
+.toggleSlide p {
+  border: 1px solid #506597 !important;
 }

+ 2 - 22
src/css/tiaomu.less

@@ -91,30 +91,10 @@
     }
     .main-body{
         margin: 20px 40px;
+        padding-bottom: 50px;
     }
     table{
-        width: 100%;
-        border:1px solid #E2E5EF;
-        border-collapse: collapse;
-        thead{
-            background: #EFF0F9;
-           
-        }
-        th,td{
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px;
-            border:1px solid #E2E5EF;
-            border-collapse: collapse;
-        }
-        th{
-            font-size: 14px;
-            font-weight: 500;
-        }
-        td{
-            font-size: 14px;
-            font-weight: 400 
-        }
+        .table;
         .moduleNumber{
             text-align: center;
         }

+ 10 - 9
src/html/console.html

@@ -21,11 +21,11 @@
   <div class="partWrap clearfix">
 
       <div class="part01 fl">
-        <p class="partTitlePub clearfix">
+        <p class="partTitlePub clearfix" style="cursor: default;">
           <span class="name">出院人数统计</span>
           <span class="personNum">总人数:</span>
         </p>
-        <ul class="clearfix">
+        <ul class="clearfix" style="cursor: default;">
           <li>
             <p class="numShow died"></p>
             <p class="explainNum">死亡人数</p>
@@ -40,7 +40,7 @@
           </li>
         </ul>
         <div class="defect">
-          <p class="partTitlePub">各模块缺陷占比排名</p>
+          <p class="partTitlePub">各模块缺陷占比排名 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="list">
             <table class="qtable">
   
@@ -68,7 +68,7 @@
           </li>
         </ul>
         <div class="bingliLis clearfix">
-          <p>病历评分等级占比</p>
+          <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="panPartPub panPart02">
             <div class="fen" id="fen01"></div>
             <p>甲级占比</p>
@@ -83,7 +83,7 @@
           </div>
         </div>
         <div class="pubEchart paymoney">
-          <p class="title">科室平均住院天数柱状图</p>
+          <p class="title">科室平均住院天数柱状图 <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide">
             <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
             <ul>
@@ -96,13 +96,13 @@
       </div>
       <div class="part03 fl">
         <p class="partTitlePub clearfix">
-          <span class="name">各科室甲级病历占比</span>
+          <span class="name">各科室甲级病历占比</span> <img class="detailGo" src="../images/details.png" alt="">
         </p>
         <div class="barChartLineBox">
           <div id="lineChart" class="barChartLine"></div>
         </div>
         <div class="circle clearfix">
-          <p class="title">各科室缺陷占比</p>
+          <p class="title">各科室缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div id="emptyCircle" class="emptyCircle"></div>
           <div class="explainPan explainPanT">
             <table>
@@ -111,9 +111,10 @@
           </div>
         </div>
       </div>
+      <p class="clearfix"></p>
       <div class="part04 clearfix">
         <div class="circleB clearfix">
-          <p class="title">条目缺陷占比</p>
+          <p class="title">条目缺陷占比 <img src="../images/details.png" alt=""></p>
           <div id="emptyCircleB" class="emptyCircle"></div>
           <div class="explainPan explainPanB">
             <table>
@@ -123,7 +124,7 @@
         </div>
         
         <div class="pubEchartB paymoney">
-          <p class="title">各科室质控平均分柱状图</p>
+          <p class="title">各科室质控平均分柱状图 <img src="../images/details.png" alt=""></p>
           <div id="barChartPay" class="barChartPay" style="height: 217px;"></div>
         </div>
       </div>

+ 7 - 16
src/html/deptConsole.html

@@ -32,11 +32,11 @@
   <div class="grayLine"></div>
   <div class="partWrap clearfix">
       <div class="part01 fl">
-        <p class="partTitlePub clearfix">
+        <p class="partTitlePub clearfix" style="cursor: default;">
           <span class="name">出院人数统计</span>
           <span class="personNum">总人数:</span>
         </p>
-        <ul class="clearfix">
+        <ul class="clearfix" style="cursor: default;">
           <li>
             <div class="lis">
               <p class="numShow died"></p>
@@ -44,14 +44,14 @@
             </div>
           </li>
           <li class="li03">
-            <div class="lis">
+            <div class="lis li02">
               <p class="numShow patientNum"></p>
               <p class="explainNum">手术病人数</p>
             </div>
           </li>
         </ul>
         <div class="defect">
-          <p class="partTitlePub">各模块缺陷占比排名</p>
+          <p class="partTitlePub">各模块缺陷占比排名 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="list">
             <table class="qtable">
   
@@ -79,7 +79,7 @@
           </li>
         </ul>
         <div class="bingliLis clearfix">
-          <p>病历评分等级占比</p>
+          <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="panPartPub panPart02">
             <div class="fen" id="fen01"></div>
             <p>甲级占比</p>
@@ -93,22 +93,13 @@
             <p>丙级占比</p>
           </div>
         </div>
-        <div class="circleB circleBSingle clearfix">
-          <p class="title">条目缺陷占比</p>
-          <div id="emptyCircleB" class="emptyCircle"></div>
-          <div class="explainPan explainPanB">
-            <table>
-              
-            </table>
-          </div>
-        </div>
         <div class="circleBLis">
           <div class="circleB homePage clearfix">
-            <p class="title">病案首页合格率占比</p>
+            <p class="title">病案首页合格率占比 <img class="detailGo" src="../images/details.png" alt=""></p>
             <div id="lineChart" class="emptyCircle emptyLineCircle"></div>
           </div>
           <div class="circleB homePageNo clearfix">
-            <p class="title">条目缺陷占比</p>
+            <p class="title">条目缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
             <div id="emptyCircleBc" class="emptyCircle"></div>
             <div class="explainPan explainPanc explainPanBc">
               <table>

+ 1 - 1
src/html/deptScoreDetail.html

@@ -29,7 +29,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入医生名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室:</span>
+                    <span style="overflow:hidden">科室名称:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 1 - 1
src/html/index.html

@@ -45,7 +45,7 @@
                   <img src="../images/down.png" alt="">
               </a>-->
               <ul></ul>
-              <div class="copy-right">©杭州朗通信息技术有限公司</div>
+              <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
           </div>
           <div class="menu-mini fl">
               <!--<a href="javescript:void(0);" class="slide-show">

+ 5 - 3
src/html/itemManager.html

@@ -13,7 +13,7 @@
     <div class="managerContainer">
         <h2>条目数据维护</h2>
         <div class="main-body">
-            <div class="filterBox">
+            <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>模块名称:</span>
                     <span class="selectModuleType ellipsis">全部 </span>
@@ -43,8 +43,10 @@
                         <li class="usedItem" data-name="否" data-id=0>否</li>
                     </ul>
                 </span>
-                <span class="filter">查询</span>
-                <span class="filterclear abnormalClear">重置</span>
+                <div style="display: inline-block;float: left;">
+                    <span class="filter">查询</span>
+                    <span class="filterclear abnormalClear">重置</span>
+                </div>
             </div>
             <table>
                 <thead>

+ 1 - 0
src/html/login.html

@@ -38,6 +38,7 @@
           <p class="waring"></p>
           <div class="sureLogin">登录</div>
         </div>
+        <div class="copy-right">由杭州朗通信息技术有限公司提供技术支持</div>
       </div>
     <!--</div>-->
   </div>

+ 2 - 2
src/html/mukuai.html

@@ -12,7 +12,7 @@
 <body>
     <div class="managerContainer mukuai">
         <div class="partTitle">
-          <p><a href="console.html">控制台 / </a>各模块缺陷占比</p>
+          <p><a href="deptConsole.html">控制台(科室) / </a>各模块缺陷占比</p>
           <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
@@ -32,7 +32,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室:</span>
+                    <span style="overflow:hidden">科室名称:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

+ 2 - 3
src/html/partDetail.html

@@ -11,7 +11,7 @@
 <body>
     <div class="container partDetail">
         <div class="partTitle">
-          <p><a href="console.html">控制台 / </a>病案首页合格率占比</p>
+          <p><a href="deptConsole.html">控制台(科室) / </a>病案首页合格率占比</p>
           <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
@@ -29,7 +29,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入主管医生">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室:</span>
+                    <span style="overflow:hidden">科室名称:</span>
                     <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
@@ -42,7 +42,6 @@
                 <table>
                     <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="beHospitalId textCenter">科室编码</th>
                     <th class="beHospitalId textCenter">主管医生</th>
                     <th class="beHospitalId textCenter">缺陷总数</th>
                     <th class="beHospitalId textCenter">质控平均分</th>

+ 0 - 1
src/html/partDetailControl.html

@@ -44,7 +44,6 @@
                 <table>
                     <thead>
                         <th class="moduleName" style="width: 65px;">序号</th>
-                        <th class="beHospitalId textCenter">科室编码</th>
                         <th class="beHospitalId textCenter">科室名称</th>
                         <th class="beHospitalId textCenter">缺陷总数</th>
                         <th class="beHospitalId textCenter">质控平均分</th>

+ 7 - 6
src/html/qcList.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
                     <span>科室:</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <span>医生工号:</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <span class="filterItem typeFilter clearfix">
+                <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>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级:</span>
-                    <span class="selectLevel unSelect">选择病历等级</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>
@@ -59,11 +60,11 @@
                 <!-- <span class="reset">重置</span> -->
                 <span class="filterclear abnormalClear filterclearT">重置</span>
             </div>
-            <div>
+            <div class="overAuto">
                 <table>
                     <thead>
                     <tr>
-                        <td colspan="17">
+                        <td colspan="17" style="background: #fff">
                             <div class="tabFoot">
                                 <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                 <span class="recordScoreBtn">评分</span>

+ 6 - 5
src/html/qcListDept.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter">
                     <span>科室:</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <span>医生工号:</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                <span class="filterItem typeFilter clearfix">
+                <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>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级:</span>
-                    <span class="selectLevel unSelect">选择病历等级</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>
@@ -62,7 +63,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="17">
+                            <td colspan="17" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>

+ 6 - 5
src/html/qcListPerson.html

@@ -24,8 +24,8 @@
                 </span>
                 <span class="filterItem typeFilter">
                     <span>科室:</span>
-                    <span class="selectDept unSelect"> 
-                        选择科室
+                    <span class="selectDept">
+                        全部
                     </span>
                    
                     <ul class="deptList filterDropList"></ul>
@@ -38,7 +38,7 @@
                     <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
                 </span>
                
-                <span class="filterItem typeFilter clearfix">
+                <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>
@@ -46,8 +46,9 @@
                 </span>
                 <span class="filterItem">
                     <span>病历等级:</span>
-                    <span class="selectLevel unSelect">选择病历等级</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>
@@ -62,7 +63,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="17">
+                            <td colspan="17" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>

+ 3 - 3
src/html/qcScore.html

@@ -7,10 +7,10 @@
     <title>质控评分</title>
     <script type="text/html" id="subMenuTmpl">
         {{if sonMode.length}}
-        <li class="list-1">
+        <li class="list-1 menu-${id}">
             <p>${name}</p>
             {{else}}
-        <li class="page" code="${name}">${name}
+        <li class="page menu-${id}" code="${name}">${name}
             {{/if}}
             <ul>
                 {{each sonMode}}
@@ -637,7 +637,7 @@
                 <img src="../images/up.png" alt="">
             </a>-->
             <ul id="subMenu"></ul>
-            <div class="copy-right">©杭州朗通信息技术有限公司</div>
+            <div class="copy-right"><p>©杭州朗通信息技术有限公司</p></div>
         </div>
         <div class="menu-mini fl">
            <!-- <a href="javescript:void(0);" class="slide-show">

+ 2 - 2
src/html/tiaomu.html

@@ -12,7 +12,7 @@
 <body>
     <div class="managerContainer tiaomu">
         <div class="partTitle">
-          <p><a href="console.html">控制台 / </a>条目缺陷占比</p>
+          <p><a href="deptConsole.html">控制台(科室) / </a>条目缺陷占比</p>
           <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
@@ -32,7 +32,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室:</span>
+                    <span style="overflow:hidden">科室名称:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

BIN
src/images/arrow_down11.png


BIN
src/images/btn_open.png


BIN
src/images/details.png


BIN
src/images/empty.png


BIN
src/images/icon_check.png


BIN
src/images/下收起_深色背景@2x.png


+ 1 - 1
src/js/abnormal.js

@@ -523,7 +523,7 @@ $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
     $(".selectLevel .arrow").attr("src",iconDown)
-    
+    $(".selectDept .arrow").attr("src",iconDown)
 })
 
 $((function($){

+ 38 - 27
src/js/console.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')){
@@ -63,26 +63,26 @@ $(function(){
 })
 function getDetails(){
     $(".part02 .bingli,.part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetailControl.html")
-        $(".container",parent.document).removeClass("console-cont");
+      focusMenuItem("YH-ZKK-GKSQXZB_XQ");
     })
     $(".part03 .partTitlePub").click(function(){
-        $(parent.document).find("#contentIframe").attr("src",hospital=="台州市立"?"jiaji.html":"partDetailControl.html")
-        $(".container",parent.document).removeClass("console-cont");
+      hospital=="台州市立"?focusMenuItem("YH-ZKK-GKSJJBLZB_XQ"):focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
     })
     $(".paymoney.pubEchart .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","dayDetail.html")
-        $(".container",parent.document).removeClass("console-cont");
+        if($(this).text().indexOf("花费")!==-1){
+          focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+        }else{
+          focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+        }
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
-        $(parent.document).find("#contentIframe").attr("src","mukuaiControl.html?from=1&dateType="+dateType)
-        $(".container",parent.document).removeClass("console-cont");
+        focusMenuItem("YH-ZKK-GMKQXZB_XQ");
     })
     $(".circleB .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","tiaomuControl.html?from=1&dateType="+dateType)
-        $(".container",parent.document).removeClass("console-cont");
+      focusMenuItem("YH-ZKK-TMQXZB_XQ");
     })
 }
+
 //判断有无某一权限
 function hasData(data){
     let lis = JSON.parse(getCookie("codeLis"))
@@ -94,7 +94,7 @@ function hasData(data){
   }
 function resizeBox(){
     $(".partWrap").css({
-        height:$(window).height()-38+'px'
+        height:$(window).height()-44+'px'
     })
 }
 //所有数据切换日期筛选
@@ -102,9 +102,11 @@ function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 1
@@ -113,9 +115,11 @@ function dateChange(){
     $(".monthYear .year").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 2
@@ -310,7 +314,7 @@ function getBarData(type){
             let data = res.data;
             if(data.code == 0){
                 let result1 = data.data['各模块缺陷占比排行']||[];
-                result1.length>8?result1.length=8:"";
+                // result1.length>8?result1.length=8:"";
                 queList(result1)
             }
         })
@@ -398,7 +402,7 @@ function part02pan(data,dom){
     });
     let bgColor = '#fff';
     let title = '总量';
-    let color = ['#37CBCB','#dedede'];
+    let color = ['#3fffd1','#4c5c82'];
     let echartData = data;
     option = {
         //backgroundColor: bgColor,
@@ -410,9 +414,9 @@ function part02pan(data,dom){
             textStyle: {
                 rich: {
                     val: {
-                        fontSize: 14,
+                        fontSize: 12,
                         color: '#fff',
-                        fontWeight: 'bold',
+                        /*fontWeight: 'bold',*/
                         padding: [10, 0]
                     },
                     name: {
@@ -426,9 +430,16 @@ function part02pan(data,dom){
         series: [{
             name: '',
             type: 'pie',
-            radius: ['70%', '90%'],
+            radius: ['65%', '95%'],
             data: echartData,
-            hoverAnimation:false,
+            hoverAnimation:true,
+            hoverOffset:3,
+            itemStyle: {
+              normal: {
+                borderColor: '#203463',
+                borderWidth: 3
+              }
+            },
             label: {
                 normal: {
                     show:false,
@@ -551,7 +562,7 @@ function lineChartSpecial(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -626,7 +637,7 @@ function lineChartSpecial(dataX,dataY){
         }],
         series: [
             {
-                name: '质控平均分',
+                name: '病案首页合格率',
                 type: 'bar',
                 barWidth: '23%',
                 data: dataY
@@ -643,7 +654,7 @@ function barChartPay(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -826,7 +837,7 @@ function barChart(data,type){
         data3.push(data[i].lastYearAverageValue)//去年本月
     }
     option = {
-        color: ['#00A1FF', '#FAD336', '#37CBCB'],
+        color: ['#37CBCB','#5A8EEE', '#FAD336' ],
         tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -1176,9 +1187,9 @@ function panDetail(data){
         `
     }
     $(".explainPanT table").html(strAll);
-    $(".explainPan").css({
-        marginTop:-($(".explainPan").height()/2-20)+'px'
-    })
+    // $(".explainPan").css({
+    //     marginTop:-($(".explainPan").height()/2-20)+'px'
+    // })
 }
 function panDetailB(data){
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];

+ 11 - 5
src/js/dayDetail.js

@@ -21,7 +21,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    // window.location.reload()
+        behospitalCode = ""
+        $(".patientNumInp").val("")
+        getTabData(1)
 })
 $(".partTitle a").click(function(){
     //初始菜单选中
@@ -124,9 +127,9 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.name || "-"}</td>
-                <td >${item.totleValue}</td>
+                <td >${item.averageValue}</td>
                 <td >${item.lastAverageValue}</td>
-                <td style="display:${statisticsType==1?'table':'none'}">${item.lastYearAverageValue}</td>
+                ${statisticsType==1?'<td>'+item.lastYearAverageValue+'</td>':''}
             </tr>
         `
     }
@@ -134,8 +137,8 @@ function renderTab(data,hisId,activePage){
         ${statisticsType==1?`<thead class="monType">
             <th class="moduleName" style="width: 65px;">序号</th>
             <th class="beHospitalId textCenter">科室名称</th>
-            <th class="patientNo textCenter" >上月平均住院天数(天)</th>
             <th class="patientNo textCenter" >本月平均住院天数(天)</th>
+            <th class="patientNo textCenter" >上月平均住院天数(天)</th>s
             <th class="patientNo textCenter" >去年本月平均住院天数(天)</th>
         </thead>`:`
         <thead class="yearType">
@@ -146,7 +149,10 @@ function renderTab(data,hisId,activePage){
         </thead>
         `}
         <tbody>
-            ${str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>'}
+            ${str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+                <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+                <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+                </td></tr>`}
         </tbody>
     `
     $('.tableDay').html(sts)

+ 36 - 30
src/js/deptConsole.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,curDept = '',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
@@ -42,17 +42,19 @@ $(function(){
 })
 function tiaomu(){
     $(".defect .partTitlePub").click(function(){
+        focusMenuItem("YH-KSZR-GMKQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=2&deptName="+curDept+"&dateType="+dateType)
-    })
+    });
     $(".circleBSingle .title,.homePageNo .title").click(function(){
+        focusMenuItem("YH-KSZR-TMQXZB_XQ");
         $(parent.document).find("#contentIframe").attr("src","tiaomu.html?from=2&deptName="+curDept+"&dateType="+dateType)
-    })
+    });
     $(".homePage .title").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","partDetail.html")
-    })
+        focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
+    });
     $(".part02 .bingli,.part02 .bingliLis").click(function(){
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html")
-    })
+        focusMenuItem("YH-KSZR-KSQXZB_XQ");
+    });
 }
 //判断有无某一权限
 function hasData(data){
@@ -75,8 +77,8 @@ function dateChange(){
             backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#00A1FF',
-            backgroundColor:'#fff'
+            color:'#fff',
+            backgroundColor:'#203463'
         })
         dateType = 1
         getBarData(1)
@@ -86,8 +88,8 @@ function dateChange(){
             backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#00A1FF',
-            backgroundColor:'#fff'
+            color:'#fff',
+            backgroundColor:'#203463'
         })
         dateType = 2
         getBarData(2)
@@ -144,7 +146,11 @@ function getOwnDept(){
                 curDept = result[0].deptName
                 $(".partTitle p i,.toggleSlide p span").html(curDept).attr("title",curDept)
                 getBarData(2)//图标数据获取
+            }else {
+                $(".partTitle p i,.toggleSlide p span").html('--')
             }
+        }).catch(()=>{
+            $(".partTitle p i,.toggleSlide p span").html('--')
         })
     // }
 }
@@ -290,7 +296,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#333'
+                        color: '#fff'
                     },
                     rotate:45,
                     formatter: function (value) {
@@ -303,7 +309,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLine: {//x轴
                     lineStyle:{
-                        color:'#AAAAAA'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -319,12 +325,12 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//y轴刻度
                     textStyle: {
-                        color: '#333333'
+                        color: '#fff'
                     }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#EFF3FC'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -336,7 +342,7 @@ function lineChartSpecial(dataX,dataY){
             left: 10,
             textStyle: {
                 fontSize: 14,
-                color:'#666666',
+                color:'#fff',
                 fontWeight: 400
             }
         }],
@@ -441,7 +447,7 @@ function part02pan(data,dom){
     let color = ['#37CBCB','#dedede'];
     let echartData = data;
     option = {
-        backgroundColor: bgColor,
+        // backgroundColor: bgColor,
         color: color,
         title: [{
             text:'{val|' + echartData[0].percentStr + '}',
@@ -451,14 +457,14 @@ function part02pan(data,dom){
                 rich: {
                     val: {
                         fontSize: 14,
-                        color: '#333',
+                        color: '#fff',
                         fontWeight: 'bold',
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#777',
+                        color: '#fff',
                     }
                 }
             }
@@ -493,7 +499,7 @@ function emptyCircleB(data){
         total += echartData[i].num
     }
     option = {
-        backgroundColor: bgColor,
+        // backgroundColor: bgColor,
         color: color,
         title: [{
             text: data.length>0?'{val|' + total + '}\n{name|' + title + '}':'',
@@ -503,14 +509,14 @@ function emptyCircleB(data){
                 rich: {
                     val: {
                         fontSize: 24,
-                        color: '#333',
+                        color: '#fff',
                         fontWeight: 'bold',
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#777',
+                        color: '#fff',
                     }
                 }
             }
@@ -533,7 +539,7 @@ function emptyCircleB(data){
             hoverOffset:5,
             itemStyle: {
                 normal: {
-                    borderColor: bgColor,
+                    // borderColor: bgColor,
                     borderWidth: 2
                 }
             },
@@ -588,7 +594,7 @@ function emptyCircleBc(data){
         total += echartData[i].num
     }
     option = {
-        backgroundColor: bgColor,
+        // backgroundColor: bgColor,
         color: color,
         title: [{
             text: data.length>0?'{val|' + total + '}\n{name|' + title + '}':'',
@@ -598,14 +604,14 @@ function emptyCircleBc(data){
                 rich: {
                     val: {
                         fontSize: 24,
-                        color: '#333',
+                        color: '#fff',
                         fontWeight: 'bold',
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#777',
+                        color: '#fff',
                     }
                 }
             }
@@ -628,7 +634,7 @@ function emptyCircleBc(data){
             hoverOffset:5,
             itemStyle: {
                 normal: {
-                    borderColor: bgColor,
+                    // borderColor: bgColor,
                     borderWidth: 2
                 }
             },
@@ -637,7 +643,7 @@ function emptyCircleBc(data){
                     length: 20,
                     length2: 120,
                     lineStyle: {
-                        color: '#e6e6e6'
+                        color: '#fff'
                     }
                 }
             },
@@ -655,12 +661,12 @@ function emptyCircleBc(data){
                         name: {
                             fontSize: 14,
                             padding: [0, 10, 0, 4],
-                            color: '#666666'
+                            color: '#fff'
                         },
                         value: {
                             fontSize: 18,
                             fontWeight: 'bold',
-                            color: '#333333'
+                            color: '#fff'
                         }
                     }
                 }

+ 16 - 6
src/js/deptScoreDetail.js

@@ -22,7 +22,15 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   data_desc=[],data_asc=[];
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    // window.location.reload()
+    deptId = deptList[0].deptName
+    behospitalCode = ""
+    $(".patientNumInp").val("")
+    $(".selectDept").html(deptId).attr({
+        "data-id":deptId,
+        "title":deptId
+    }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    getTabData(1)
 })
 $(".partTitle a").click(function(){
     //初始菜单选中
@@ -157,11 +165,14 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=2&deptName="+deptIdTemp+"&docName="+docName)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=2&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType)
     })
 }
 
@@ -353,7 +364,7 @@ function bindDeptSelect(){
         }else{
             $('.selectDept').html(deptItemName)
         }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept ').attr({'title':deptItemName,'data-id':deptItemName})
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -552,8 +563,7 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    
+    $(".selectDept .arrow").attr("src",iconDown)    
 })
 
 $((function($){

+ 9 - 3
src/js/deptScoreDetailControl.js

@@ -21,7 +21,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    // window.location.reload()
+    behospitalCode = ""
+    $(".patientNumInp").val("")
+    getTabData(1)
 })
 
 $(".partTitle a").click(function(){
@@ -141,11 +144,14 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let deptName = $(this).attr("data-dept")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2")
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType)
     })
 }
 

+ 14 - 12
src/js/index.js

@@ -12,7 +12,7 @@ $(function(){
   //菜单展开收起
   sureChangeWord()
   $(".main").css({
-    height:$(window).height()-70+'px'
+    height:$(window).height()-52+'px'
   })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")
@@ -46,23 +46,24 @@ function initMenu(data,userInfo){
   $("#userName").text(userInfo.linkman);
   //初始菜单选中
   $(".menu .page").eq(0).addClass("active");
-  // if($(".menu .page").eq(0).is(".YH-KZT")||$(".menu .page").eq(0).is(".YH-KZTKS")||$(".menu .page").eq(1).is(".YH-KZTKS")){
-  if($(".menu .page").eq(0).is(".YH-KZT")){
+  if($(".menu .page").eq(0).is(".YH-KZT")||$(".menu .page").eq(0).is(".YH-KZTKS")){
+  // if($(".menu .page").eq(0).is(".YH-KZT")){
     $(".container").addClass("console-cont");
   }
   //菜单收起展开
   $(".list-1").on("click",function(){
-    // $(".list-1 .slide-up").removeClass('slide-up');
-    // $(this).toggleClass('slide-up');
+    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");
     const ulShow =  $(this).find("ul").css("display")
     if(ulShow == "none"){
-      //$(this).removeClass("list-1-show")
       $(this).addClass("list-1-show")
-    }/*else{
-      $(this).removeClass("list-1-show")
-    }*/
+    }
     $(this).find("ul").slideToggle();
   });
 //收起菜单
@@ -88,13 +89,14 @@ function initMenu(data,userInfo){
   $(".page").on("click",function(){
     $(".menu .active").removeClass('active');
     $(this).addClass("active");
+    $(this).parents(".list-1-show").addClass("active");
     const code = $(this).attr("code");
     let url = './'+pageMap[code];
     if(code === 'YH-BLZK-ZKPFGR'){
       url += `?doctorName=${userInfo.linkman}`
     }
-    // if(code === 'YH-KZT'||code === 'YH-KZTKS'){
-    if(code === 'YH-KZT'){
+    if(code === 'YH-KZT'||code === 'YH-KZTKS'){
+    // if(code === 'YH-KZT'){
       $(".container").addClass("console-cont");
     }else{
       $(".container").removeClass("console-cont");
@@ -106,11 +108,11 @@ function initMenu(data,userInfo){
 //获取科室列表
 function getOwnDept(){
   // if(hasData('FUNC000058')){
+      setCookie("deptList",JSON.stringify([]))
       post(api.getDept,{}).then((res)=>{
           let data = res.data;
           if(data.code == 0){
               let result = data.data
-              curDept = result[0].deptName
               setCookie("deptList",JSON.stringify(result))
           }
       })

+ 1 - 0
src/js/itemManager.js

@@ -19,6 +19,7 @@ $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".abnormalClear").click(function(){
     window.location.reload()
 })
+
 //判断有无某一权限
 function hasData(data){
     let lis = JSON.parse(getCookie("codeLis"))||[]

+ 8 - 2
src/js/jiaji.js

@@ -21,8 +21,11 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    behospitalCode = ""
+    $(".patientNumInp").val("")
+    getTabData(1)
 })
+
 $(".partTitle a").click(function(){
     //初始菜单选中
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
@@ -131,7 +134,10 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str)
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+            </td></tr>`)
     bindScoreDetail(hisId)
 }
 

+ 28 - 5
src/js/mukuai.js

@@ -28,13 +28,31 @@ $(function(){
     
     $(".partTitle a").click(function(){
         //初始菜单选中
-        $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+        focusMenuItem('YH-KZTKS')
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){
-        window.location.reload()
+        // window.location.reload()
+        deptId = deptList[0].deptName
+        name = ""
+        $(".patientNumInp").val("")
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getTabData(1)
     })
 })
+
+function focusMenuItem(code){
+    const ele = $(parent.document).find(".menu .page[code="+code+"]");
+    const parEle = ele.parents(".list-1");
+    if(!parEle.is(".list-1-show")){
+      parEle.click();
+    }
+    //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+    ele.click();
+  }
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
@@ -47,7 +65,7 @@ function bindDeptSelect(){
         }else{
             $('.selectDept').html(deptItemName)
         }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept ').attr({'title':deptItemName,'data-id':deptItemName})
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -122,7 +140,7 @@ function getTabData(activePage){
         current:activePage,
         type: isReject,
         name: name, //条目名
-        deptName: deptId||deptList.length>0&&deptList[0].deptName, //科室名
+        deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15
     }
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
@@ -213,7 +231,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 
@@ -457,4 +478,6 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
+    $(".deptList").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
 })

+ 18 - 3
src/js/mukuaiControl.js

@@ -27,13 +27,25 @@ $(function(){
     
     $(".partTitle a").click(function(){
         //初始菜单选中
-        $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
         $(".container",parent.document).addClass("console-cont");
+        focusMenuItem('YH-KZT')
     })
     $(".abnormalClear").click(function(){
-        window.location.reload()
+        // window.location.reload()
+        name = ""
+        $(".patientNumInp").val("")
+        getTabData(1)
     })
 })
+function focusMenuItem(code){
+    const ele = $(parent.document).find(".menu .page[code="+code+"]");
+    const parEle = ele.parents(".list-1");
+    if(!parEle.is(".list-1-show")){
+      parEle.click();
+    }
+    //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+    ele.click();
+  }
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
@@ -212,7 +224,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 

+ 29 - 14
src/js/partDetail.js

@@ -22,13 +22,31 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   data_desc=[],data_asc=[];
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    // window.location.reload()
+    deptId = deptList[0].deptName
+    behospitalCode = ""
+    $(".patientNumInp").val("")
+    $(".selectDept").html(deptId).attr({
+        "data-id":deptId,
+        "title":deptId
+    })
+    getTabData(1)
 })
 $(".partTitle a").click(function(){
-    //初始菜单选中
-    $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+    //初始菜单选中        
+    focusMenuItem('YH-KZTKS')
     $(".container",parent.document).addClass("console-cont");
 })
+
+function focusMenuItem(code){
+    const ele = $(parent.document).find(".menu .page[code="+code+"]");
+    const parEle = ele.parents(".list-1");
+    if(!parEle.is(".list-1-show")){
+      parEle.click();
+    }
+    //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+    ele.click();
+  }
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -56,7 +74,6 @@ function getDeptList(){
     $(".partDetail .filterDropList").html(str)
 }
 
-
 dateChange()
 //所有数据切换日期筛选
 function dateChange(){
@@ -109,10 +126,7 @@ function getTabData(activePage){
     }
     post(api.homePageLevelByDeptLimit,param).then(res =>{
         if(res.data.code == '0'){
-            const data = res.data.data;
-            tabList = data.records;
-            const totalPage = data.pages;
-            const totalNum = data.total;
+            const data = res.data.data||[];
             renderTab(data,data.hospitalId,activePage);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
@@ -144,7 +158,6 @@ function renderTab(data,hisId,activePage){
         str += `
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
-                <td>${item.deptId || "-"}</td>
                 <td >${item.doctorName || "-"}</td>
                 <td data-doc="${item.doctorName || ""}" class="goHomeDetail">${item.entryNum || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
@@ -154,11 +167,14 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType)
     })
 }
 
@@ -343,7 +359,7 @@ function bindDeptSelect(){
         }else{
             $('.selectDept').html(deptItemName)
         }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept ').attr({'title':deptItemName,'data-id':deptItemName})
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -542,8 +558,7 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    
+    $(".selectDept .arrow").attr("src",iconDown)
 })
 
 $((function($){

+ 12 - 10
src/js/partDetailControl.js

@@ -21,7 +21,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    // window.location.reload()
+    $(".patientNumInp").val("")
+    behospitalCode = ""
+    getTabData(1)
 })
 $(".partTitle a").click(function(){
     //初始菜单选中
@@ -91,10 +94,7 @@ function getTabData(activePage){
     }
     post(api.homePageLevelStatistics,param).then(res =>{
         if(res.data.code == '0'){
-            const data = res.data.data;
-            tabList = data.records;
-            const totalPage = data.pages;
-            const totalNum = data.total;
+            const data = res.data.data||[];
             renderTab(data,data.hospitalId,activePage);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
@@ -126,7 +126,6 @@ function renderTab(data,hisId,activePage){
         str += `
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
-                <td>${item.deptId || "-"}</td>
                 <td >${item.deptName || "-"}</td>
                 <td class="goHomeDetail" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
@@ -136,11 +135,15 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    // console.log(str)
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let deptName = $(this).attr("data-dept")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=1&casesId=243")
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian="+statisticsType)
     })
 }
 
@@ -531,8 +534,7 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    
+    $(".selectDept .arrow").attr("src",iconDown)
 })
 
 $((function($){

+ 14 - 9
src/js/payDetail.js

@@ -21,7 +21,9 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(".abnormalClear").click(function(){
-    window.location.reload()
+    behospitalCode = ""
+    $(".patientNumInp").val("")
+    getTabData(1)
 })
 $(".partTitle a").click(function(){
     //初始菜单选中
@@ -128,9 +130,9 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.name || "-"}</td>
-                <td >${item.totleValue}</td>
+                <td >${item.averageValue}</td>
                 <td >${item.lastAverageValue}</td>
-                <td style="display:${statisticsType==1?'table':'none'}">${item.lastYearAverageValue}</td>
+                ${statisticsType==1?'<td>'+item.lastYearAverageValue+'</td>':''}
             </tr>
         `
     }
@@ -138,19 +140,22 @@ function renderTab(data,hisId,activePage){
         ${statisticsType==1?`<thead class="monType">
             <th class="moduleName" style="width: 65px;">序号</th>
             <th class="beHospitalId textCenter">科室名称</th>
-            <th class="patientNo textCenter" >上月平均住院天数(天)</th>
-            <th class="patientNo textCenter" >本月平均住院天数(天)</th>
-            <th class="patientNo textCenter" >去年本月平均住院天数(天)</th>
+            <th class="patientNo textCenter" >本月平均住院花费(元)</th>
+            <th class="patientNo textCenter" >上月平均住院花费(元)</th>
+            <th class="patientNo textCenter" >去年本月平均住院花费(元)</th>
         </thead>`:`
         <thead class="yearType">
             <th class="moduleName" style="width: 65px;">序号</th>
             <th class="beHospitalId textCenter">科室名称</th>
-            <th class="patientNo textCenter" >本年平均住院天数(天)</th>
-            <th class="patientNo textCenter" >去年平均住院天数(天)</th>
+            <th class="patientNo textCenter" >本年平均住院花费(元)</th>
+            <th class="patientNo textCenter" >去年平均住院花费(元)</th>
         </thead>
         `}
         <tbody>
-            ${str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>'}
+            ${str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+            </td></tr>`}
         </tbody>
     `
     $('.tableDay').html(sts)

+ 14 - 11
src/js/qcList.js

@@ -32,9 +32,9 @@ $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
-$(".abnormalClear").click(function(){
-    window.location.reload()
-})
+// $(".abnormalClear").click(function(){
+//     window.location.reload()
+// })
 //判断有无某一权限
   function hasData(data){
     let trdObj = JSON.parse(getCookie("trdObj"))
@@ -102,13 +102,13 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
     getTabData(1)
 })
-$(".reset").on("click", function(e){
+$(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
@@ -149,7 +149,10 @@ function renderTab(data,hisId){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-      $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+      $('tbody').html(`<tr><td colspan="17" style="text-align: center;color: #aaa">
+          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+      </td></tr>`)
       return;
     }
     for(let i = 0; i < data.length; i++){
@@ -309,7 +312,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
@@ -361,7 +364,7 @@ $('.recordScoreBtn').on("click",function(e){
     } else{
         loading()
         for(let j = 0; j < scoreList.length; j++){
-            recordScore(scoreList[j],scoreList.length)
+            recordScore(scoreList[j],scoreList.length,true)
         }
     }
 })
@@ -394,9 +397,9 @@ function recordScore(behospitalCode,totalNum,hasToast){
                 const activePage = $(".activePage").attr('data-page') || 1
 
                 getTabData(activePage)
-            }
-            if(hasToast){
-                $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                if(hasToast){
+                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                }
             }
             
         }else{

+ 14 - 12
src/js/qcListDept.js

@@ -19,9 +19,9 @@ $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=[],data_asc=[];
-  $(".abnormalClear").click(function(){
-    window.location.reload()
-})
+//   $(".abnormalClear").click(function(){
+//     window.location.reload()
+// })
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -100,14 +100,14 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
     getTabData(1)
 })
 
-$(".reset").on("click", function(e){
+$(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
@@ -164,7 +164,10 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-      $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+      $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+      </td></tr>`)
       return;
     }
     for(let i = 0; i < data.length; i++){
@@ -324,7 +327,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
@@ -376,7 +379,7 @@ $('.recordScoreBtn').on("click",function(e){
     } else{
         loading()
         for(let j = 0; j < scoreList.length; j++){
-            recordScore(scoreList[j],scoreList.length)
+            recordScore(scoreList[j],scoreList.length,true)
         }
     }
 })
@@ -393,10 +396,9 @@ function recordScore(behospitalCode,totalNum,hasToast){
                 const activePage = $(".activePage").attr('data-page') || 1
 
                 getTabData(activePage)
-            }
-            if(hasToast){
-            
-                $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                if(hasToast){
+                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                }
             }
         }else{
             hideLoading()

+ 14 - 11
src/js/qcListPerson.js

@@ -18,9 +18,9 @@ let doctorName_global = getUrlArgObject("doctorName")
 
 // console.log('doctorName_global',doctorName_global)
 $('.selectDoctor').html(doctorName_global)
-$(".abnormalClear").click(function(){
-    window.location.reload()
-})
+// $(".abnormalClear").click(function(){
+//     window.location.reload()
+// })
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
@@ -102,12 +102,12 @@ $(".filter").on("click", function(e){
     }
     name = nameTemp
     behospitalCode = behospitalCodeTemp
-    level = levelTemp
+    level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
     getTabData(1)
 })
-$(".reset").on("click", function(e){
+$(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
@@ -164,7 +164,10 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-        $('tbody').html(`<tr><td colspan='17' style="text-align: center;color: #aaa">暂无数据~</td></tr>`);
+        $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+        </td></tr>`)
         return;
     }
     for(let i = 0; i < data.length; i++){
@@ -324,7 +327,7 @@ function getDeptList(){
 
 
 function rendeDeptList(deptList){
-    let str = ``
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
@@ -376,7 +379,7 @@ $('.recordScoreBtn').on("click",function(e){
     } else{
         loading()
         for(let j = 0; j < scoreList.length; j++){
-            recordScore(scoreList[j],scoreList.length)
+            recordScore(scoreList[j],scoreList.length,true)
         }
     }
 })
@@ -393,9 +396,9 @@ function recordScore(behospitalCode,totalNum,hasToast){
                 const activePage = $(".activePage").attr('data-page') || 1
 
                 getTabData(activePage)
-            }
-            if(hasToast){
-                $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                if(hasToast){
+                    $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                }
             }
         }else{
             hideLoading()

+ 2 - 0
src/js/qcScore.js

@@ -57,6 +57,7 @@ function initMenu(data){
 
     //选中样式
     $(".sub-menu .active").removeClass('active');
+    $(this).parents(".list-1").addClass("active");
     $(this).addClass("active");
     //显示对应内容
     const code=$(this).attr("code");
@@ -272,6 +273,7 @@ function editScore(info){
 function showModal(flag,code,i){
   $("#delModal .modal-body").html("");
   $("#delModal").show();
+  $(".info-item .cont,.flaw-item .title").removeClass("active");
   //事件解绑
   $("#delModal .confirm").off("click");
   $("#qcScore,#qcMsg").off("input");

+ 50 - 5
src/js/quexianDetail.js

@@ -24,22 +24,62 @@ $(function(){
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     docName = getUrlArgObjectNew("docName",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
+    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||""
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+
     getTabData(1)//条目缺陷    
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetail.html">病案首页合格率占比 / </a>缺陷详情`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetail.html">病案首页合格率占比 / </a>缺陷详情`)
         $(".partTitle .consoleD").click(function(){
-            $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+            focusMenuItem('YH-KZTKS')
             $(".container",parent.document).addClass("console-cont");
         })
+        $(".partTitle .consoleP").click(function(){
+            focusMenuItem('YH-KSZR-BASYHGLZB_XQ')
+            console.log(999)
+        })
     }else{
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetail.html">各科室缺陷占比 / </a>缺陷详情`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台(科室) / </a><a class="consoleP" href="deptScoreDetail.html">各科室缺陷占比 / </a>缺陷详情`)
         $(".partTitle .consoleD").click(function(){
-            $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+            focusMenuItem('YH-KZT')
             $(".container",parent.document).addClass("console-cont");
         })
+        $(".partTitle .consoleP").click(function(){
+            focusMenuItem('YH-KSZR-KSQXZB_XQ')
+        })
     }
+    $(".abnormalClear").click(function(){
+        name = ""
+        $(".patientNumInp").val("")
+        getTabData(1)
+    })
 })
+function focusMenuItem(code){
+    const ele = $(parent.document).find(".menu .page[code="+code+"]");
+    const parEle = ele.parents(".list-1");
+    if(!parEle.is(".list-1-show")){
+      parEle.click();
+    }
+    //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+    ele.click();
+  }
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
@@ -123,6 +163,7 @@ function dateChange(){
             backgroundColor:'#fff'
         })
         isReject = 1
+        isRejectTemp = 1
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -134,6 +175,7 @@ function dateChange(){
             backgroundColor:'#fff'
         })
         isReject = 2
+        isRejectTemp = 2
         getTabData(1)
     })
 }
@@ -221,7 +263,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 

+ 31 - 1
src/js/quexianDetailControl.js

@@ -23,7 +23,26 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
+    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
         $(".partTitle .consoleD").click(function(){
@@ -38,6 +57,12 @@ $(function(){
         })
     }
     getTabData(1)//条目缺陷
+    
+    $(".abnormalClear").click(function(){
+        name = ""
+        $(".patientNumInp").val("")
+        getTabData(1)
+    })
 })
 bindDeptSelect()
 //科室选择
@@ -123,6 +148,7 @@ function dateChange(){
             backgroundColor:'#fff'
         })
         isReject = 1
+        isRejectTemp = 1
         getTabData(1)
     })
     $(".monthYear .year").click(function(){
@@ -134,6 +160,7 @@ function dateChange(){
             backgroundColor:'#fff'
         })
         isReject = 2
+        isRejectTemp = 2
         getTabData(1)
     })
 }
@@ -221,7 +248,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 

+ 4 - 1
src/js/quexianXQ.js

@@ -126,7 +126,10 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindScoreDetail(hisId)
 }
 

+ 31 - 7
src/js/tiaomu.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -27,26 +27,45 @@ $(function(){
     
     $(".partTitle a").click(function(){
         //初始菜单选中
-        $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+        focusMenuItem('YH-KZTKS')
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){
-        window.location.reload()
+        // window.location.reload()
+        deptId = deptList[0].deptName
+        name = ""
+        $(".patientNumInp").val("")
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getTabData(1)
     })
 })
+function focusMenuItem(code){
+    const ele = $(parent.document).find(".menu .page[code="+code+"]");
+    const parEle = ele.parents(".list-1");
+    if(!parEle.is(".list-1-show")){
+      parEle.click();
+    }
+    //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+    ele.click();
+  }
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
     $(document).on("click",'.deptItem',function(){
+        console.log(isReject,'opopopo')
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
+        deptId =deptItemId
         if(deptItemName.length > 10){
             $('.selectDept').html(deptItemName.substring(0,8)+'...')
         }else{
             $('.selectDept').html(deptItemName)
         }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept ').attr({'title':deptItemName,'data-id':deptItemName})
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
@@ -85,7 +104,7 @@ function getTabData(activePage){
         current:activePage,
         type: isReject,
         name: name, //条目名
-        deptName: deptId||deptList.length>0&&deptList[0].deptName, //科室名
+        deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15
     }
     // console.log(isReject)
@@ -241,7 +260,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 
@@ -485,4 +507,6 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
-})
+    $(".deptList").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+})

+ 8 - 2
src/js/tiaomuControl.js

@@ -31,7 +31,10 @@ $(function(){
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){
-        window.location.reload()
+        // window.location.reload()
+        name = ""
+        $(".patientNumInp").val("")
+        getTabData(1)
     })
 })
 bindDeptSelect()
@@ -241,7 +244,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 

+ 4 - 1
src/js/userManager.js

@@ -122,7 +122,10 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
+        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
+        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
+    </td></tr>`)
     bindEdit(data,activePage)
 }
 

+ 15 - 5
src/js/utils.js

@@ -1,7 +1,7 @@
 const qs = require('qs');
 const $ = require("jquery");
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.236:5858"
+const baseUrl = "http://192.168.2.241:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',
@@ -169,8 +169,8 @@ $(".modal .close").click(function(){
 //计算容器高度
 function setBoxHeight(){
   const ht=window.innerHeight;
-  $(".content-box").height((ht-75)+'px');
-  $(".content-ht").height((ht-126)+"px");
+  $(".content-box,.flaw-table").height((ht-75)+'px');
+  $(".content-ht").height((ht-140)+"px");
 }
 setBoxHeight();
 $(window).resize(function(){
@@ -185,7 +185,16 @@ function hasData(data){
   }
   return false;
 }
-
+//定位对应明细菜单
+function focusMenuItem(code){
+  const ele = $(parent.document).find(".menu .page[code="+code+"]");
+  const parEle = ele.parents(".list-1");
+  if(!parEle.is(".list-1-show")){
+    parEle.click();
+  }
+  //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
+  ele.click();
+}
 module.exports = {
   pageMap,
   post,
@@ -196,5 +205,6 @@ module.exports = {
   getCookie,
   delCookie,
   setBoxHeight,
-  hasData
+  hasData,
+  focusMenuItem
 };