首頁 探索 說明
註冊 登入
front
/
AIPlatform
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge remote-tracking branch 'origin/test' into version1.3.0

zhouna 5 年之前
父節點
f2d3adc91c bb9edb5eb7
當前提交
e40a172ac3
共有 18 個文件被更改，包括 90 次插入 和 89 次删除
分割檢視 顯示文件統計
  1. 1 1
      src/css/deptConsole.less
  2. 1 1
      src/html/console.html
  3. 1 1
      src/html/partDetail.html
  4. 3 3
      src/html/singleVeto.html
  5. 24 16
      src/js/console.js
  6. 4 6
      src/js/deptConsole.js
  7. 5 5
      src/js/deptScoreDetail.js
  8. 3 3
      src/js/deptScoreDetailControl.js
  9. 6 1
      src/js/mukuai.js
  10. 7 1
      src/js/mukuaiControl.js
  11. 5 4
      src/js/partDetail.js
  12. 3 3
      src/js/partDetailControl.js
  13. 2 2
      src/js/quexianDetailControl.js
  14. 4 2
      src/js/quexianDetailControlHome.js
  15. 3 1
      src/js/quexianDetailHome.js
  16. 15 36
      src/js/singleVeto.js
  17. 2 2
      src/js/tiaomu.js
  18. 1 1
      src/js/utils.js

+ 1 - 1
src/css/deptConsole.less
查看文件 

@@ -391,7 +391,7 @@ body.console {
 
       width: 40px;
 
     }
 
     .td04 {
 
-      width: 40px;
 
+      width: 60px;
 
     }
 
   }
 
 }

+ 1 - 1
src/html/console.html
查看文件 

@@ -96,7 +96,7 @@
 
           </div>
 
         </div>
 
         <div class="pubEchart paymoney">
 
-          <p class="title"><span>各科室评级病历占比</span> <img src="../images/details.png" alt=""></p>
 
+          <p class="title"><span>各科室病历评分占比</span> <img src="../images/details.png" alt=""></p>
 
           <div class="toggleSlide">
 
             <p><span>甲级</span><img src="../images/arrow_down.png" alt=""> </p>
 
             <ul>

+ 1 - 1
src/html/partDetail.html
查看文件 

@@ -41,7 +41,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>

+ 3 - 3
src/html/singleVeto.html
查看文件 

@@ -12,7 +12,7 @@
 
 <body>
 
     <div class="managerContainer tiaomu singleVeto">
 
         <div class="partTitle">
 
-          <p class="pices"><a href="console.html">控制台 / </a><span>单项否决占比</span></p>
 
+          <p class="pices"><a href="console.html">控制台 / </a><span>条目缺陷占比</span></p>
 
           <div class="monthYear">
 
             <span class="mon">本月</span>
 
             <span class="year">本年</span>
 
@@ -28,7 +28,7 @@
 
                 <span class="filterItem">
 
                     <span>缺陷名称：</span>
 
                     <span class="">
 
-                        <input class="moduleItemInp" type="text" placeholder="请输入条目名称">
 
+                        <input class="moduleItemInp" type="text" placeholder="请输入缺陷名称">
 
                     </span>
 
                 </span>
 
                 
@@ -60,7 +60,7 @@
 
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
 
                 </thead>
 
                 <tbody>
 
-    
+
 
                 </tbody>
 
             </table>
 
             <div class="pagination"></div>

+ 24 - 16
src/js/console.js
查看文件 

