Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/js/console.js
#	src/js/deptConsole.js

src/css/console.less

@@ -2,6 +2,7 @@
 
 body.console {
   overflow: auto;
+  overflow-y: hidden;
   background: @activeBg;
 }
 .echarts {
@@ -31,6 +32,7 @@ body.console {
   background: @activeBg;
   min-width: 1185px;
   padding: 10px;
+  padding-bottom: 0px;
   box-sizing: border-box;
   ul {
     padding: 0 40px;
@@ -79,8 +81,20 @@ body.console {
     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;
@@ -165,7 +179,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;
@@ -207,8 +220,9 @@ body.console {
   right: 0;
   padding-right: 30px;
   box-sizing: border-box;
-  max-height: 180px;
+  height: 180px;
   overflow: auto;
+  margin-top: -90px;
   table {
     width: 100%;
   }
@@ -374,6 +388,10 @@ body.console {
       font-weight: bold;
       font-size: 16px;
       padding-bottom: 5px;
+      cursor: pointer;
+      img {
+        top: 1px;
+      }
     }
   }
   .panPartPub {
@@ -415,6 +433,7 @@ body.console {
     // width: 100%;
     padding-left: 15px;
     background: @themeColor;
+    box-sizing: border-box;
   }
 }
 

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;
@@ -278,9 +289,10 @@ body.console {
   }
   
   .defect {
-    background-color: #fff;
+    background-color: @themeColor;
     height: 452px;
     overflow: hidden;
+    border-bottom: 10px solid @themeBorderClr;
     .list {
       padding: 15px 5px;
       width: 100%;
@@ -290,7 +302,7 @@ body.console {
     }
     .thead {
       td {
-        color: #51649C;
+        color: #fff;
       }
     }
     .qtable {
@@ -299,6 +311,7 @@ body.console {
     }
     td {
       padding: 7px 10px;
+      color: #fff;
       i {
         width: 17px;
         height: 17px;
@@ -312,7 +325,7 @@ body.console {
       }
     }
     tr {
-      border-bottom: 1px solid #f5f5f5;
+      border-bottom: 1px solid @themeBorderClr;
       box-sizing: border-box;
     }
     .td01 {
@@ -333,14 +346,14 @@ body.console {
   // border-right: 10px solid #f5f5f5;
   box-sizing: border-box;
   width: 62%;
-  background-color: #fff;
+  background-color: @themeColor;
   .bingli {
     padding: 20px;
     li {
       float: left;
       width: 23%;
       text-align: center;
-      border-right: 1px solid #E2E5EF;
+      border-right: 1px solid @themeBorderClr;
     }
     .fst {
       // border-right: 1px solid #E2E5EF;
@@ -352,7 +365,7 @@ body.console {
     }
   }
   .bingliLis {
-    border-top: 1px solid #E2E5EF;
+    border-top: 1px solid @themeBorderClr;
     padding: 20px 30px;
     p {
       text-align: center;
@@ -360,6 +373,11 @@ body.console {
       font-size: 16px;
       padding-bottom: 2px;
       margin-bottom: 10px;
+      cursor: pointer;
+      color: #fff;
+      img {
+        top: 1px;
+      }
     }
   }
   .panPartPub {
@@ -392,17 +410,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;
   }
 }
 
@@ -412,9 +433,11 @@ body.console {
   height: 36px;
   line-height: 40px;
   font-weight: bold;
+  color: #fff;
 }
 .explainNum {
   margin-top: 8px;
+  color: #fff;
 }
 
 .toggleSlide {
@@ -478,7 +501,7 @@ body.console {
   position: relative;
   .homePage {
     width: 45%;
-    border-right: 10px solid #f5f5f5;
+    border-right: 10px solid @themeBorderClr;
     box-sizing: border-box;
   }
   .homePageNo {

src/html/console.html

@@ -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>
@@ -114,7 +114,7 @@
       <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>
@@ -124,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>

src/html/deptConsole.html

@@ -51,7 +51,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">
   
@@ -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>
@@ -94,7 +94,7 @@
           </div>
         </div>
         <div class="circleB circleBSingle clearfix">
-          <p class="title">条目缺陷占比</p>
+          <p class="title">条目缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div id="emptyCircleB" class="emptyCircle"></div>
           <div class="explainPan explainPanB">
             <table>
@@ -104,11 +104,11 @@
         </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>

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>

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>

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>

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($){

src/js/console.js

@@ -90,7 +90,7 @@ function hasData(data){
   }
 function resizeBox(){
     $(".partWrap").css({
-        height:$(window).height()-84+'px'
+        height:$(window).height()-44+'px'
     })
 }
 //所有数据切换日期筛选
@@ -554,7 +554,7 @@ function lineChartSpecial(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -646,7 +646,7 @@ function barChartPay(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color: ['#3398DB'],
+        color: ['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -1179,9 +1179,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'];

src/js/deptConsole.js

@@ -77,8 +77,8 @@ function dateChange(){
             backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#00A1FF',
-            backgroundColor:'#fff'
+            color:'#fff',
+            backgroundColor:'#203463'
         })
         dateType = 1
         getBarData(1)
@@ -88,8 +88,8 @@ function dateChange(){
             backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#00A1FF',
-            backgroundColor:'#fff'
+            color:'#fff',
+            backgroundColor:'#203463'
         })
         dateType = 2
         getBarData(2)
@@ -146,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('--')
         })
     // }
 }
@@ -292,7 +296,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//x轴刻度
                     textStyle: {
-                        color: '#333'
+                        color: '#fff'
                     },
                     rotate:45,
                     formatter: function (value) {
@@ -305,7 +309,7 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLine: {//x轴
                     lineStyle:{
-                        color:'#AAAAAA'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -321,12 +325,12 @@ function lineChartSpecial(dataX,dataY){
                 },
                 axisLabel: {//y轴刻度
                     textStyle: {
-                        color: '#333333'
+                        color: '#fff'
                     }
                 },
                 splitLine:{//分割线
                     lineStyle:{
-                        color:'#EFF3FC'
+                        color:'#4A5D8E'
                     }
                 }
             }
@@ -338,7 +342,7 @@ function lineChartSpecial(dataX,dataY){
             left: 10,
             textStyle: {
                 fontSize: 14,
-                color:'#666666',
+                color:'#fff',
                 fontWeight: 400
             }
         }],
@@ -443,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 + '}',
@@ -453,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',
                     }
                 }
             }
@@ -495,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 + '}':'',
@@ -505,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',
                     }
                 }
             }
@@ -535,7 +539,7 @@ function emptyCircleB(data){
             hoverOffset:5,
             itemStyle: {
                 normal: {
-                    borderColor: bgColor,
+                    // borderColor: bgColor,
                     borderWidth: 2
                 }
             },
@@ -590,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 + '}':'',
@@ -600,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',
                     }
                 }
             }
@@ -630,7 +634,7 @@ function emptyCircleBc(data){
             hoverOffset:5,
             itemStyle: {
                 normal: {
-                    borderColor: bgColor,
+                    // borderColor: bgColor,
                     borderWidth: 2
                 }
             },
@@ -639,7 +643,7 @@ function emptyCircleBc(data){
                     length: 20,
                     length2: 120,
                     lineStyle: {
-                        color: '#e6e6e6'
+                        color: '#fff'
                     }
                 }
             },
@@ -657,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'
                         }
                     }
                 }

src/js/deptScoreDetail.js

@@ -157,7 +157,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)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
@@ -552,8 +555,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($){

src/js/deptScoreDetailControl.js

@@ -141,7 +141,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)
     $(".goHomeDetail").click(function(){
         let deptName = $(this).attr("data-dept")

src/js/index.js

@@ -12,7 +12,7 @@ $(function(){
   //菜单展开收起
   sureChangeWord()
   $(".main").css({
-    height:$(window).height()-60+'px'
+    height:$(window).height()-52+'px'
   })
   $("body").on('focus',".modalAction input",function(){
     $(this).attr("type","password")
@@ -46,8 +46,8 @@ 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");
   }
   //菜单收起展开
@@ -95,8 +95,8 @@ function initMenu(data,userInfo){
     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");
@@ -113,7 +113,6 @@ function getOwnDept(){
           let data = res.data;
           if(data.code == 0){
               let result = data.data
-              curDept = result[0].deptName
               setCookie("deptList",JSON.stringify(result))
           }
       })

src/js/mukuai.js

@@ -28,13 +28,23 @@ $(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()
     })
 })
+
+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(){
@@ -213,7 +223,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 +470,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)
 })

src/js/mukuaiControl.js

@@ -27,13 +27,22 @@ $(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()
     })
 })
