接口参数调整

src/html/partDetail.html

@@ -42,7 +42,7 @@
                 <table>
                     <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
-                    <th class="beHospitalId textCenter">科室名称</th>
+                    <th class="beHospitalId textCenter">主管医生</th>
                     <th class="beHospitalId textCenter">缺陷总数</th>
                     <th class="beHospitalId textCenter">合格率</th>
                     <th class="beHospitalId textCenter">空项数</th>

src/js/deptScoreDetail.js

@@ -191,12 +191,12 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.doctorName || "-"}</td>
-                <td class="goHomeDetail" data-doc="${item.doctorName || ""}">${item.entryNum || "-"}</td>
+                <td class="goHomeDetail" data-doc="${item.doctorName || ""}">${item.entryNum+'' || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
-                <td >${item.mrNum || "-"}</td>
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="甲">${item.firstLevelNum || "-"}</td>
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="乙">${item.secondLevelNum || "-"}</td>
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="丙">${item.thirdLevelNum || "-"}</td>
+                <td >${item.mrNum+'' || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="甲">${item.firstLevelNum+'' || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="乙">${item.secondLevelNum+'' || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.doctorName || ""}" data-c="丙">${item.thirdLevelNum+'' || "-"}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
                 <td >${item.secondLevelPercentStr || "-"}</td>
                 <td >${item.thirdLevelPercentStr || "-"}</td>

src/js/partDetail.js

@@ -190,11 +190,11 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td >${item.doctorName || "-"}</td>
-                <td data-doc="${item.doctorName || ""}" class="goHomeDetail">${item.entryNum || "-"}</td>
+                <td data-doc="${item.doctorName || ""}" data-ruleType="0" class="goHomeDetail">${item.entryNum || "-"}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
-                <td  class="goHomeDetail" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
+                <td  class="goHomeDetail" data-ruleType="1" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
                 <td >${item.emptyPercentStr+'' || "-"}</td>
-                <td  class="goHomeDetail" data-dept="${item.deptName || ""}">${item.errorNum || "-"}</td>
+                <td  class="goHomeDetail" data-ruleType="2" data-dept="${item.deptName || ""}">${item.errorNum+'' || "-"}</td>
                 <td >${item.errorPercentStr+'' || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
                 <td >${item.mrNum || "-"}</td>
@@ -205,7 +205,8 @@ function renderTab(data,hisId,activePage){
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailHome.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType)
+        let ruleType = $(this).attr("data-ruleType")
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailHome.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType+"&ruleType="+ruleType)
     })
 }
 

src/js/quexianDetailControlHome.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -26,6 +26,7 @@ $(function(){
     from = getUrlArgObjectNew("from",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||"2"
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
+    ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
     $('.selectDept').html(deptName).attr("title",deptName)
     if(isReject == 1){
         $(".monthYear .mon").css({
@@ -147,6 +148,7 @@ function getTabData(activePage){
         name: name, //条目名
         doctorName:"",
         casesName:deptId,
+        ruleType:ruleType,
         deptName:deptName=="全院"?"":(deptName||""),
         casesId:casesIds||"",
         globalType:1,

src/js/quexianDetailHome.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",ruleType="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -26,6 +26,7 @@ $(function(){
     docName = getUrlArgObjectNew("docName",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||"2"
+    ruleType= getUrlArgObjectNew("ruleType",srcUrl)||"2"
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -164,6 +165,7 @@ function getTabData(activePage){
         casesId:casesIds||"",
         ascs:data_asc,
         descs:data_desc,
+        ruleType:ruleType,
         size: 15
     }
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{

src/js/singleVeto.js

@@ -3,7 +3,7 @@ require("../css/tiaomu.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,focusMenuItem} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -46,7 +46,9 @@ $(function(){
     getTabData(1)//条目缺陷
     $(".partTitle a").click(function(){
         //初始菜单选中
-        $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+        $(".managerContainer").remove()
+        focusMenuItem('YH-KZT')
+        // $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){

src/js/utils.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.241:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',