合并bug修改

src/js/itemDefectDetail.js

@@ -53,7 +53,7 @@ if(defectName){
 if(casesEntryId){
   casesEntryId=casesId;
 }
-if(deptIdPram&&deptNamePram || from == 2 &&deptList.length > 0  ){
+if(deptIdPram&&deptNamePram||from == 3 || from == 2 &&deptList.length > 0  ){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
     deptName = deptNameTemp = deptNamePram
@@ -563,6 +563,8 @@ $(function() {
     $(".filter").click();   //初始查询
     if(from==2){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
+    }else if(from==3){
+      $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
     }else{
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
     }

src/js/keyItemFlawControl.js

@@ -145,8 +145,9 @@ function renderTab(data,hisId,activePage){
     let casesName = $(this).attr("data-name");
     let casesId = $(this).attr("data-id");
     let name=$(this).attr("dept-name");
+    name=name==="全院"?"全部":name;
     let id=$(this).attr("dept-id");
-    $(parent.document).find("#contentIframe").attr("src","itemDefectDetail.html?from=1&deptName="+name+"&deptId="+id+"&casesEntryId="+casesId+"&defectName="+casesName+"&startDate="+startDateParam+"&endDate="+endDateParam)
+    $(parent.document).find("#contentIframe").attr("src","itemDefectDetail.html?from=3&deptName="+name+"&deptId="+id+"&casesEntryId="+casesId+"&defectName="+casesName+"&startDate="+startDateParam+"&endDate="+endDateParam)
   })
 }