Merge remote-tracking branch 'origin/test'

src/js/index.js

@@ -54,13 +54,15 @@ function initMenu(data,userInfo){
   $(".list-1").on("click",function(){
     // $(".list-1 .slide-up").removeClass('slide-up');
     // $(this).toggleClass('slide-up');
+    $(".list-1-show ul").slideUp();
+    $(".list-1").removeClass("list-1-show");
     const ulShow =  $(this).find("ul").css("display")
     if(ulShow == "none"){
-      $(this).removeClass("list-1-show")
+      //$(this).removeClass("list-1-show")
       $(this).addClass("list-1-show")
-    }else{
+    }/*else{
       $(this).removeClass("list-1-show")
-    }
+    }*/
     $(this).find("ul").slideToggle();
   });
 //收起菜单

src/js/partDetail.js

@@ -158,7 +158,7 @@ function renderTab(data,hisId,activePage){
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=1&deptName="+deptIdTemp+"&docName="+docName)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName)
     })
 }
 

src/js/partDetailControl.js

@@ -140,7 +140,7 @@ function renderTab(data,hisId,activePage){
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let deptName = $(this).attr("data-dept")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=1")
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=1&casesId=243")
     })
 }
 

src/js/quexianDetail.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="",casesIds="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,6 +23,7 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     docName = getUrlArgObjectNew("docName",srcUrl)||""
+    casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     getTabData(1)//条目缺陷    
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
@@ -92,9 +93,10 @@ function getTabData(activePage){
         name: name, //条目名
         doctorName:docName||"",
         deptName:deptName||"",
+        casesId:casesIds||"",
         size: 15
     }
-    post(api.resultStatisticsByDeptAndDoctorPage,param).then(res =>{
+    post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
             const totalPage = res.data.data.pages

src/js/quexianDetailControl.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,6 +23,7 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
+    casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
         $(".partTitle .consoleD").click(function(){
@@ -91,6 +92,7 @@ function getTabData(activePage){
         name: name, //条目名
         doctorName:"",
         deptName:deptName||"",
+        casesId:casesIds||"",
         globalType:1,
         size: 15
     }