Merge branch 'xy3yuan1015' into test

src/js/dept/partDetailControlDept.js

@@ -18,7 +18,7 @@ listenScroll()
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode = "", behosDateStart = "", casesNameTemp = "", casesName = "", level = "", behosDateEnd = "", scoreSum = 0, statisticsType = "",
-    nameTemp = "", behospitalCodeTemp = "", levelTemp = "", deptId = "", deptIdTemp = "", doctorName = "", doctorNum = "", doctorNameTemp = "", doctorNumTemp = "",
+    nameTemp = "", behospitalCodeTemp = "", levelTemp = "", deptId = "", deptIdTemp = "",deptName="",deptNameTemp = "", doctorName = "", doctorNum = "", doctorNameTemp = "", doctorNumTemp = "",
     data_desc = '', data_asc = '';
 let deptList = JSON.parse(getCookie("deptList")) || []
 let isPlacefile = getCookie('isPlacefile') || 1
@@ -187,7 +187,7 @@ function getTabData(activePage) {
     const param = {
         "asc": data_asc,
         "desc": data_desc,
-        "deptName": deptIdTemp || "",
+        "deptName": deptName || "",
         "deptId": deptId || "",
         "name": casesName == "全部" ? "" : casesName || "",
         "doctorName": casesName == "全部" ? "" : casesName || "",
@@ -499,8 +499,8 @@ function bindDeptSelect() {
     $("body").on("click", '.deptItem', function () {
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
-        deptIdTemp = deptItemId = deptId
-        deptNameTemp = deptItemName = deptName
+        deptId = deptIdTemp = deptItemId 
+        deptName = deptNameTemp = deptItemName
         if (deptItemName.length > 10) {
             $('.selectDept').html(deptItemName.substring(0, 8) + '...')
         } else {

src/js/dept/qcListCopyDept.js

@@ -114,7 +114,7 @@ if (from == 2) {
 } else if (from == 3) {
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a href="keyItemFlawControlDept.html">关键条目缺陷占比 / </a>病历列表`)
 } else if (from == 13) {
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台(科室) / </a><a class="consoleP" href="deptQualifiedPhysician.html?from=1">医师病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailHome.html">缺陷列表 / </a>病历列表`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="deptQualifiedPhysician.html?from=1">医师病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailHome.html">缺陷列表 / </a>病历列表`)
     $(".defectDetail").on("click", function () {
         $(parent.document).find("#contentIframe").attr("src", "quexianDetailHome.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=13&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + docName + "&code=XY" + "&professor=" + professor)
     })
@@ -144,7 +144,7 @@ if (from == 2) {
 }
 $(".partTitle .consoleD").click(function () {
     //初始菜单选中   
-    focusMenuItem(from == 2 ? 'YH-KZTKS' : 'YH-KZT')
+    focusMenuItem(from == 2 || from == 13 || from == 4 || from == 10 ? 'YH-KZTKS' : 'YH-KZT')
     $(".container", parent.document).addClass("console-cont");
 })
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)