luolei 5 rokov pred
rodič
commit
34ba1933fe
2 zmenil súbory, kde vykonal 6 pridanie a 5 odobranie
  1. 1 3
      src/js/itemDefectDetail.js
  2. 5 2
      src/js/singleVeto.js

+ 1 - 3
src/js/itemDefectDetail.js

@@ -559,17 +559,15 @@ $(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{
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
-
     }
     $(".partTitle .consoleD").click(function(){
         $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
         $(".container",parent.document).addClass("console-cont");
     })
     $(".partTitle .consoleP").click(function(){
-        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=${from}`)
+        $(parent.document).find("#contentIframe").attr("src",`./singleVeto.html?from=${from}&fromThree=3`)
        
     })
 });

+ 5 - 2
src/js/singleVeto.js

@@ -34,6 +34,7 @@ $(function(){
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+    let fromThree  = JSON.parse(getCookie("fromThree"))||[]
     if(name){
         $(".moduleItemInp").attr("title",name).val(name)
         selectReject=1
@@ -55,6 +56,9 @@ $(function(){
         $(".partTitle a").attr("href","console.html").html("控制台 / ")
         $(".partTitle .pices span").html("条目缺陷占比")
     }
+    if(fromThree == 3){
+        deptName = deptList[0].deptName||'';
+    }
     $(".partTitle a").click(function(){
         //初始菜单选中
         $(".managerContainer").remove()
@@ -164,8 +168,7 @@ function getTabData(activePage){
         return
     }
     startDateParam=dateStatrt
-    endDateParam=dateEnd
-    // let deptName = from == 2&&deptList.length > 0 ? deptList[0].deptName : '';                                                                                                                                                                                                                                                                                                                                   
+    endDateParam=dateEnd                                                                                                                                                                                                                                                                                                                                  
     const param = {
         current:activePage,
         type: 0,