浏览代码

细节调整

luolei 4 年之前
父节点
当前提交
4d4b91d1be
共有 6 个文件被更改,包括 24 次插入17 次删除
  1. 3 0
      src/css/deptConsole.less
  2. 1 1
      src/html/deptConsole.html
  3. 13 12
      src/js/dept/qcListOutHospitalDept.js
  4. 6 2
      src/js/deptConsole.js
  5. 1 1
      src/js/modal.js
  6. 0 1
      src/js/singleVeto.js

+ 3 - 0
src/css/deptConsole.less

@@ -336,6 +336,9 @@ div.console {
   background-color: @themeColor;
   border-right: 10px solid @activeBg;
   box-sizing: border-box;
+  .partTitlePub {
+    cursor: pointer;
+  }
   ul {
     padding: 40px 20px;
     border-bottom: 10px solid @activeBg;

+ 1 - 1
src/html/deptConsole.html

@@ -36,7 +36,7 @@
         <!--<div class="grayLine"></div>-->
         <div class="partWrap clearfix">
             <div class="part01 fl">
-              <p class="partTitlePub clearfix" style="cursor: default;">
+              <p class="partTitlePub clearfix">
                 <span class="name"></span>
                 <span class="personNum"></span>
               </p>

+ 13 - 12
src/js/dept/qcListOutHospitalDept.js

@@ -68,20 +68,8 @@ if(docName){
     doctorName = docName
     $('.doctorInp').val(docName)
 }
-if(deptIdPram&&deptNamePram){
-    deptIdTemp = deptIdPram = deptIdPram
-    deptName = deptNameTemp = deptNamePram
-    $('.selectDept').val(deptNamePram)
-    $('.selectDept ').attr('title',deptNamePram)
-    $(".deptList").css("display", "none")
-}
 if(from==2){
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a> 缺陷详情`)
-    deptId=deptList[0]&&deptList[0].deptId; 
-    deptName=deptList[0]&&deptList[0].deptName;
-    deptNameTemp=deptList[0]&&deptList[0].deptName;
-    deptIdTemp=deptList[0]&&deptList[0].deptId;
-    $('.selectDept').html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }else if(from==3){
 //   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
 }else{
@@ -93,6 +81,18 @@ if(from==2){
         $(".inorout").css('display','block')
     }
 }
+$(function(){
+    if(deptNamePram){
+        deptIdTemp = deptIdPram = deptIdPram
+        deptName = deptNameTemp = deptNamePram
+        $('.selectDept').html(deptName).attr('title',deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $(".deptList").css("display", "none")
+    }else{
+        deptId=deptIdTemp=deptList[0]&&deptList[0].deptId;
+        deptName=deptNameTemp=deptList[0]&&deptList[0].deptName;
+        $('.selectDept').html(deptName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    }
+})
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -734,6 +734,7 @@ function bindDeptSelect(){
 $('.selectDept').on("click", function(e){
     e.stopPropagation()
     $(".levelList ").css("display","none")
+    $(".leaveHosTypeList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){

+ 6 - 2
src/js/deptConsole.js

@@ -66,7 +66,11 @@ function tiaomu(dateType){
     });
     $(".part02 .bingliLis").click(function(){
         focusMenuItem("YH-KSZR-KSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        $(parent.document).find("#contentIframe").attr("src","deptScoreDetailControlDept.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+    });
+    $(".part01 .partTitlePub").click(function(){
+        focusMenuItem("YH-KSZR-CYRSTJ_XQ");
+        $(parent.document).find("#contentIframe").attr("src","qcListOutHospitalDept.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".part02").on("click",".bingli li.sec",function(){
         focusMenuItem("YH-BLZK-ZKPFKS");
@@ -587,7 +591,7 @@ function personNum(data){
         </ul>
     `
     $(".personNum").html("总人数:"+(data['总人数']||'--'))
-    $(".part01 .name").html('出院人数统计')
+    $(".part01 .name").html('出院人数统计').append(`<img class="detailGo" src="${require('@images/details.png')}" alt="">`)
     $(".chuyuan").html(str)
 }
 //part02

+ 1 - 1
src/js/modal.js

@@ -18,7 +18,7 @@ const jQuery = require('jquery');
             fatherWrapper:'',
             type:'modal',//tip,loading
             callback:function(){
-                alert(99)
+                // alert(99)
             }
         };
         var ops = $.extend(dft, options || {});

+ 0 - 1
src/js/singleVeto.js

@@ -340,7 +340,6 @@ function goDetail(data){
          let defectId = $(this).parent().attr("data-id")
          let caseId = $(this).parent().attr("data-caseId")
         const item = data[index]
-        alert(from)
         if(from == 2){
             $(parent.document).find("#contentIframe").attr("src",`./qcListCopyDept.html?defectName=${defectName}&casesId=${caseId} &defectId=${defectId}&startDate=${startDateParam}&endDate=${endDateParam}&from=2&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
         }else{