@@ -113,8 +113,8 @@ function getDetails(){
 
       $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
 
     })
 
     $(".part03 .circle .title").click(function(){
 
-      focusMenuItem("YH-ZKK-DXFZZB_XQ");
 
-      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&shijian"+dateType+"&qxName=&selectReject=1")
 
+      focusMenuItem("YH-ZKK-TMQXZB_XQ");
 
+      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&shijian="+dateType+"&qxName=&selectReject=1")
 
     })
 
     $(".part02").on("click",".bingli li.sec",function(){
 
       focusMenuItem("YH-BLZK-ZKPF");
 
@@ -184,6 +184,7 @@ function resizeBox(){
 
             dateType = 1
 
             getBarData(1)
 
             getAverageScoreLis()
 
+            getEveryDeptLevel()
 
         })
 
         $(".monthYear .year").click(function(){
 
             $(this).css({
 
@@ -196,8 +197,9 @@ function resizeBox(){
 
                 backgroundColor:'#203463'
 
             })
 
             dateType = 2
 
-            getAverageScoreLis()
 
             getBarData(2)
 
+            getAverageScoreLis()
 
+            getEveryDeptLevel()
 
         })
 
     }
 
 //控制台数
 
@@ -823,8 +825,8 @@ function lineChartHome(dataX,dataY1,dataY2,dataY3){
 
             formatter: function(param) {           
                 return `<div style="color:#fff;">${param[0].name}<br>
 
                     <i style="background:#00A1FF;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：${param[0]&&param[0].value}%<br>
 
-                    <i style="background:#FF2B92;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：${param[1]&&param[1].value}%<br>
 
-                    <i style="background:#3EFFD1;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率：${param[2]&&param[2].value}%<br>
 
+                    <i style="background:#FF2B92;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页完整率：${param[1]&&param[1].value}%<br>
 
+                    <i style="background:#3EFFD1;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页完善率：${param[2]&&param[2].value}%<br>
 
                 </div>`
 
             }
 
         },
 
@@ -1061,6 +1063,11 @@ function barChartLevel(dataX,dataY){
 
             position: 'right',
 
             axisPointer: {            // 坐标轴指示器，坐标轴触发有效
 
                 type: 'line'        // 默认为直线，可选为：'line' | 'shadow'
 
+            },
 
+            formatter: function(param) { 
+                return `<div style="color:#fff;">${param[0].name}<br>
 
+                    <i style="background:#00A1FF;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>${level}级病历占比：${param[0]&&param[0].value}%<br>
 
+                </div>`
 
             }
 
         },
 
         grid: {
 
@@ -1108,7 +1115,10 @@ function barChartLevel(dataX,dataY){
 
                 axisLabel: {//y轴刻度
 
                     textStyle: {
 
                         color: '#E9EBEF'
 
-                    }
 
+                    },
 
+                
+                    interval: 'auto',  
+                    formatter: '{value} %'  
                 },
 
                 splitLine:{//分割线
 
                     lineStyle:{
 
@@ -1119,7 +1129,7 @@ function barChartLevel(dataX,dataY){
 
             
         ],
 
         title:[{
 
-            text: dataX.length>0?'分数':'',
 
+            text: dataX.length>0?'百分比':'',
 
             top: 15,
 
             left: 10,
 
             textStyle: {
 
@@ -1130,7 +1140,7 @@ function barChartLevel(dataX,dataY){
 
         }],
 
         series: [
 
             {
 
-                name: '质控平均分',
 
+                name: level+'级病历占比',
 
                 type: 'bar',
 
                 barWidth: '23%',
 
                 data: dataY
 
@@ -1385,10 +1395,8 @@ function emptyCircle(data){
 
     let title = '总量';
 
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
 
     let echartData = data;
 
-    let total = 0;
 
-    for(let i = 0;i < echartData.length;i++){
 
-        total += echartData[i].num
 
-    }
 
+    let total = echartData.length>0?echartData[0].totleNum:0;
 
+    
     option = {
 
         /*backgroundColor: bgColor,*/
 
         color: color,
 
@@ -1597,8 +1605,8 @@ function queList(data){
 
     $(".qtable").html(tmp+strAll)
 
     $(".homegodetail").click(function(){
 
         let name = $(this).attr("data-name")
 
-        focusMenuItem("YH-ZKK-GMKQXZB_XQ");
 
-        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType+"&name="+name)
 
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
 
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name)
 
     })
 
 }
 
 //饼图列表注释渲染
 
@@ -1620,8 +1628,8 @@ function panDetail(data){
 
     $(".explainPanT .explainLi").click(function(){
 
         let deptName = $(this).attr("data-dept")
 
         let deptId = $(this).attr("dept-id")
 
-        focusMenuItem("YH-ZKK-DXFZZB_XQ");
 
-        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian"+dateType+"&qxName="+deptName)
 
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
 
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian="+dateType+"&qxName="+deptName)
 
     })
 
 }
 
 function panDetailB(data){

+ 4 - 6
src/js/deptConsole.js
查看文件 

@@ -53,7 +53,7 @@ function tiaomu(){
 
     });
 
     $(".circleBSingle .title,.homePageNo .title").click(function(){
 
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
 
-        $(parent.document).find("#contentIframe").attr("src","tiaomu.html?from=2&deptName="+curDept+"&dateType="+dateType)
 
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=2&deptName="+curDept+"&shijian="+dateType)
 
     });
 
     $(".homePage .title").click(function(){
 
         focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
 
@@ -721,8 +721,7 @@ function queList(data){
 
         <tr class="thead">
 
         <td class="td01">排名</td>
 
         <td class="td02">缺陷详情</td>
 
-        <td class="td03">数量</td>
 
-        <td class="td04">占比</td>
 
+        <td class="td04">错误率</td>
 
         </tr>`
 
     if(data.length == 0){
 
         $(".qtable").css("display","none")
 
@@ -738,7 +737,6 @@ function queList(data){
 
             <tr>
 
                 <td style="text-align:center;"><i style="background:${i < 3?'#ECB22E':'#526186'};color:${i < 3?'#fff':'#B7BDCC'};">${i+1}</i></td>
 
                 <td class="homegodetail" data-name="${data[i].name}"><p class="td02name ellipsis">${data[i].name}</p></td>
 
-                <td>${data[i].num}</td>
 
                 <td>${data[i].percentStr}</td>
 
             </tr>
 
         `
 
@@ -746,8 +744,8 @@ function queList(data){
 
     $(".qtable").html(tmp+strAll)
 
     $(".homegodetail").click(function(){
 
         let name = $(this).attr("data-name")
 
-        focusMenuItem("YH-KSZR-GMKQXZB_XQ");
 
-        $(parent.document).find("#contentIframe").attr("src","./mukuai.html?from=1&dateType="+dateType+"&name="+name)
 
+        focusMenuItem("YH-KSZR-TMQXZB_XQ");
 
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name)
 
     })
 
 }
 
 //饼图列表注释渲染

+ 5 - 5
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>

+ 3 - 3
src/js/deptScoreDetailControl.js
查看文件 

@@ -191,9 +191,9 @@ function renderTab(data,hisId,activePage){
 
                 <td class="goHomeDetailQuexian goHomeDetail" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
 
                 <td >${item.averageValue || "-"}</td>
 
                 <td >${item.mrNum || "-"}</td>
 
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">${item.firstLevelNum || "-"}</td>
 
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">${item.secondLevelNum || "-"}</td>
 
-                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">${item.thirdLevelNum || "-"}</td>
 
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="甲">${item.firstLevelNum+'' || "-"}</td>
 
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="乙">${item.secondLevelNum+'' || "-"}</td>
 
+                <td  class="goHomeDetailB goHomeDetail" data-dept="${item.deptName || ""}" dept-id="${item.deptId || ""}" data-c="丙">${item.thirdLevelNum+'' || "-"}</td>
 
                 <td >${item.firstLevelPercentStr || "-"}</td>
 
                 <td >${item.secondLevelPercentStr || "-"}</td>
 
                 <td >${item.thirdLevelPercentStr || "-"}</td>

+ 6 - 1
src/js/mukuai.js
查看文件 

@@ -255,13 +255,18 @@ function renderTab(data,activePage){
 
         str += `
 
             <tr data-id=${item.id} data-index=${i}>
 
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
 
-                <td>${item.name}</td>
 
+                <td class="goHomeDetail" data-model="${item.name}">${item.name}</td>
 
                 <td  class="textCenter">${item.percentStr}</td>
 
             </tr>
 
         `
 
     }
 
     $('tbody').html(str?str:emptyBox())
 
     bindEdit(data,activePage)
 
+    $(".goHomeDetail").click(function(){
 
+        let model = $(this).attr("data-model")
 
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
 
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian="+isReject)
 
+    })
 
 }
 
 
 function bindEdit(data,activePage){

+ 7 - 1
src/js/mukuaiControl.js
查看文件 

@@ -265,13 +265,19 @@ function renderTab(data,activePage){
 
         str += `
 
             <tr data-id=${item.id} data-index=${i}>
 
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
 
-                <td>${item.name}</td>
 
+                <td class="goHomeDetail" data-model="${item.name}">${item.name}</td>
 
                 <td class="textCenter">${item.percentStr}</td>
 
             </tr>
 
         `
 
     }
 
     $('tbody').html(str?str:emptyBox())
 
     bindEdit(data,activePage)
 
+    $(".goHomeDetail").click(function(){
 
+        let model = $(this).attr("data-model")
 
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
 
+        // $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian="+statisticsType+"&ruleType="+ruleType)
 
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian="+isReject)
 
+    })
 
 }
 
 
 function bindEdit(data,activePage){

+ 5 - 4
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="" 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)
 
     })
 
 }

+ 3 - 3
src/js/partDetailControl.js
查看文件 

@@ -148,14 +148,14 @@ function renderTab(data,hisId,activePage){
 
             <tr  data-index=${i}>
 
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
 
                 <td >${item.deptName || "-"}</td>
 
-                <td class="goHomeDetail" data-ruleType="0" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
 
+                <td class="goHomeDetail" data-ruleType="" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
 
                 <td >${item.firstLevelPercentStr || "-"}</td>
 
                 <td class="goHomeDetail" data-ruleType="1" data-dept="${item.deptName || ""}">${item.emptyNum+'' || "-"}</td>
 
                 <td >${item.emptyPercentStr+'' || "-"}</td>
 
-                <td class="goHomeDetail" data-ruleType="2" 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>
 
+                <td >${item.mrNum+'' || "-"}</td>
 
             </tr>
 
         `
 
     }

+ 2 - 2
src/js/quexianDetailControl.js
查看文件 

@@ -45,7 +45,7 @@ $(function(){
 
     }
 
     $(".selectDepts").html(deptName)
 
     // if(from == 1){
 
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">各科室缺陷占比 / </a>缺陷详情`)
 
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html">各科室缺陷占比 / </a>缺陷详情`)
 
         $(".partTitle .consoleD").click(function(){
 
             $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
 
             $(".container",parent.document).addClass("console-cont");
 
@@ -150,7 +150,7 @@ function getTabData(activePage){
 
         name: name, //条目名
 
         doctorName:"",
 
         casesName:deptId,
 
-        deptName:deptName||"",
 
+        deptName:deptName=="全院"?"":(deptName||""),
 
         casesId:casesIds||"",
 
         globalType:1,
 
         ascs:data_asc,

+ 4 - 2
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,7 +148,8 @@ function getTabData(activePage){
 
         name: name, //条目名
 
         doctorName:"",
 
         casesName:deptId,
 
-        deptName:deptName||"",
 
+        ruleType:ruleType||null,
 
+        deptName:deptName=="全院"?"":(deptName||""),
 
         casesId:casesIds||"",
 
         globalType:1,
 
         ascs:data_asc,

+ 3 - 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)||""
 
     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||null,
 
         size: 15
 
     }
 
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{

+ 15 - 36
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")
 
@@ -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="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp=""
 
+let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp=""
 
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
@@ -22,14 +22,17 @@ $(function(){
 
     dateChange()
 
     let srcUrl = $("#contentIframe",parent.document).attr("src")
 
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
 
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
 
+    isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||"2"
 
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
 
     from = getUrlArgObjectNew("from",srcUrl)||""
 
     special = getUrlArgObjectNew("special",srcUrl)||""
 
-    name = getUrlArgObjectNew("qxName",srcUrl)||""
 
+    name=nameTemp = getUrlArgObjectNew("qxName",srcUrl)||""
 
+    casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
 
     if(name){
 
-        $(".moduleItemInp").attr("title",name)
 
-        $(".moduleItemInp").val(name)
 
+        $(".moduleItemInp").attr("title",name).val(name)
 
+    }
 
+    if(casesName){
 
+        $(".selectModuleType").html(casesName).attr("title",casesName).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
     }
 
     if(selectReject){
 
         isSingleReject = isSingleRejectTemp = '1'
 
@@ -42,7 +45,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(){
 
@@ -134,8 +139,7 @@ function getTabData(activePage){
 
         deptName: deptId, //科室名
 
         size: 15
 
     }
 
-    console.log(isReject,from)
 
-    post(from == 1?api.entryGroupByEntryInnerPage:api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
 
+    post(from == 1?api.entryGroupByEntryInnerPage:api.entryGroupByEntryAndDeptInnerPage,param).then(res =>{
 
         if(res.data.code == '0'){
 
             const data = res.data.data.records
 
             const totalPage = res.data.data.pages
 
@@ -186,32 +190,7 @@ function hasData(data){
 
     }
 
     return false;
 
 }
 
-//获取表格数据
 
-function getTabDatas(activePage){
 
-    const param = {
 
-        current:activePage,
 
-        casesId: casesId,
 
-        name: name, //条目名
 
-        isReject: isReject, //1-单项否决 0-非
 
-        isUsed: isUsed, //0-未启用 1-启用
 
-        size: 15
 
-    }
 
-    post(api.getQcCasesEntryAll,param).then(res =>{
 
-        if(res.data.code == '0'){
 
-            const data = res.data.data.records
 
-            const totalPage = res.data.data.pages
 
-            const totalNum = res.data.data.total
 
-            renderTab(data,activePage)
 
-            if(totalPage > 1){
 
-                renderPagination(totalPage,Number(activePage),totalNum)
 
-            } else{
 
-                $('.pagination').html("")
 
-            }
 
-        }else{}
 
-    }).catch((e) =>{
 
-    
-    })
 
-}
 
+
 
 $(".moduleItemInp").on("input", function(e){
 
     const val = $(this).val().trim()
 
     nameTemp = val
 
@@ -452,7 +431,7 @@ function bindRejectSelect(){
 
     $('.rejectItem').on("click",function(){
 
         const rejectItemName = $(this).attr("data-name")
 
         const rejectItemId = $(this).attr("data-id")
 
-        isSingleRejectTemp=rejectItemId
 
+        isSingleReject=isSingleRejectTemp=rejectItemId
 
         $('.selectReject').html(rejectItemName)
 
         $(".rejectList ").css("display", "none")
 
         $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)

+ 2 - 2
src/js/tiaomu.js
查看文件 

@@ -121,10 +121,10 @@ function getDeptList(flg){
 
     let str = ``
 
     if(deptList.length<=0)return
 
     if(flg){
 
-        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
 
+        $(".partDetail .selectDept ").attr({"data-id":deptList[0].deptName,"title":deptList[0].deptName}).find("i").html(deptList[0].deptName)
 
         deptId = deptIdTemp = deptList[0].deptName
 
     }
 
-    $(".tiaomu .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
 
+    $(".tiaomu .selectDept ").attr({"data-id":deptList[0].deptName,"title":deptList[0].deptName}).find("i").html(deptList[0].deptName)
 
     for(let i = 0;i < deptList.length;i++){
 
         let tmp = deptList[i]
 
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`

+ 1 - 1
src/js/utils.js
查看文件 

@@ -35,7 +35,7 @@ const pageMap={
 
   "YH-KSZR-BASYHGLZB_XQ":'partDetail.html',
 
 
   "YH-JCSJWH-ZKLXWH":'assertType.html',
 
-  "YH-ZKK-DXFZZB_XQ":'singleVeto.html?from=1',
 
+  "YH-ZKK-TMQXZB_XQ":'singleVeto.html?from=1',
 
 };
 
 
 //重写assign方法