+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 +221,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)
 }
 

src/js/partDetail.js

@@ -25,10 +25,20 @@ $(".abnormalClear").click(function(){
     window.location.reload()
 })
 $(".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 +66,6 @@ function getDeptList(){
     $(".partDetail .filterDropList").html(str)
 }
 
-
 dateChange()
 //所有数据切换日期筛选
 function dateChange(){
@@ -150,7 +159,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)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
@@ -538,8 +550,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($){

src/js/partDetailControl.js

@@ -133,8 +133,11 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    console.log(str)
-    $('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")
@@ -529,8 +532,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($){

src/js/payDetail.js

@@ -138,15 +138,15 @@ 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>

src/js/qcList.js

@@ -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++){

src/js/qcListDept.js

@@ -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++){

src/js/qcListPerson.js

@@ -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++){

src/js/quexianDetail.js

@@ -24,7 +24,7 @@ $(function(){
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     docName = getUrlArgObjectNew("docName",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
-    isReject = getUrlArgObjectNew("shijian",srcUrl)||""
+    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -46,19 +46,36 @@ $(function(){
     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')
+            console.log(999)
+        })
     }
 })
+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(){
@@ -242,7 +259,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)
 }
 

src/js/quexianDetailControl.js

@@ -23,7 +23,7 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
-    isReject = getUrlArgObjectNew("shijian",srcUrl)||""
+    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
@@ -242,7 +242,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)
 }
 

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)
 }
 

src/js/tiaomu.js

@@ -27,13 +27,22 @@ $(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()
     })
 })
+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(){
@@ -243,7 +252,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)
 }
 
@@ -487,4 +499,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)
+})

src/js/tiaomuControl.js

@@ -241,7 +241,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)
 }
 

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)
 }