bug解决

src/html/console.html

@@ -151,10 +151,10 @@
         <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>

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

src/js/console.js

@@ -13,6 +13,7 @@ $(function(){
     if(!hasData('YH-KZT')){
         $("body").html('')
     }
+    console.log(hospital)
     if(hospital == "台州市立"){
         $(".part03 .partTitlePub .name").html('各科室甲级病例占比')
         $(".innerOuter").css("display","block")
@@ -74,16 +75,20 @@ $(function(){
             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")
@@ -698,7 +703,12 @@ function barChartPay(dataX,dataY){
         picEmptyData('.barChartPayEmptys')
         return
     }else{
-        $("#barChartPay,.innerOuter").css("display","block")
+        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'));

src/js/deptConsole.js

@@ -107,7 +107,6 @@ function dateChange(){
         getBarData(2)
     })
 }
-
 //控制台数
 function initConsole(result){
     let url = {

src/js/deptScoreDetailControl.js

@@ -399,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/quexianDetail.js

@@ -290,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>
@@ -541,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

@@ -277,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>
@@ -528,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")
 })