Merge remote-tracking branch 'origin/master' into referMaster

src/css/console.less

@@ -74,9 +74,8 @@ body.console {
   
   .title {
     font-size: 16px;
-    font-weight: bold;
-    color: @themeFontClr;
-    opacity: .9;
+    // font-weight: bold;
+    color: @fstColor;
     border-bottom: 1px solid @themeBorderClr;
     height: 40px;
     line-height: 40px;
@@ -119,24 +118,21 @@ body.console {
   line-height: 44px;
   padding-left: 15px;
   font-size: 14px;
-  font-weight: bold;
+  // font-weight: bold;
   letter-spacing: 1px;
   min-width: 100px;
   p {
     display: inline-block;
     font-size: 16px;
-    color: @themeFontClr;
-    opacity: .9;
+    color: @fstColor;
     span {
+      color: @fstColor;
       font-size: 16px;
-      color: #fff;
-      opacity: .9;
     }
   }
   .dateDetail {
     font-size: 12px;
-    color: @themeFontClr;
-    opacity: .6;
+    color: @secColor;
     margin-right: 30px;
     font-weight: normal;
   }
@@ -144,12 +140,11 @@ body.console {
     float: right;
     margin-right: 20px;
     border: 1px solid #00A1FF;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 4px;
-    overflow: hidden;
+    height: 30px;
+    line-height: 30px;
     cursor: pointer;
     margin-top: 7px;
+    border: 0 none;
     span {
       width: 48px;
       height: 28px;
@@ -157,15 +152,21 @@ body.console {
       display: inline-block;
       text-align: center;
       font-weight: normal;
+      float: left;
     }
     .year {
-      background-color: #00A1FF;
-      color: #fff;
-      opacity: .9;
+      background-color: @activeColor;
+      border: 1px solid @activeColor;
+      color: @fstColor;
+      border-left: 0 none;
+      border-radius:0 4px 4px 0;
+      overflow: hidden;
     }
     .mon {
-      color: @themeFontClr;
-      opacity: .6;
+      border: 1px solid @secColor;
+      border-radius: 4px 0 0 4px;
+      border-right: 0 none;
+      color: @secColor;
     }
   }
 }
@@ -233,8 +234,8 @@ body.console {
     width: 100%;
   }
   .explainLi {
-    height: 26px;
-    line-height: 26px;
+    height: 22px;
+    line-height: 22px;
     span {
       display: inline-block;
     }
@@ -253,16 +254,14 @@ body.console {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        color: @themeFontClr;
-        opacity: .6;
+        color: @secColor;
       }
       .smp {
         width: 100px;
       }
     }
     .deptNum {
-      color: @themeFontClr;
-      opacity: .6;
+      color: @secColor;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -270,8 +269,7 @@ body.console {
       text-align: right;
     }
     .percent {
-      color: @themeFontClr;
-      opacity: .6;
+      color: @secColor;
       width: 40px;
     }
   }
@@ -290,8 +288,7 @@ body.console {
     li {
       float: left;
       width: 33.33%;
-      color: #fff;
-      opacity: .9;
+      color: @fstColor;
       border-left: 3px solid #F2637B;
       height: 72px;
       box-sizing: border-box;
@@ -309,9 +306,6 @@ body.console {
     /*background-color: @themeColor;*/
     height: 410px;
     overflow: hidden;
-    .partTitlePub{
-      opacity: .9;
-    }
     .list {
       padding: 6px 5px;
       width: 100%;
@@ -335,16 +329,14 @@ body.console {
     }
     td {
       padding: 7px 10px;
-      color: @themeFontClr;
-      opacity: .9;
+      color: @fstColor;
       i {
         width: 17px;
         height: 17px;
         line-height: 17px;
         border-radius: 8px;
         background-color: #526186;
-        color: #fff;
-        opacity: .9;
+        color: @fstColor;
         display: inline-block;
         text-align: center;
         font-size: 12px;
@@ -361,8 +353,7 @@ body.console {
     }
     .td02name {
       min-width: 113px;
-      color: @themeFontClr;
-      opacity: .9;
+      color: @fstColor;
     }
     .td02 {
     }
@@ -402,9 +393,8 @@ body.console {
     cursor: pointer;
     p {
       text-align: center;
-      color: @themeFontClr;
-      opacity: .9;
-      font-weight: bold;
+      color: @fstColor;
+      // font-weight: bold;
       font-size: 16px;
       padding-bottom: 5px;
       cursor: pointer;
@@ -421,8 +411,7 @@ body.console {
     p {
       text-align: center;
       font-size: 12px;
-      color: @themeFontClr;
-      opacity: .6;
+      color: @secColor;
       font-weight: normal;
       width: 78px;
       position: absolute;
@@ -464,13 +453,12 @@ body.console {
   box-sizing: border-box;
   background: @themeColor;
   border-bottom: 1px solid @themeBorderClr;
-  font-weight: bold;
+  // font-weight: bold;
   color:@themeFontClr;
   font-size: 16px;
   cursor: pointer;
   span{
     color: @themeFontClr;
-    opacity: .9;
   }
   .name {
     float: left;
@@ -478,8 +466,7 @@ body.console {
   }
   .personNum {
     float: right;
-    color: @themeFontClr;
-    opacity: .9;
+    color: @fstColor;
   }
 }
 
@@ -489,13 +476,11 @@ body.console {
   height: 36px;
   line-height: 40px;
   font-weight: bold;
-  color: @themeFontClr;
-  opacity: .9;
+  color: @fstColor;
 }
 .explainNum {
   margin-top: 8px;
-  color: @themeFontClr;
-  opacity: .6;
+  color: @secColor;
 }
 
 .toggleSlide {
@@ -514,8 +499,7 @@ body.console {
     font-size: 14px;
     border-radius: 4px;
     span{
-      color: @themeFontClr;
-      opacity: .9;
+      color: @fstColor;
     }
     img {
       width: 10px;
@@ -526,11 +510,11 @@ body.console {
   }
   ul {
     display: none;
-    background-color: #fff;
+    background-color: #203463;
     position: absolute;
     top: 27px;
     right: 0;
-    border: 1px solid #E2E5EF;
+    border: 1px solid @darkLightBorderColor;
     z-index: 100;
     padding: 0;
     width: 130px;
@@ -538,8 +522,9 @@ body.console {
       height: 30px;
       line-height: 30px;
       padding: 0 10px;
+      color: @fstColor;
       &:hover {
-        background-color: #EEF4FF;
+        background-color: #142753;
       }
     }
   }

src/css/dayDetail.less

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

src/css/deptConsole.less

@@ -70,7 +70,7 @@ body.console {
   
   .title {
     font-size: 16px;
-    font-weight: bold;
+    // font-weight: bold;
     border-bottom: 1px solid @themeBorderClr;
     height: 36px;
     line-height: 36px;
@@ -101,33 +101,31 @@ body.console {
   line-height: 44px;
   padding-left: 15px;
   font-size: 14px;
-  font-weight: bold;
+  // font-weight: bold;
   letter-spacing: 1px;
   p {
     display: inline-block;
     font-size: 16px;
-    color: #fff;
+    color: @fstColor;
     span,i {
-      color: #fff;
+      color: @fstColor;
       font-size: 16px;
     }
   }
   .dateDetail {
     font-size: 12px;
-    color: #fff;
+    color: @secColor;
     margin-right: 30px;
     font-weight: normal;
   }
   .monthYear {
     float: right;
     margin-right: 20px;
-    border: 1px solid @activeColor;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 4px;
-    overflow: hidden;
+    height: 30px;
+    line-height: 30px;
     cursor: pointer;
     margin-top: 7px;
+    border: 0 none;
     span {
       width: 48px;
       height: 28px;
@@ -135,13 +133,21 @@ body.console {
       display: inline-block;
       text-align: center;
       font-weight: normal;
+      float: left;
     }
     .year {
       background-color: @activeColor;
-      color: #fff;
+      border: 1px solid @activeColor;
+      color: @fstColor;
+      border-left: 0 none;
+      border-radius:0 4px 4px 0;
+      overflow: hidden;
     }
     .mon {
-      color: #fff;
+      border: 1px solid @secColor;
+      border-radius: 4px 0 0 4px;
+      border-right: 0 none;
+      color: @secColor;
     }
   }
 }
@@ -192,7 +198,7 @@ body.console {
   position: relative;
   .title {
     cursor: pointer;
-    color: #fff;
+    color: @fstColor;
   }
 }
 .btmWrap {
@@ -213,8 +219,8 @@ body.console {
     width: 100%;
   }
   .explainLi {
-    height: 30px;
-    line-height: 30px;
+    height: 22px;
+    line-height: 22px;
     span {
       display: inline-block;
     }
@@ -227,20 +233,20 @@ body.console {
       margin-right: 10px;
     }
     .deptName {
-      color: #fff;
+      color: @secColor;
       p {
         width: 110px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        color: #fff;
+        color: @secColor;
       }
       .smp {
         width: 100px;
       }
     }
     .deptNum {
-      color: #fff;
+      color: @secColor;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -248,7 +254,7 @@ body.console {
       text-align: right;
     }
     .percent {
-      color: #fff;
+      color: @secColor;
       width: 40px;
     }
   }
@@ -302,7 +308,7 @@ body.console {
     }
     .thead {
       td {
-        color: #fff;
+        color: @fstColor;
       }
     }
     .qtable {
@@ -311,23 +317,29 @@ body.console {
     }
     td {
       padding: 7px 10px;
-      color: #fff;
+      color: @fstColor;
       i {
         width: 17px;
         height: 17px;
         line-height: 17px;
         border-radius: 8px;
         background-color: #999;
-        color: #fff;
+        color: @fstColor;
         display: inline-block;
         text-align: center;
         font-size: 12px;
       }
     }
     tr {
-      border-bottom: 1px solid @themeBorderClr;
+      // border-bottom: 1px solid @themeBorderClr;
       box-sizing: border-box;
     }
+    
+    tr:nth-child(2n+1) {
+      background: #283B69;
+      /*border-bottom: 1px solid @activeBg;
+      box-sizing: border-box;*/
+    }
     .td01 {
       width: 30px;
     }
@@ -371,12 +383,12 @@ body.console {
     cursor: pointer;
     p {
       text-align: center;
-      font-weight: bold;
+      // font-weight: bold;
       font-size: 16px;
       padding-bottom: 2px;
       margin-bottom: 10px;
       cursor: pointer;
-      color: #fff;
+      color: @fstColor;
       img {
         top: 1px;
       }
@@ -413,19 +425,19 @@ body.console {
   padding: 0 15px;
   box-sizing: border-box;
   border-bottom: 1px solid @themeBorderClr;
-  font-weight: bold;
+  // font-weight: bold;
   font-size: 16px;
-  color: #fff;
+  color: @fstColor;
   cursor: pointer;
   .name {
     float: left;
     font-size: 16px;
-    color: #fff;
+    color: @fstColor;
   }
   .personNum {
     float: right;
     color: #51649C;
-    color: #fff;
+    color: @fstColor;
   }
 }
 
@@ -435,11 +447,11 @@ body.console {
   height: 36px;
   line-height: 40px;
   font-weight: bold;
-  color: #fff;
+  color: @fstColor;
 }
 .explainNum {
   margin-top: 8px;
-  color: #fff;
+  color: @fstColor;
 }
 
 .toggleSlide {
@@ -466,6 +478,7 @@ body.console {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 14px;
+      color: @fstColor;
     }
     img {
       width: 10px;
@@ -476,9 +489,9 @@ body.console {
   }
   ul {
     display: none;
-    background-color: #fff;
+    background-color: #203463;
     font-weight: normal;
-    border: 1px solid #E2E5EF;
+    border: 1px solid @darkLightBorderColor;
     z-index: 100;
     padding: 0;
     position: relative;
@@ -492,8 +505,9 @@ body.console {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 14px;
+      color: @fstColor;
       &:hover {
-        background-color: #EEF4FF;
+        background-color: #142753;
       }
     }
   }

src/css/deptScoreDetail.less

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

src/css/deptScoreDetailControl.less

@@ -37,7 +37,7 @@
         letter-spacing: 1px;
     }
     .main-body{
-        padding: 20px 35px 50px 35px;
+        padding: 20px 35px 0 35px;
         min-width: 1090px;
         box-sizing: border-box;
         /*width: 100%;*/

src/css/index.less

@@ -74,9 +74,9 @@
     height: 20px;
     line-height: 20px;
     color: #333;
-    font-weight: bold;
-    font-size: 15px;
-    text-indent: 20px;
+    // font-weight: bold;
+    font-size: 16px;
+    text-indent: 15px;
   }
 }
 .console-cont {
@@ -84,7 +84,7 @@
     background: @themeColor;
     border-bottom: 1px @themeBorderClr solid;
     .title span, .login a {
-      color: #fff;
+      color: @fstColor;
     }
   }
   .main-body {
@@ -99,14 +99,19 @@
     width: @menuWt;
     height: 100%;
     background: @themeColor;
-    border-right: 1px @themeBorderClr solid;
+    border-right: 1px @darkLightBorderColor solid;
     box-sizing: border-box;
     overflow-y: auto;
-    padding-top: 15px;
+    padding-top: 5px;
     position: relative;
     .logo{
       margin-bottom: 44px;
       text-indent: 22px;
+      img {
+        width: 150px;
+        position: relative;
+        top: 5px;
+      }
     }
     &>a{
       position: absolute;
@@ -176,11 +181,11 @@
         top:18px;
         width: 10px;
         height: 6px;
-        background: url("../images/icon_down.png") no-repeat;
+        background: url("../images/arrow_down.png") no-repeat 50% 50%;
+        background-size: 10px 6px;
       }
       p{
-        color: #fff;
-        opacity: .9;
+        color: @fstColor;
       }
       p:hover {
         color: @activeColor;
@@ -193,8 +198,7 @@
         display: none;
         li.page{
           text-indent: 52px;
-          color: #fff;
-          opacity: .6;
+          color: @secColor;
           &.active{
             color: @activeColor;
             opacity: 1;
@@ -213,7 +217,7 @@
       line-height: @menuLiHt;
       text-indent: 15px;
       cursor: pointer;
-      color: #fff;
+      color: @fstColor;
     }
     .copy-right{
       position: fixed;
@@ -227,8 +231,7 @@
       border-right: 1px rgba(74, 93, 142, 0.5) solid;
       p{
         font-size:12px;
-        opacity: .3;
-        color: #fff;
+        color: @trdColor;
       }
     }
   }

src/css/itemManager.less

@@ -16,7 +16,7 @@
     }
     .main-body{
         margin: 10px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         .table;

src/css/jiaji.less

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

src/css/partDetail.less

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

src/css/partDetailControl.less

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

src/css/payDetail.less

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

src/css/qcList.less

@@ -13,7 +13,7 @@ h2{
 .main-body{
     margin: 10px 0;
     min-width: 1090px;
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     // overflow: auto;
 }
 table{
@@ -34,13 +34,16 @@ table{
             height: 14px;
             margin-left: 4px;
             vertical-align: middle;
-            background: url("../images/grey.png");
+            background-size: 100%;
+            background-image: url("../images/grey.png");
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

src/css/qcListDept.less

@@ -12,7 +12,7 @@ h2{
 }
 .main-body{
     margin: 10px 0;    
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }
@@ -38,9 +38,11 @@ table{
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

src/css/qcListPerson.less

@@ -12,13 +12,18 @@ h2{
 }
 .main-body{
     margin: 10px 0;
-    padding: 0 35px 50px 35px;
+    padding: 0 35px;
     min-width: 1090px;
     /*width: 100%;*/
 }
 table{
     .table;
     min-width: 1090px;
+    border:1px solid #E2E5EF;
+    border-collapse: collapse;
+    thead th{
+        background: #EFF0F9;
+    }
     th,td{
         padding:5px 10px;
     }
@@ -38,9 +43,11 @@ table{
         }
         &.asc:after{
             background: url("../images/up_blue.png");
+            background-size: 100%;
         }
         &.desc:after{
             background: url("../images/down_blue.png");
+            background-size: 100%;
         }
     }
     td{

src/css/quexianDetail.less

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

src/css/quexianDetailControl.less

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

src/css/reset.less

@@ -119,7 +119,13 @@ textarea {
 @menuWt:205px;   /*菜单宽度*/
 @themeColor:#203463;    //主题背景色
 @themeFontClr:#fff;   //主题字体色
-@themeBorderClr:rgba(74, 93, 142, 0.5);    //主题边框色
+@greyColor:#A5ADBF;    //灰色二级
+@fstColor:#E9EBEF;    //重要一级，菜单
+@secColor:#A5ADBF;    //重要二级，菜单
+@trdColor:#6D7A97;    //版权重要三级
+@darkLightBorderColor:#344876;    //深色背景的分割线，border，浅色
+@darkDeepBorderColor:#4A5D8E;    //深色背景的分割线，border，深点
+@themeBorderClr:#344876;    //主题边框色
 @activeColor:#00A1FF;   /*菜单项选中颜色*/
 @activeBg:#142753;   /*菜单项选中背景*/
 @borderColor:#E2E5EF; /**边框颜色**/
@@ -358,18 +364,18 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   p {
     display: inline-block;
     font-size: 16px;
-    color: #51649C;
+    color: @themeColor;
     a {
       font-size: 16px;
-      color: #51649C;
+      color: @themeColor;
       opacity: 70%;
     }
     span {
-      color: #51649C;
+      color: @themeColor;
       font-size: 16px;
     }
     i {
-      color: #51649C;
+      color: @themeColor;
     }
   }
   .dateDetail {
@@ -405,7 +411,9 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
     }
   }
 }
-
+.partTitlePub span {
+  color: @fstColor !important;
+}
 .filterBox {
   /*.filter {
     display: inline-block;

src/css/tiaomu.less

@@ -91,7 +91,7 @@
     }
     .main-body{
         margin: 20px 40px;
-        padding-bottom: 50px;
+        padding-bottom: 0px !important;
     }
     table{
         .table;

src/html/console.html

@@ -8,7 +8,7 @@
 <body class="console">
   <div class="partTitle">
     <p><span></span>质控科数据概览</p>
-    <div class="monthYear">
+    <div class="monthYear clearfix">
       <span class="mon">本月</span>
       <span class="year">本年</span>
     </div> 

src/html/deptConsole.html

@@ -13,7 +13,7 @@
   </div>
   <div class="partTitle">
     <p><span></span><i></i>数据概览</p>
-    <div class="monthYear">
+    <div class="monthYear clearfix">
       <span class="mon">本月</span>
       <span class="year">本年</span>
     </div> 

src/html/qcList.html

@@ -80,7 +80,7 @@
                     <th class="patientage textCenter" code="age">年龄</th>
                     <th class="bedNum textCenter" code="bed_code">床号</th>
                     <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                    <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                    <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                     <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                     <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                     <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

src/html/qcListDept.html

@@ -79,7 +79,7 @@
                         <th class="patientage textCenter" code="age">年龄</th>
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                        <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

src/html/qcListPerson.html

@@ -79,7 +79,7 @@
                         <th class="patientage textCenter" code="age">年龄</th>
                         <th class="bedNum textCenter" code="bed_code">床号</th>
                         <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th>
-                        <th class="outHospitalDate textCenter" code="leave_hospital_date">出院日期</th>
+                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
                         <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th>
                         <th class="doctorName textCenter" code="doctor_name">主管医生</th>
                         <th class="doctorName textCenter" code="director_doctor_name">主任医生</th>

src/js/console.js

@@ -26,6 +26,9 @@ $(function(){
     initConsole()//质控列表
     getBarData(2)//图标数据获取
     dateChange()
+    $(window).resize(function(){
+        resizeBox()
+    })
     $(window).click(function(){
         window.parent.userActionHide()
         $(".toggleSlide ul").css("display","none")
@@ -64,22 +67,33 @@ $(function(){
 function getDetails(){
     $(".part02 .bingli,.part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
     })
     $(".part03 .partTitlePub").click(function(){
-      hospital=="台州市立"?focusMenuItem("YH-ZKK-GKSJJBLZB_XQ"):focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+        if(hospital=="台州市立"){
+            focusMenuItem("YH-ZKK-GKSJJBLZB_XQ")
+            $(parent.document).find("#contentIframe").attr("src","./jiaji.html?from=1&dateType="+dateType)
+        }else{
+            focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
+        }
     })
     $(".paymoney.pubEchart .title").click(function(){
         if($(this).text().indexOf("花费")!==-1){
-          focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+            focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./payDetail.html?from=1&dateType="+dateType)
         }else{
-          focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+            focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
         }
     })
     $(".defect .partTitlePub").click(function(){//from 1 console / 2  deptConsole
         focusMenuItem("YH-ZKK-GMKQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType)
     })
     $(".circleB .title").click(function(){
-      focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./tiaomuControl.html?from=1&dateType="+dateType)
     })
 }
 
@@ -98,34 +112,34 @@ function resizeBox(){
     })
 }
 //所有数据切换日期筛选
-function dateChange(){
-    $(".monthYear .mon").click(function(){
-        $(this).css({
-            backgroundColor:'#00A1FF',
-            color:'#fff',
-            opacity:'0.9',
-        }).siblings().css({
-            color:'#fff',
-            opacity:'0.6',
-            backgroundColor:'#203463'
+    function dateChange(){
+        $(".monthYear .mon").click(function(){
+            $(this).css({
+                backgroundColor:'#00A1FF',
+                color:'#E9EBEF',
+               "border-color":'#00A1FF'
+            }).siblings().css({
+                "border-color":'#A5ADBF',
+                color:'#A5ADBF',
+                backgroundColor:'#203463'
+            })
+            dateType = 1
+            getBarData(1)
         })
-        dateType = 1
-        getBarData(1)
-    })
-    $(".monthYear .year").click(function(){
-        $(this).css({
-            backgroundColor:'#00A1FF',
-            color:'#fff',
-            opacity:'0.9',
-        }).siblings().css({
-            color:'#fff',
-            opacity:'0.6',
-            backgroundColor:'#203463'
+        $(".monthYear .year").click(function(){
+            $(this).css({
+                backgroundColor:'#00A1FF',
+                color:'#E9EBEF',
+                "border-color":'#00A1FF'
+            }).siblings().css({
+                "border-color":'#A5ADBF',
+                color:'#A5ADBF',
+                backgroundColor:'#203463'
+            })
+            dateType = 2
+            getBarData(2)
         })
-        dateType = 2
-        getBarData(2)
-    })
-}
+    }
 //控制台数
 function initConsole(result){
     let url = {
@@ -415,14 +429,14 @@ function part02pan(data,dom){
                 rich: {
                     val: {
                         fontSize: 12,
-                        color: '#fff',
+                        color: '#E9EBEF',
                         /*fontWeight: 'bold',*/
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#777',
+                        color: '#E9EBEF',
                     }
                 }
             }
@@ -477,7 +491,7 @@ function lineChart(dataX,dataY){
             left: 0,
             textStyle: {
                 fontSize: 14,
-                color:'#fff',
+                color:'#E9EBEF',
                 fontWeight: 400
             }
         }],
@@ -506,7 +520,7 @@ function lineChart(dataX,dataY){
             data: dataX,
             axisLabel: {//x轴刻度
                 textStyle: {
-                    color: '#fff'
+                    color: '#E9EBEF'
                 },
                 rotate:'45',
                 formatter: function (value) {
@@ -519,7 +533,7 @@ function lineChart(dataX,dataY){
             },
             axisLine: {//x轴
                 lineStyle:{
-                    color:'#fff'
+                    color:'#4A5D8E'
                 }
             }
         },
@@ -528,7 +542,7 @@ function lineChart(dataX,dataY){
             axisLabel: {
                 formatter: '{value} %',
                 textStyle: {
-                    color: '#fff'
+                    color: '#E9EBEF'
                 }
             },
             
@@ -540,7 +554,7 @@ function lineChart(dataX,dataY){
             },
             splitLine:{//分割线
                 lineStyle:{
-                    color:'#EFF3FC'
+                    color:'#344876'
                 }
             }
         },
@@ -585,7 +599,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     },
                     rotate:45,
                     formatter: function (value) {
@@ -598,7 +612,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLine: {//x轴
                     lineStyle:{
-                        color:'#fff'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -614,12 +628,12 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//y轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#4A5D8E'
+                        color:'#344876'
                     }
                 }
             }
@@ -631,7 +645,7 @@ function lineChartSpecial(dataX,dataY){
             left: 10,
             textStyle: {
                 fontSize: 14,
-                color:'#fff',
+                color:'#E9EBEF',
                 fontWeight: 400
             }
         }],
@@ -677,7 +691,7 @@ function barChartPay(dataX,dataY){
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     },
                     rotate:45,
                     formatter: function (value) {
@@ -690,7 +704,7 @@ function barChartPay(dataX,dataY){
                 },
                 axisLine: {//x轴
                     lineStyle:{
-                        color:'#AAAAAA'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -706,12 +720,12 @@ function barChartPay(dataX,dataY){
                 },
                 axisLabel: {//y轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#4A5D8E'
+                        color:'#344876'
                     }
                 }
             }
@@ -723,7 +737,7 @@ function barChartPay(dataX,dataY){
             left: 10,
             textStyle: {
                 fontSize: 14,
-                color:'#fff',
+                color:'#E9EBEF',
                 fontWeight: 400
             }
         }],
@@ -856,7 +870,7 @@ function barChart(data,type){
             left: 10,
             textStyle: {
                 fontSize: 14,
-                color:'#fff',
+                color:'#E9EBEF',
                 fontWeight: 400
             }
         }],
@@ -867,7 +881,7 @@ function barChart(data,type){
             top:15,
             selectedMode:false,
             textStyle:{
-                color:'#fff'
+                color:'#E9EBEF'
             },
             formatter: function (name) {
                 return name;
@@ -893,7 +907,7 @@ function barChart(data,type){
                 data:  dataX,
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     },
                     rotate:'45',
                     formatter: function (value) {
@@ -922,12 +936,12 @@ function barChart(data,type){
                 },
                 axisLabel: {//y轴刻度
                   textStyle: {
-                    color: '#fff'
+                    color: '#E9EBEF'
                   }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#4A5D8E'
+                        color:'#344876'
                     }
                 }
             }
@@ -985,14 +999,14 @@ function emptyCircle(data){
                 rich: {
                     val: {
                         fontSize: 24,
-                        color: '#fff',
+                        color: '#E9EBEF',
                         fontWeight: 'bold',
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#fff',
+                        color: '#E9EBEF',
                     }
                 }
             }
@@ -1079,14 +1093,14 @@ function emptyCircleB(data){
                 rich: {
                     val: {
                         fontSize: 24,
-                        color: '#fff',
+                        color: '#E9EBEF',
                         fontWeight: 'bold',
                         padding: [10, 0]
                     },
                     name: {
                         fontSize: 12,
                         fontWeight: 'normal',
-                        color: '#fff',
+                        color: '#E9EBEF',
                     }
                 }
             }

src/js/dayDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/dayDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -20,8 +20,27 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 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'
+    })
+}
 $(".abnormalClear").click(function(){
-    // window.location.reload()
         behospitalCode = ""
         $(".patientNumInp").val("")
         getTabData(1)

src/js/deptConsole.js

@@ -51,9 +51,11 @@ function tiaomu(){
     });
     $(".homePage .title").click(function(){
         focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
+        $(parent.document).find("#contentIframe").attr("src","partDetail.html?from=2&deptName="+curDept+"&dateType="+dateType)
     });
     $(".part02 .bingli,.part02 .bingliLis").click(function(){
         focusMenuItem("YH-KSZR-KSQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html?from=2&deptName="+curDept+"&dateType="+dateType)
     });
 }
 //判断有无某一权限
@@ -75,9 +77,11 @@ function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#E9EBEF',
+           "border-color":'#00A1FF'
         }).siblings().css({
-            color:'#fff',
+            "border-color":'#A5ADBF',
+            color:'#A5ADBF',
             backgroundColor:'#203463'
         })
         dateType = 1
@@ -86,9 +90,11 @@ function dateChange(){
     $(".monthYear .year").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#E9EBEF',
+            "border-color":'#00A1FF'
         }).siblings().css({
-            color:'#fff',
+            "border-color":'#A5ADBF',
+            color:'#A5ADBF',
             backgroundColor:'#203463'
         })
         dateType = 2
@@ -144,7 +150,7 @@ function getOwnDept(){
                 let result = data.data
                 renderDeptLis(result)//科室tab渲染
                 curDept = result[0].deptName
-                $(".partTitle p i,.toggleSlide p span").html(curDept).attr("title",curDept)
+                $(".partTitle p i,.toggleSlide p span").html(curDept).attr({"title":curDept,'data-dept':curDept})
                 getBarData(2)//图标数据获取
             }else {
                 $(".partTitle p i,.toggleSlide p span").html('--')
@@ -165,8 +171,8 @@ function renderDeptLis(data){
     $(".toggleSlide ul li").click(function(){
         let name = $(this).attr("data-dept")
         curDept = name
-        $(this).parent().slideToggle().prev().find("span").html(name).attr("title",name)
-        $(".partTitle p i").html(name).attr("title",name)
+        $(this).parent().slideToggle().prev().find("span").html(name).attr({"title":name,'data-dept':curDept})
+        $(".partTitle p i").html(name).attr({"title":name,'data-dept':curDept})
         personNum(datafst[name]||[])
         setNumDetail(datasec[name]||[])
         queList(datatrd[name]||[])
@@ -273,7 +279,7 @@ function lineChartSpecial(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -296,7 +302,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     },
                     rotate:45,
                     formatter: function (value) {
@@ -325,12 +331,12 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//y轴刻度
                     textStyle: {
-                        color: '#fff'
+                        color: '#E9EBEF'
                     }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#4A5D8E'
+                        color:'#344876'
                     }
                 }
             }
@@ -486,7 +492,9 @@ function part02pan(data,dom){
 }
 //柱状图住院日期
 function emptyCircleB(data){
+    if(!document.getElementById('emptyCircleB'))return
     var myChart = echarts.init(document.getElementById('emptyCircleB'));
+    return
     $(window).resize(function(){
         myChart.resize()
     });
@@ -687,7 +695,7 @@ function queList(data){
     for(let i = 0;i < data.length;i++){
         strAll += `
             <tr>
-                <td style="text-align:center;"><i style="background:${i < 3?'#bea571':'#eff3fc'};color:${i < 3?'#fff':'#999'};">${i+1}</i></td>
+                <td style="text-align:center;"><i style="background:${i < 3?'#ECB22E':'#526186'};color:${i < 3?'#fff':'#B7BDCC'};">${i+1}</i></td>
                 <td>${data[i].name}</td>
                 <td>${data[i].num}</td>
                 <td>${data[i].percentStr}</td>

src/js/deptScoreDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -17,13 +17,48 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".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,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,deptList=[],
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
-let deptList = JSON.parse(getCookie("deptList"))||[]
+$(function(){
+    deptList = JSON.parse(getCookie("deptList"))||[]
+    let srcUrl = $("#contentIframe",parent.document).attr("src")
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+    console.log(deptIdTemp,deptId)
+    if(statisticsType == 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(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
+    getTabData(1)
+
+  })
+
+
 $(".abnormalClear").click(function(){
-    // window.location.reload()
-    deptId = deptList[0].deptName
+    deptId = deptIdTemp = deptList[0].deptName
     behospitalCode = ""
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
@@ -49,13 +84,15 @@ $('.iconCalen').on("click", function(e){
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
-    $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
-    deptIdTemp = deptList[0].deptName
-    deptId = deptList[0].deptName
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
+    // $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
@@ -106,6 +143,7 @@ function dateChange(){
 }
 
 function getTabData(activePage){
+    console.log(deptIdTemp,deptId,7878778)
     const param = {
         "asc": "",
         "deptName": deptId||"",
@@ -135,7 +173,6 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
 
 $(".filter").on("click", function(e){
     name = nameTemp
@@ -348,7 +385,7 @@ $('.selectDept').on("click", function(e){
 function rendeDeptList(deptList){
     let str = `<li class="deptItem " 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>`
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptName} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
 }

src/js/deptScoreDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 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'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     behospitalCode = ""

src/js/index.js

@@ -14,6 +14,11 @@ $(function(){
   $(".main").css({
     height:$(window).height()-52+'px'
   })
+  $(window).resize(function(){
+    $(".main").css({
+      height:$(window).height()-52+'px'
+    })
+  })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")
   })

src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -20,12 +20,31 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 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'
+    })
+}
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")
     getTabData(1)
 })
-
 $(".partTitle a").click(function(){
     //初始菜单选中
     $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");

src/js/moduleManager.js

@@ -10,7 +10,7 @@ const {post,getCookie} = require('./utils.js')
 function setTbaleInfoHei(){
  
     $(".tableInfo").css({
-        height:$(window).height()-180+'px'
+        height:$(window).height()-140+'px'
     })
 }
 setTbaleInfoHei()

src/js/mukuai.js

@@ -21,11 +21,36 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    isReject = 2||getUrlArgObjectNew("dateType",srcUrl)
-    // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isReject = getUrlArgObjectNew("dateType",srcUrl)||2
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
-    
+    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(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
     $(".partTitle a").click(function(){
         //初始菜单选中
         focusMenuItem('YH-KZTKS')

src/js/mukuaiControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    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'
+        })
+    }
 })
 function focusMenuItem(code){
     const ele = $(parent.document).find(".menu .page[code="+code+"]");

src/js/partDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -21,8 +21,39 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 let deptList = JSON.parse(getCookie("deptList"))||[]
+$(function(){
+    let srcUrl = $("#contentIframe",parent.document).attr("src")
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||2
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    if(statisticsType == 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(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
+})
+
 $(".abnormalClear").click(function(){
-    // window.location.reload()
     deptId = deptList[0].deptName
     behospitalCode = ""
     $(".patientNumInp").val("")
@@ -60,18 +91,19 @@ $('.iconCalen').on("click", function(e){
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
 //科室处理
-getDeptList()
-function getDeptList(){
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
-    $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
-    deptIdTemp = deptList[0].deptName
-    deptId = deptList[0].deptName
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
     }
     $(".partDetail .filterDropList").html(str)
+    getTabData(1)
 }
 
 dateChange()
@@ -142,7 +174,6 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
 
 $(".filter").on("click", function(e){
     name = nameTemp

src/js/partDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 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'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     $(".patientNumInp").val("")

src/js/payDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/payDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 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'
+      })
+  }
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")

src/js/qcList.js

@@ -19,7 +19,7 @@ $(".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="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc=[],data_asc=[];
+  data_desc=["leave_hospital_date"],data_asc=[];
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){

src/js/qcListDept.js

@@ -18,7 +18,7 @@ const arrowRight = require("./../images/arrow_right.png")
 $(".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=[];
+  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=["leave_hospital_date"],data_asc=[];
 //   $(".abnormalClear").click(function(){
 //     window.location.reload()
 // })

src/js/qcListPerson.js

@@ -24,7 +24,7 @@ $('.selectDoctor').html(doctorName_global)
 $(".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=doctorName_global, doctorNameTemp=doctorName_global,data_desc=[],data_asc=[];
+  behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global,data_desc=["leave_hospital_date"],data_asc=[];
 
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){

src/js/tiaomu.js

@@ -21,8 +21,36 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    deptId = deptIdTemp = deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",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(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
     getTabData(1)//条目缺陷
     
     $(".partTitle a").click(function(){
@@ -88,10 +116,14 @@ $('.selectDept').on("click", function(e){
 })
 
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
     $(".tiaomu .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]

src/js/tiaomuControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    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'
+        })
+    }
 })
 bindDeptSelect()
 //科室选择