Merge remote-tracking branch 'origin/version1.2.1' into version1.2.1

src/css/console.less

@@ -7,6 +7,35 @@ body.console {
   .innerOuter {
     display: none;
   }
+  .barChartLineEmpty {
+    height: 257px;
+    display: none;
+  }
+  .chuyuanEmpty {
+    border-bottom: 10px solid @activeBg;
+    height: 112px;
+    .emptyBoxHome {
+      margin-top: -40px;
+    }
+    box-sizing: border-box;
+  }
+  #emptyCircleWrapEmpty {
+    height: 214px;
+    display: none;
+  }
+  .barChartPayEmpty {
+    display: none;
+    height: 261px;
+  }
+  .pingfendengji {
+    display: none;
+    .pingfendengjiEmpty {
+      height: 210px;
+    }
+    .title {
+      cursor: default;
+    }
+  }
 }
 .echarts {
   width: 100%;
@@ -23,6 +52,13 @@ body.console {
   float: left;
   margin-top: 38px;
 }
+.emptyCircleWrap {
+  // height: 214px;
+}
+.emptyCircleBWrap {
+  display: none;
+  height: 215px;
+}
 #emptyCircleB {
   margin-top: 50px;
 }
@@ -84,6 +120,9 @@ body.console {
     line-height: 40px;
     padding-left: 15px;
     cursor: pointer;
+    span {
+      color: @fstColor;
+    }
     img {
       width: 16px;
       position: relative;
@@ -258,6 +297,9 @@ body.console {
       }
       .smp {
         width: 100px;
+        &:hover {
+          color: @activeColor;
+        }
       }
     }
     .deptNum {
@@ -283,10 +325,16 @@ body.console {
   background-color: @themeColor;
   border-right: 10px solid @activeBg;
   box-sizing: border-box;
+  .chuyuan {
+    height: 113px;
+    border-bottom: 10px solid @activeBg;
+    box-sizing: border-box;
+  }
   ul {
     padding: 15px 20px;
-    border-bottom: 10px solid @activeBg;
-    /*background: @themeColor;*/
+    // border-bottom: 10px solid @activeBg;
+    height: 112px;
+    box-sizing: border-box;
     li {
       float: left;
       width: 33.33%;
@@ -329,6 +377,10 @@ body.console {
         padding: 1px 0;
       }
     }
+    .qtableEmpty {
+      height: 363px;
+      display: none;
+    }
     td {
       padding: 7px 10px;
       color: @fstColor;

src/css/deptConsole.less

@@ -3,6 +3,33 @@
 body.console {
   overflow: auto;
   background-color: @themeColor;
+  .chuyuanEmpty {
+    border-bottom: 10px solid @activeBg;
+    height: 162px;
+    box-sizing: border-box;
+  }
+  .pingfendengji {
+    display: none;
+    .pingfendengjiEmpty {
+      height: 270px;
+    }
+    .title {
+      cursor: default;
+      color: @fstColor;
+    }
+  }
+  .emptyCircleBWrap {
+    display: none;
+    height: 312px;
+  }
+  .emptyCircleBWraps {
+    display: none;
+    height: 312px;
+  }
+  .emptyLineCircleEmpty {
+    display: none;
+    height: 312px;
+  }
 }
 .echarts {
   width: 100%;
@@ -295,7 +322,7 @@ body.console {
   
   .defect {
     background-color: @themeColor;
-    height: 455px;
+    height: 451px;
     overflow: hidden;
     /*border-bottom: 10px solid @activeBg;*/
     .list {
@@ -314,6 +341,10 @@ body.console {
       width: 100%;
       overflow: auto;
     }
+    .qtableEmpty {
+      height: 375px;
+      display: none;
+    }
     td {
       padding: 7px 10px;
       color: @fstColor;

src/css/reset.less

@@ -493,4 +493,18 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
 }
 .toggleSlide p {
   border: 1px solid #506597 !important;
+}
+.emptyBoxHome {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  top: 50%;
+  margin-top: -48px;
+  img {
+    width: 50px;
+  }
+  p {
+    color: #637192;
+    margin-top: 5px;
+  }
 }

src/html/console.html

@@ -25,65 +25,79 @@
           <span class="name">出院人数统计</span>
           <span class="personNum">总人数：</span>
         </p>
-        <ul class="clearfix" style="cursor: default;">
-          <li>
-            <p class="numShow died"></p>
-            <p class="explainNum">死亡人数</p>
-          </li>
-          <li class="li02">
-            <p class="numShow newborn"></p>
-            <p class="explainNum">新生儿人数</p>
-          </li>
-          <li class="li03">
-            <p class="numShow patientNum"></p>
-            <p class="explainNum">手术病人数</p>
-          </li>
-        </ul>
+        <div class="chuyuan">
+          <ul class="clearfix" style="cursor: default;">
+            <li>
+              <p class="numShow died"></p>
+              <p class="explainNum">死亡人数</p>
+            </li>
+            <li class="li02">
+              <p class="numShow newborn"></p>
+              <p class="explainNum">新生儿人数</p>
+            </li>
+            <li class="li03">
+              <p class="numShow patientNum"></p>
+              <p class="explainNum">手术病人数</p>
+            </li>
+          </ul>
+        </div>
+        <div class="chuyuanEmpty"></div>
         <div class="defect">
           <p class="partTitlePub">各模块缺陷占比排名 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="list">
             <table class="qtable">
   
             </table>
+            <div class="qtableEmpty">
+
+            </div>
           </div>
         </div>
       </div>
       <div class="part02 fl">
-        <ul class="bingli clearfix">
-          <li class="fst">
-            <p class="numShow"></p>
-            <p class="explainNum">累计质控病历数</p>
-          </li>
-          <li>
-            <p class="numShow"></p>
-            <p class="explainNum">甲级病历</p>
-          </li>
-          <li>
-            <p class="numShow"></p>
-            <p class="explainNum">乙级病历</p>
-          </li>
-          <li>
-            <p class="numShow"></p>
-            <p class="explainNum">丙级病历</p>
-          </li>
-        </ul>
-        <div class="bingliLis clearfix">
-          <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
-          <div class="panPartPub panPart02">
-            <div class="fen" id="fen01"></div>
-            <p>甲级占比</p>
-          </div>
-          <div class="panPartPub panPart01">
-            <div class="fen" id="fen02"></div>
-            <p>乙级占比</p>
+        <div class="bldjs">
+          <ul class="bingli clearfix">
+            <li class="fst">
+              <p class="numShow"></p>
+              <p class="explainNum">累计质控病历数</p>
+            </li>
+            <li>
+              <p class="numShow"></p>
+              <p class="explainNum">甲级病历</p>
+            </li>
+            <li>
+              <p class="numShow"></p>
+              <p class="explainNum">乙级病历</p>
+            </li>
+            <li>
+              <p class="numShow"></p>
+              <p class="explainNum">丙级病历</p>
+            </li>
+          </ul>
+          <div class="bingliLis clearfix">
+            <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
+            <div class="panPartPub panPart02">
+              <div class="fen" id="fen01"></div>
+              <p>甲级占比</p>
+            </div>
+            <div class="panPartPub panPart01">
+              <div class="fen" id="fen02"></div>
+              <p>乙级占比</p>
+            </div>
+            <div class="panPartPub panPart03">
+              <div class="fen" id="fen03"></div>
+              <p>丙级占比</p>
+            </div>
           </div>
-          <div class="panPartPub panPart03">
-            <div class="fen" id="fen03"></div>
-            <p>丙级占比</p>
+        </div>
+        <div class="pingfendengji">
+          <p class="title">病历评分数据</p>
+          <div class="pingfendengjiEmpty">
+
           </div>
         </div>
         <div class="pubEchart paymoney">
-          <p class="title">科室平均住院天数柱状图 <img src="../images/details.png" alt=""></p>
+          <p class="title"><span>科室平均住院天数柱状图</span> <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide">
             <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
             <ul>
@@ -92,6 +106,7 @@
             </ul>
           </div>
           <div id="barChart" class="barChartPay"></div>
+          <div class="barChartPayEmpty"></div>
         </div>
       </div>
       <div class="part03 fl">
@@ -100,14 +115,20 @@
         </p>
         <div class="barChartLineBox">
           <div id="lineChart" class="barChartLine"></div>
+          <div class="barChartLineEmpty"></div>
         </div>
         <div class="circle clearfix">
           <p class="title">各科室缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
-          <div id="emptyCircle" class="emptyCircle"></div>
-          <div class="explainPan explainPanT">
-            <table>
-              
-            </table>
+          <div class="emptyCircleWrap">
+            <div id="emptyCircle" class="emptyCircle"></div>
+            <div class="explainPan explainPanT">
+              <table>
+                
+              </table>
+            </div>
+          </div>
+          <div id="emptyCircleWrapEmpty">
+
           </div>
         </div>
       </div>
@@ -115,24 +136,29 @@
       <div class="part04 clearfix">
         <div class="circleB clearfix">
           <p class="title">条目缺陷占比 <img src="../images/details.png" alt=""></p>
-          <div id="emptyCircleB" class="emptyCircle"></div>
-          <div class="explainPan explainPanB">
-            <table>
-              
-            </table>
+          <div class="emptyCircleBData">
+            <div id="emptyCircleB" class="emptyCircle"></div>
+            <div class="explainPan explainPanB">
+              <table>
+                
+              </table>
+            </div>
+          </div>
+          <div class="emptyCircleBWrap">
+
           </div>
         </div>
-        
         <div class="pubEchartB paymoney">
           <p class="title">各科室质控平均分柱状图 <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide innerOuter">
-            <p data-str="内科" data-type="3"><span>内科</span><img src="../images/arrow_down.png" alt=""> </p>
+            <p data-str="内科" data-type="3"><span>内科系统</span><img src="../images/arrow_down.png" alt=""> </p>
             <ul>
-              <li class="toggleAverge toggleSlide1" data-str="内科" data-type="3">内科</li>
-              <li class="toggleAverge toggleSlide2" data-str="外科" data-type="4">外科</li>
+              <li class="toggleAverge toggleSlide1" data-str="内科" data-type="3">内科系统</li>
+              <li class="toggleAverge toggleSlide2" data-str="外科" data-type="4">外科系统</li>
             </ul>
           </div>
           <div id="barChartPay" class="barChartPay" style="height: 217px;"></div>
+          <div class="barChartPayEmptys" style="height: 217px;"></div>
         </div>
       </div>
   </div>

src/html/deptConsole.html

@@ -36,84 +36,109 @@
           <span class="name">出院人数统计</span>
           <span class="personNum">总人数：</span>
         </p>
-        <ul class="clearfix" style="cursor: default;">
-          <li>
-            <div class="lis">
-              <p class="numShow died"></p>
-              <p class="explainNum">死亡人数</p>
-            </div>
-          </li>
-          <li class="li03">
-            <div class="lis li02">
-              <p class="numShow patientNum"></p>
-              <p class="explainNum">手术病人数</p>
-            </div>
-          </li>
-        </ul>
+        <div class="chuyuan">
+          <ul class="clearfix" style="cursor: default;">
+            <li>
+              <div class="lis">
+                <p class="numShow died"></p>
+                <p class="explainNum">死亡人数</p>
+              </div>
+            </li>
+            <li class="li03">
+              <div class="lis li02">
+                <p class="numShow patientNum"></p>
+                <p class="explainNum">手术病人数</p>
+              </div>
+            </li>
+          </ul>
+        </div>
+        <div class="chuyuanEmpty"></div>
         <div class="defect">
           <p class="partTitlePub">各模块缺陷占比排名 <img class="detailGo" src="../images/details.png" alt=""></p>
           <div class="list">
             <table class="qtable">
   
             </table>
+            <div class="qtableEmpty">
+
+            </div>
           </div>
         </div>
       </div>
       <div class="part02 fl">
-        <ul class="bingli clearfix">
-          <li class="fst">
-            <p class="numShow"></p>
-            <p class="explainNum">累计质控病历数</p>
-          </li>
-          <li class="sec">
-            <p class="numShow"></p>
-            <p class="explainNum">甲级病历</p>
-          </li>
-          <li class="sec">
-            <p class="numShow"></p>
-            <p class="explainNum">乙级病历</p>
-          </li>
-          <li class="four sec">
-            <p class="numShow"></p>
-            <p class="explainNum">丙级病历</p>
-          </li>
-        </ul>
-        <div class="bingliLis clearfix">
-          <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
-          <div class="panPartPub panPart02">
-            <div class="fen" id="fen01"></div>
-            <p>甲级占比</p>
-          </div>
-          <div class="panPartPub panPart01">
-            <div class="fen" id="fen02"></div>
-            <p>乙级占比</p>
+        <div class="bldjs">
+          <ul class="bingli clearfix">
+            <li class="fst">
+              <p class="numShow"></p>
+              <p class="explainNum">累计质控病历数</p>
+            </li>
+            <li class="sec">
+              <p class="numShow"></p>
+              <p class="explainNum">甲级病历</p>
+            </li>
+            <li class="sec">
+              <p class="numShow"></p>
+              <p class="explainNum">乙级病历</p>
+            </li>
+            <li class="four sec">
+              <p class="numShow"></p>
+              <p class="explainNum">丙级病历</p>
+            </li>
+          </ul>
+          <div class="bingliLis clearfix">
+            <p>病历评分等级占比 <img class="detailGo" src="../images/details.png" alt=""></p>
+            <div class="panPartPub panPart02">
+              <div class="fen" id="fen01"></div>
+              <p>甲级占比</p>
+            </div>
+            <div class="panPartPub panPart01">
+              <div class="fen" id="fen02"></div>
+              <p>乙级占比</p>
+            </div>
+            <div class="panPartPub panPart03">
+              <div class="fen" id="fen03"></div>
+              <p>丙级占比</p>
+            </div>
           </div>
-          <div class="panPartPub panPart03">
-            <div class="fen" id="fen03"></div>
-            <p>丙级占比</p>
+        </div>
+        <div class="pingfendengji">
+          <p class="title">病历评分数据</p>
+          <div class="pingfendengjiEmpty">
+
           </div>
         </div>
         <div class="circleB circleBSingle clearfix">
           <p class="title">条目缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
-          <div id="emptyCircleB" class="emptyCircle"></div>
-          <div class="explainPan explainPanB">
-            <table>
-              
-            </table>
+          <div class="emptyCircleBData">
+            <div id="emptyCircleB" class="emptyCircle"></div>
+            <div class="explainPan explainPanB">
+              <table>
+                
+              </table>
+            </div>
+          </div>
+          <div class="emptyCircleBWrap">
+
           </div>
         </div>
         <div class="circleBLis">
           <div class="circleB homePage clearfix">
             <p class="title">病案首页合格率占比 <img class="detailGo" src="../images/details.png" alt=""></p>
             <div id="lineChart" class="emptyCircle emptyLineCircle"></div>
+            <div class="emptyLineCircleEmpty"></div>
           </div>
           <div class="circleB homePageNo clearfix">
             <p class="title">条目缺陷占比 <img class="detailGo" src="../images/details.png" alt=""></p>
-            <div id="emptyCircleBc" class="emptyCircle"></div>
-            <div class="explainPan explainPanc explainPanBc">
-              <table>
-                
-              </table>
+            <div class="emptyCircleBDatas">
+              <div id="emptyCircleBc" class="emptyCircle"></div>
+              <div class="explainPan explainPanc explainPanBc">
+                <table>
+                  
+                </table>
+              </div>
+            </div>
+            <div class="emptyCircleBWraps">
+
             </div>
           </div>
 

src/html/deptScoreDetailControl.html

@@ -33,8 +33,8 @@
                     <span class="selectDept" data-id="">全部</span>
                     <ul class="deptList filterDropList">
                         <li class="deptItem ellipsis" title="全部" data-id="" data-name="全部">全部</li>
-                        <li class="deptItem ellipsis" title="内科" data-id="内科" data-name="内科">内科</li>
-                        <li class="deptItem ellipsis" title="外科" data-id="外科" data-name="外科">外科</li>
+                        <li class="deptItem ellipsis" title="内科系统" data-id="内科" data-name="内科系统">内科系统</li>
+                        <li class="deptItem ellipsis" title="外科系统" data-id="外科" data-name="外科系统">外科系统</li>
                     </ul>
                 </span>
                 <span class="filter">查询</span>

src/html/quexianDetail.html

@@ -51,8 +51,8 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName desc" code="casesName">所属模块</th>
+                    <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>

src/html/quexianDetailControl.html

@@ -51,10 +51,10 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName desc" code="casesName">所属模块</th>
-                    <th class="moduleItemName textCenter">数量</th>
-                    <th class="moduleScore" style="width: 80px;">缺陷占比</th>
+                    <th class="moduleItemName" code="name">缺陷名称</th>
+                    <th class="moduleItemName textCenter" code="num">数量</th>
+                    <th class="moduleScore" style="width: 100px;" code="percent">缺陷占比</th>
                 </thead>
                 <tbody>
     

src/html/tiaomu.html

@@ -26,7 +26,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">
-                    <span>条目名称：</span>
+                    <span>缺陷名称：</span>
                     <span class="">
                         <input class="moduleItemInp" type="text" placeholder="请输入条目名称">
                     </span>
@@ -44,7 +44,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName">条目名称</th>
+                    <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>

src/html/tiaomuControl.html

@@ -26,7 +26,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <span class="filterItem">
-                    <span>条目名称：</span>
+                    <span>缺陷名称：</span>
                     <span class="">
                         <input class="moduleItemInp" type="text" placeholder="请输入条目名称">
                     </span>
@@ -44,7 +44,7 @@
             <table>
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="moduleItemName">条目名称</th>
+                    <th class="moduleItemName">缺陷名称</th>
                     <th class="moduleItemName">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>

src/js/console.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData} = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="";
 $(function(){
     if(!hasData('YH-KZT')){
@@ -52,38 +52,45 @@ $(function(){
                 return
             }
             slideType = 1
-            $(".pubEchart .title").html("科室平均住院天数柱状图")
+            $(".pubEchart .title span").html("科室平均住院天数柱状图")
             barChart(dayLis,dateType)
+            $(this).parent().slideToggle().prev().find("span").html(str)
         }else if(type == 2){
             if(!hasData('FUNC000046')){
                 return
             }
             slideType = 2
-            $(".pubEchart .title").html("科室平均住院花费柱状图")
+            $(".pubEchart .title span").html("科室平均住院花费柱状图")
             barChart(payMoney,dateType)
+            $(this).parent().slideToggle().prev().find("span").html(str)
         }else if(type == 3){//科室平均分内科
             if(!hasData('FUNC000091')){
                 return
             }
             deptType="内科"
             getAverageScoreLis()
+            $(this).parent().slideToggle().prev().find("span").html(str+"系统")
         }else if(type == 4){//科室平均分外科
             if(!hasData('FUNC000091')){
                 return
             }
             deptType="外科"
             getAverageScoreLis()
+            $(this).parent().slideToggle().prev().find("span").html(str+"系统")
         }
-        $(this).parent().slideToggle().prev().find("span").html(str)
     })
     getDetails()
     getAverageScoreLis()
 })
 function getDetails(){
-    $(".part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
+    $(".pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
       $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&deptType="+deptType)
     })
+    $(".part02 .bingliLis,.part03 .circle .title").click(function(){
+      focusMenuItem("YH-ZKK-GKSQXZB_XQ");
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
+    })
     $(".part02").on("click",".bingli li.sec",function(){
       focusMenuItem("YH-BLZK-ZKPF");
       let dataC = $(this).attr("data-c")
@@ -129,7 +136,7 @@ function hasData(data){
   }
 function resizeBox(){
     $(".partWrap").css({
-        height:$(window).height()-44+'px'
+        height:$(window).height()-43+'px'
     })
 }
 //所有数据切换日期筛选
@@ -314,42 +321,6 @@ function getBarData(type){
             let data = res.data
             if(data.code == 0){
                 let result3 = data.data['病历数统计']||[]
-                if(result3.length == 0){
-                    result3 = [
-                        {
-                            "id":null,
-                            "name":"累计质控病历数",
-                            "totleNum":0,
-                            "num":0,
-                            "percent":null,
-                            "percentStr":null
-                        },
-                        {
-                            "id":null,
-                            "name":"甲级病历",
-                            "totleNum":10,
-                            "num":0,
-                            "percent":0,
-                            "percentStr":"0.00%"
-                        },
-                        {
-                            "id":null,
-                            "name":"乙级病历",
-                            "totleNum":10,
-                            "num":0,
-                            "percent":0,
-                            "percentStr":"0.00%"
-                        },
-                        {
-                            "id":null,
-                            "name":"丙级病历",
-                            "totleNum":10,
-                            "num":0,
-                            "percent":0,
-                            "percentStr":"0.00%"
-                        }
-                    ]
-                }
                 setNumDetail(result3)
             }
         })
@@ -399,6 +370,14 @@ function getBarData(type){
 }
 //part01
 function personNum(data){
+    if(data['总人数']==0){
+        $(".chuyuan,.personNum").css("display","none")
+        picEmptyData(".chuyuanEmpty")
+        return
+    }else{
+        $(".chuyuanEmpty").css("display","none")
+        $(".chuyuan,.personNum").css("display","block")
+    }
     $(".personNum").html("总人数："+data['总人数'])
     $(".died").html(data['死亡人数'])
     $(".newborn").html(data['新生儿人数'])
@@ -407,7 +386,16 @@ function personNum(data){
 //part02
 function setNumDetail(data){
     // console.log(data,2222222222)
-    if(data.length == 0)return
+    if(data.length == 0){
+        $(".pingfendengji").css("display","block")
+        $(".bldjs").css("display","none")
+        picEmptyData(".pingfendengjiEmpty")
+        return
+    }else{
+        $(".bldjs").css("display","block")
+        $(".pingfendengji").css("display","none")
+
+    }
     let str = ''
     for(let i = 0;i < data.length;i++){
         str += `
@@ -498,6 +486,14 @@ function part02pan(data,dom){
 }
 //折现图
 function lineChart(dataX,dataY){
+    if(dataX.length==0&&dataY.length==0){
+        $(".barChartLine").css("display","none")
+        picEmptyData(".barChartLineEmpty")
+        return
+    }else{
+        $(".barChartLine").css("display","block")
+        $(".barChartLineEmpty").css("display","none")
+    }
     var myCharts = echarts.init(document.getElementById('lineChart'));
     $(window).resize(function(){
         myCharts.resize()
@@ -603,8 +599,15 @@ function lineChart(dataX,dataY){
 }
 
 function lineChartSpecial(dataX,dataY){
+    if(dataX.length==0&&dataY.length==0){
+        $(".barChartLine").css("display","none")
+        picEmptyData(".barChartLineEmpty")
+        return
+    }else{
+        $(".barChartLine").css("display","block")
+        $(".barChartLineEmpty").css("display","none")
+    }
     var myCharts = echarts.init(document.getElementById('lineChart'));
-    var lengthNum = dataX.length;
     $(window).resize(function(){
         myCharts.resize()
     });
@@ -615,6 +618,10 @@ function lineChartSpecial(dataX,dataY){
             position: 'right',
             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                 type: 'line'        // 默认为直线，可选为：'line' | 'shadow'
+            },
+            formatter: function(param) {           
+                return '<div style="color:#fff;">'+ param[0].name + "<br>" +'<i style="background:#37C4FC;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：'+ param[0].value+"%" + "<br>"
+                '</div>'
             }
         },
         grid: {
@@ -695,9 +702,21 @@ function lineChartSpecial(dataX,dataY){
 }
 //柱状图住院费用
 function barChartPay(dataX,dataY){
-    // console.log(dataX,dataY)
+    // console.log(dataX,dataY,78787878)
+    if(dataX.length==0&&dataY.length==0){
+        $("#barChartPay,.innerOuter").css("display","none")
+        picEmptyData('.barChartPayEmptys')
+        return
+    }else{
+        if(hospital == "台州市立"){
+            $(".innerOuter").css("display","block")
+        }else{
+            $(".innerOuter").css("display","none")
+        }
+        $("#barChartPay").css("display","block")
+        $(".barChartPayEmptys").css("display","none")
+    }
     var myCharts = echarts.init(document.getElementById('barChartPay'));
-    var lengthNum = dataX.length;
     $(window).resize(function(){
         myCharts.resize()
     });
@@ -788,7 +807,15 @@ function barChartPay(dataX,dataY){
 }
 //柱状图住院日期
 function barChart(data,type){
-    // console.log(data,type)
+    // console.log(data,type,78787888787787)
+    if(data.length==0){
+        $(".toggleSlide,#barChart").css("display","none")
+        picEmptyData('.barChartPayEmpty')
+        return
+    }else{
+        $(".toggleSlide,#barChart").css("display","block")
+        $(".barChartPayEmpty").css("display","none")
+    }
     var myChart = echarts.init(document.getElementById('barChart'));
     $(window).resize(function(){
         myChart.resize()
@@ -1014,6 +1041,13 @@ function emptyCircle(data){
     $(window).resize(function(){
         myChart.resize()
     });
+    if(data.length == 0){
+        $(".emptyCircleWrap").css("'display","none !important")
+        picEmptyData("#emptyCircleWrapEmpty")
+    }else{
+        $(".emptyCircleWrap").css("'display","block")
+        $(".console #emptyCircleWrapEmpty").html('')
+    }
     let bgColor = '#203463';
     let title = '总量';
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
@@ -1104,6 +1138,13 @@ function emptyCircle(data){
     myChart.setOption(option);
 }
 function emptyCircleB(data){
+    if(data.length == 0){
+        $(".emptyCircleBData,.emptyCircle").css("'display","none !important")
+        picEmptyData(".emptyCircleBWrap")
+    }else{
+        $(".emptyCircleBData").css("'display","block")
+        $(".emptyCircleBWrap").css("display","none")
+    }
     var myChart = echarts.init(document.getElementById('emptyCircleB'));
     $(window).resize(function(){
         myChart.resize()
@@ -1204,6 +1245,15 @@ function queList(data){
         <td class="td03">数量</td>
         <td class="td04">占比</td>
         </tr>`
+    if(data.length == 0){
+        $(".qtable").css("display","none")
+        picEmptyData(".qtableEmpty")
+        return
+    }else{
+        $(".qtableEmpty").css("display","none")
+        $(".qtable").css("display","table")
+
+    }
     for(let i = 0;i < data.length;i++){
         strAll += `
             <tr>

src/js/dayDetail.js

@@ -41,7 +41,7 @@ if(statisticsType == 1){
     })
 }
 $(".abnormalClear").click(function(){
-        behospitalCode = ""
+        behospitalCode=behospitalCodeTemp = ""
         $(".patientNumInp").val("")
         getTabData(1)
 })

src/js/deptConsole.js

@@ -7,7 +7,7 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
-const {post,setCookie,delCookie,getCookie,focusMenuItem} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData } = require('../js/utils.js');
 let payMoney = [],dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
@@ -107,7 +107,6 @@ function dateChange(){
         getBarData(2)
     })
 }
-
 //控制台数
 function initConsole(result){
     let url = {
@@ -185,6 +184,7 @@ function renderDeptLis(data){
         personNum(datafst[name]||[])
         setNumDetail(datasec[name]||[])
         queList(datatrd[name]||[])
+        getHomePageLevelStatisticsByDept()
         for(let i = 0;i < datafour[name].length;i++){
             datafour[name][i].value = datafour[name][i].num
         }
@@ -269,9 +269,13 @@ function getBarData(type){
             })
         }
     }
+    getHomePageLevelStatisticsByDept(type)
+}
+function getHomePageLevelStatisticsByDept(type){
     if(hospital=="长兴医院"&&hasData("FUNC000076")){
         post(api.homePageLevelStatisticsByDept,{//病案首页
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "deptName":curDept
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -287,6 +291,14 @@ function getBarData(type){
     }
 }
 function lineChartSpecial(dataX,dataY){
+    if(dataX.length==0&&dataY.length==0){
+        $(".emptyLineCircle").css("display","none")
+        picEmptyData('.emptyLineCircleEmpty')
+        return
+    }else{
+        $(".emptyLineCircle").css("display","block")
+        $(".emptyLineCircleEmpty").css("display","none")
+    }
     var myCharts = echarts.init(document.getElementById('lineChart'));
     var lengthNum = dataX.length;
     $(window).resize(function(){
@@ -299,6 +311,10 @@ function lineChartSpecial(dataX,dataY){
             position: 'right',
             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
                 type: 'line'        // 默认为直线，可选为：'line' | 'shadow'
+            },
+            formatter: function(param) {           
+                return '<div style="color:#fff;">'+ param[0].name + "<br>" +'<i style="background:#37C4FC;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：'+ param[0].value+"%" + "<br>"
+                '</div>'
             }
         },
         grid: {
@@ -379,6 +395,14 @@ function lineChartSpecial(dataX,dataY){
 }
 //part01
 function personNum(data){
+    if(data['总人数']==0){
+        $(".chuyuan,.personNum").css("display","none")
+        picEmptyData(".chuyuanEmpty")
+        return
+    }else{
+        $(".chuyuanEmpty").css("display","none")
+        $(".chuyuan,.personNum").css("display","block")
+    }
     $(".personNum").html("总人数："+data['总人数'])
     $(".died").html(data['死亡人数'])
     $(".newborn").html(data['新生儿人数'])
@@ -388,40 +412,14 @@ function personNum(data){
 function setNumDetail(data){
     // console.log(data,2222222222)
     if(data.length == 0){
-        data = [
-            {
-                "id":null,
-                "name":"累计质控病历数",
-                "totleNum":0,
-                "num":0,
-                "percent":null,
-                "percentStr":null
-            },
-            {
-                "id":null,
-                "name":"甲级病历",
-                "totleNum":10,
-                "num":0,
-                "percent":0,
-                "percentStr":"0.00%"
-            },
-            {
-                "id":null,
-                "name":"乙级病历",
-                "totleNum":10,
-                "num":0,
-                "percent":0,
-                "percentStr":"0.00%"
-            },
-            {
-                "id":null,
-                "name":"丙级病历",
-                "totleNum":10,
-                "num":0,
-                "percent":0,
-                "percentStr":"0.00%"
-            }
-        ]
+        $(".pingfendengji").css("display","block")
+        $(".bldjs").css("display","none")
+        picEmptyData(".pingfendengjiEmpty")
+        return
+    }else{
+        $(".bldjs").css("display","block")
+        $(".pingfendengji").css("display","none")
+
     }
     let str = ''
     for(let i = 0;i < data.length;i++){
@@ -513,6 +511,13 @@ function part02pan(data,dom){
 }
 //柱状图住院日期
 function emptyCircleB(data){
+    if(data.length == 0){
+        $(".emptyCircleBData").css("'display","none !important")
+        picEmptyData(".emptyCircleBWrap")
+    }else{
+        $(".emptyCircleBData").css("'display","block")
+        $(".emptyCircleBWrap").css("display","none")
+    }
     if(!document.getElementById('emptyCircleB'))return
     var myChart = echarts.init(document.getElementById('emptyCircleB'));
     $(window).resize(function(){
@@ -606,6 +611,13 @@ function emptyCircleB(data){
     myChart.setOption(option);
 }
 function emptyCircleBc(data){
+    if(data.length == 0){
+        $(".emptyCircleBDatas").css("'display","none !important")
+        picEmptyData(".emptyCircleBWraps")
+    }else{
+        $(".emptyCircleBDatas").css("'display","block")
+        $(".emptyCircleBWraps").css("display","none")
+    }
     var myChart = echarts.init(document.getElementById('emptyCircleBc'));
     $(window).resize(function(){
         myChart.resize()
@@ -706,6 +718,15 @@ function queList(data){
         <td class="td03">数量</td>
         <td class="td04">占比</td>
         </tr>`
+    if(data.length == 0){
+        $(".qtable").css("display","none")
+        picEmptyData(".qtableEmpty")
+        return
+    }else{
+        $(".qtableEmpty").css("display","none")
+        $(".qtable").css("display","table")
+
+    }
     for(let i = 0;i < data.length;i++){
         strAll += `
             <tr>

src/js/deptScoreDetail.js

@@ -61,7 +61,7 @@ $(function(){
 $(".abnormalClear").click(function(){
     deptId = deptIdTemp = deptList[0].deptName
     curDeptId = deptList[0].deptId
-    behospitalCode = ""
+    behospitalCode=behospitalCodeTemp = ""
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,

src/js/deptScoreDetailControl.js

@@ -49,7 +49,9 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   }
 $(".abnormalClear").click(function(){
     // window.location.reload()
-    behospitalCode = ""
+    behospitalCode=behospitalCodeTemp = ""
+    deptId =deptIdTemp= ""
+    $(".selectDept").attr({'title':"全部",'data-id':''}).html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".patientNumInp").val("")
     getTabData(1)
 })
@@ -397,12 +399,7 @@ function bindDeptSelect(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
-        if(deptItemName.length > 10){
-            $('.selectDept').html(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').html(deptItemName)
-        }
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept').html(deptItemName).attr('title',deptItemName)
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")

src/js/jiaji.js

@@ -41,7 +41,7 @@ if(statisticsType == 1){
     })
 }
 $(".abnormalClear").click(function(){
-    behospitalCode = ""
+    behospitalCode =behospitalCodeTemp= ""
     $(".patientNumInp").val("")
     getTabData(1)
 })

src/js/mukuai.js

@@ -58,7 +58,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        deptId = deptList[0].deptName
+        deptId =deptIdTemp= deptList[0].deptName
         name = ""
         $(".patientNumInp").val("")
         $(".selectDept").html(deptId).attr({

src/js/partDetail.js

@@ -54,8 +54,8 @@ $(function(){
 })
 
 $(".abnormalClear").click(function(){
-    deptId = deptList[0].deptName
-    behospitalCode = ""
+    deptId=deptIdTemp = deptList[0].deptName
+    behospitalCode=behospitalCodeTemp = ""
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,
@@ -378,7 +378,7 @@ $('.selectDept').on("click", function(e){
 bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
-    $('.deptItem').on("click",function(){
+    $("body").on("click",'.deptItem',function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId

src/js/partDetailControl.js

@@ -43,7 +43,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
 $(".abnormalClear").click(function(){
     // window.location.reload()
     $(".patientNumInp").val("")
-    behospitalCode = ""
+    behospitalCode =behospitalCodeTemp= ""
     getTabData(1)
 })
 $(".partTitle a").click(function(){

src/js/payDetail.js

@@ -41,7 +41,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
       })
   }
 $(".abnormalClear").click(function(){
-    behospitalCode = ""
+    behospitalCode=behospitalCodeTemp = ""
     $(".patientNumInp").val("")
     getTabData(1)
 })

src/js/quexianDetail.js

@@ -66,7 +66,9 @@ $(function(){
         })
     }
     $(".abnormalClear").click(function(){
-        name = ""
+        name =nameTemp= ""
+        deptIdTemp=deptId =''
+        $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".patientNumInp").val("")
         getTabData(1)
     })
@@ -288,8 +290,8 @@ function renderTab(data,activePage){
         str += `
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
-                <td>${item.name}</td>
                 <td class="textCenter">${item.casesName}</td>
+                <td>${item.name}</td>
                 <td class="textCenter">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
@@ -539,4 +541,5 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
+    $(".deptList").css("display", "none")
 })

src/js/quexianDetailControl.js

@@ -60,7 +60,9 @@ $(function(){
     getTabData(1)//条目缺陷
     
     $(".abnormalClear").click(function(){
-        name = ""
+        name =nameTemp= ""
+        deptId = deptIdTemp = ""
+        $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".patientNumInp").val("")
         getTabData(1)
     })
@@ -275,8 +277,8 @@ function renderTab(data,activePage){
         str += `
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
-                <td>${item.name}</td>
                 <td class="textCenter">${item.casesName}</td>
+                <td>${item.name}</td>
                 <td class="textCenter">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
@@ -526,4 +528,5 @@ $(document).on("click", function(){
     $(".selectModuleType .arrow").attr("src",iconDown)
     $(".selectReject .arrow").attr("src",iconDown)
     $(".selectUsed .arrow").attr("src",iconDown)
+    $(".deptList").css("display", "none")
 })

src/js/tiaomu.js

@@ -60,7 +60,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        deptId = deptList[0].deptName
+        deptId =deptIdTemp= deptList[0].deptName
         name = ""
         $(".patientNumInp").val("")
         $(".selectDept").html(deptId).attr({

src/js/utils.js

@@ -116,8 +116,6 @@ const post = function (url, data) {
       },
       error: function (error) {
         if(error.status===403||error.status===401){
-          console.log(url)
-          return
           const wd = window.parent.window||window;
           wd.location.href = "../login.html";
         }
@@ -205,6 +203,14 @@ function emptyBox(name){
   </td></tr>`
   return str
 }
+function picEmptyData(dom,str){
+  let empty = `<div class="emptyBoxHome">
+      <img src="${require('../images/emptyHome.png')}">
+      <p>${str||"暂无数据~"}</p>
+  </div>
+  `
+  $(dom).css({"position":"relative","display":"block"}).html(empty)
+}
 module.exports = {
   pageMap,
   post,
@@ -217,5 +223,6 @@ module.exports = {
   setBoxHeight,
   hasData,
   focusMenuItem,
-  emptyBox
+  emptyBox,
+  picEmptyData
 };