Browse Source

各模块缺陷占比内页联动

zhangxc 5 years ago
parent
commit
103166b0b0
4 changed files with 11 additions and 6 deletions
  1. 2 2
      src/html/mukuaiControl.html
  2. 1 1
      src/js/console.js
  3. 8 2
      src/js/mukuaiControl.js
  4. 0 1
      src/js/partDetailControl.js

+ 2 - 2
src/html/mukuaiControl.html

@@ -13,10 +13,10 @@
     <div class="managerContainer mukuai">
         <div class="partTitle">
           <p><a href="console.html">控制台 / </a>各模块缺陷占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

+ 1 - 1
src/js/console.js

@@ -163,7 +163,7 @@ function getDetails(){
     })
     $(".defect .partTitlePub").click(function(){    //from 1 console / 2  deptConsole
         focusMenuItem("YH-ZKK-GMKQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".circleB .title").click(function(){
         focusMenuItem("YH-ZKK-TMQXZB_XQ");

+ 8 - 2
src/js/mukuaiControl.js

@@ -26,6 +26,8 @@ $(function(){
     isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
     from = getUrlArgObjectNew("from",srcUrl)||""
     name =nameTemp = getUrlArgObjectNew("name",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(name){
         $(".moduleItemInp").val(name)
     }
@@ -56,7 +58,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -65,8 +67,12 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    } else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),2)
     }
-    
     getTabData(1)//条目缺陷
 })
 function focusMenuItem(code){

+ 0 - 1
src/js/partDetailControl.js

@@ -23,7 +23,6 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   lineType = getUrlArgObjectNew("lineType",srcUrl)||""
   let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
   let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
-  console.log("startDateParam",startDateParam,"endDateParam",endDateParam)
   data_desc = (lineType == "合格率")?"firstLevelPercent":(lineType=="完整率"?"emptyPercent":"errorPercent")
   if(lineType){
         $("th[code="+data_desc+"]").addClass("desc");