Browse Source

Merge remote-tracking branch 'origin/doctorAverage220224' into doctorAverage220224

zhouna 3 years ago
parent
commit
7db180c570

+ 1 - 1
src/html/doctorQcAverageDetail.html

@@ -11,7 +11,7 @@
 <body>
     <div class="container doctorQcAverageDetail">
         <div class="partTitle">
-          <p><a href="deptScoreDetailControl.html">各科室缺陷占比 / </a>医生质控平均分</p>
+          <p><a href="console.html" >控制台 / </a><a href="deptScoreDetailControl.html" >各科室缺陷占比 / </a>医生质控平均分</p>
           <div class="dateDetail fr">
             
           </div>

File diff suppressed because it is too large
+ 342 - 330
src/js/deptScoreDetailControl.js


+ 15 - 11
src/js/doctorQcAverageDetail.js

@@ -19,12 +19,12 @@ listenScroll()
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
 let tabList = [], /*statisticsType="",*/
     levelTemp = "", deptId = "", deptIdTemp = "", deptName = "", deptNameTemp = "", doctorName = "", doctorNameTemp = "",
-    data_desc = ['entryNum'], data_asc = [],doctorNum = "",doctorNumTemp = "", hospital = getCookie("hospital");
+    data_desc = ['entryNum'], data_asc = [], doctorNum = "", doctorNumTemp = "", hospital = getCookie("hospital");
 let srcUrl = $("#contentIframe", parent.document).attr("src")
 /*statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""*/
 deptType = getUrlArgObjectNew("deptType", srcUrl) || ""
-deptName = getUrlArgObjectNew("deptName", srcUrl) || ""
-deptId = getUrlArgObjectNew("deptId", srcUrl) || ""
+deptName = deptNameTemp = getUrlArgObjectNew("deptName", srcUrl) || ""
+deptId = deptIdTemp = getUrlArgObjectNew("deptId", srcUrl) || ""
 
 let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
 let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
@@ -45,10 +45,10 @@ $(".abnormalClear").click(function () {
 })
 
 //面包屑点击事件
-$(".partTitle a").click(function () {//初始菜单选中
-    $(".menu .page", parent.document).removeClass("active").eq(0).addClass("active");
-    $(".container", parent.document).addClass("console-cont");
-})
+// $(".partTitle a").click(function () {//初始菜单选中
+//     $(".menu .page", parent.document).removeClass("active").eq(0).addClass("active");
+//     $(".container", parent.document).addClass("console-cont");
+// })
 
 
 // 各科室缺陷占比菜单选中
@@ -83,7 +83,7 @@ function getTabData(activePage) {
         "asc": data_asc,
         "desc": data_desc,
         "doctorName": doctorName || "",
-        "doctorId":doctorNum || "",
+        "doctorId": doctorNum || "",
         "deptId": deptId,
         "deptName": deptName == "全院" ? "" : (deptName || ""),
         "type": 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
@@ -193,7 +193,7 @@ function renderTab(data, hisId, activePage) {
         let deptId = $(this).attr("dept-id")
         let doctorName = $(this).attr("dept-doc")
         let doctorId = $(this).attr("dept-docId")
-        $(parent.document).find("#contentIframe").attr("src", "doctorQuexianDetailControl.html?deptName=" + deptName + "&deptId=" + deptId+ "&doctorName=" + doctorName+ "&doctorId=" + doctorId + "&from=2" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+        $(parent.document).find("#contentIframe").attr("src", "doctorQuexianDetailControl.html?deptName=" + deptName + "&deptId=" + deptId + "&doctorName=" + doctorName + "&doctorId=" + doctorId + "&from=2" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
     })
     //病历跳转
     $(".goHomeDetailB").click(function () {
@@ -202,7 +202,7 @@ function renderTab(data, hisId, activePage) {
         let deptIds = $(this).attr("dept-id")
         let doctorName = $(this).attr("dept-doc")
         let doctorId = $(this).attr("dept-docId")
-        $(parent.document).find("#contentIframe").attr("src", "doctorQcListCopy.html?deptName=" + deptName + "&from=3" + "&shijian=3&chengdu=" + deptC + "&deptId=" + deptIds+ "&doctorName=" + doctorName+ "&doctorId=" + doctorId + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+        $(parent.document).find("#contentIframe").attr("src", "doctorQcListCopy.html?deptName=" + deptName + "&from=3" + "&shijian=3&chengdu=" + deptC + "&deptId=" + deptIds + "&doctorName=" + doctorName + "&doctorId=" + doctorId + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
     })
 }
 
@@ -345,6 +345,10 @@ function renderPagination(totalPage, activePage, totalNum) {
 }
 
 $(function () {
+
+    $(".consoleD").on("click", function () {
+        $(parent.document).find("#contentIframe").attr("src", "doctorQcAverageDetail.html?deptName=" + `${deptName == "全部" ? "全院" : deptName}` + "&deptId=" + deptId + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+    })
     const iconCalenBlue = require("./../images/darkDate.png")
     const iconCalenGrey = require("./../images/icon_calen_grey.png")
     $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
@@ -368,7 +372,7 @@ $(function () {
             "asc": data_asc,
             "desc": data_desc,
             "doctorName": doctorName || "",
-            "doctorId":doctorNum || "",
+            "doctorId": doctorNum || "",
             "deptName": deptName == "全院" ? "" : (deptName || ""),
             "deptId": deptId,
             /*"type": statisticsType||2,*/ //1-本月,2-本年

+ 16 - 4
src/js/doctorQcListCopy.js

@@ -1287,6 +1287,7 @@ $(function ($) {
     $('.export').click(function () {
         const behosDateStartTime = new Date(behosDateStart).getTime()
         const behosDateEndTime = new Date(behosDateEnd).getTime()
+        const exportTime = defectName && defectName !== 'undefined' ? exportTimeLimit.defectTime :exportTimeLimit.normalTime
         if (behosDateStartTime > behosDateEndTime) {
             $.alerModal({ "message": '开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
             return
@@ -1362,10 +1363,21 @@ $(function ($) {
                 mrTimeEnd: fpCheckDateEnd.replace(/\//g, '-'), //首页核查截止时间
             }
         }
-        $.alerModal({ type: "radio", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
-        closeRadio()
-        radioSelect()
-        bindSaveColPort(param, exportURL)
+        if(exportTime==90){
+            if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTime){
+                $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                return
+            }else{
+                expJson(exportURL,param).then(res =>{
+                    downloadExportedData(res.data, $(".partTitle").text()+".xls")
+                })
+            }
+        }else{
+            $.alerModal({type:"radio",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            closeRadio()
+            radioSelect()
+            bindSaveColPort(param,exportURL)
+        }
     })
 });
 function closeRadio() {

+ 1 - 1
src/js/quexianDetailControl.js

@@ -320,7 +320,7 @@ function renderTab(data,activePage){
         let index = $(this).parent().attr("data-index")
         let casesId = $(this).attr("data-id")
         let defectName = data[index].name
-        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptPushId + "&from=9&casesId=" + casesId + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&defectName=" + defectName)
+        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptPushId + "&from=9&casesId=" + casesId + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
         // $(parent.document).find("#contentIframe").attr("src", "uccDetail.html?from=3&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam)
     })
 }