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

src/html/assertTypeDetail.html

@@ -17,19 +17,19 @@
           <div class="grayLine"></div>     
           <div class="main-body">
             <div class="filterBox clearfix">
-                <div class="filterItem typeFilter deptListWrap">
+                <!-- <div class="filterItem typeFilter deptListWrap">
                     <span class="explainL" style="overflow:hidden">科室名称：</span>
                     <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
                     </ul>
-                </div>   
+                </div>    -->
                 <div class="filterItem typeFilter">
                     <span class="explainL">质控类型：</span>
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入质控类型">
                 </div>
                 <div class="filterItem typeFilter">
-                    <span class="explainL">质控条目：</span>
+                    <span class="">质控条目：</span>
                     <ul class="listTypeAll">
                         <li>
                             <span>病案首页</span><i></i>

src/html/qcList.html

@@ -64,7 +64,7 @@
                 <table>
                     <thead>
                     <tr>
-                        <td colspan="17" style="background: #fff">
+                        <td colspan="18" style="background: #fff">
                             <div class="tabFoot">
                                 <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                 <span class="recordScoreBtn">评分</span>

src/html/qcListDept.html

@@ -63,7 +63,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="17" style="background: #fff">
+                            <td colspan="18" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>

src/html/qcListPerson.html

@@ -63,7 +63,7 @@
                 <table>
                     <thead>
                         <tr>
-                            <td colspan="17" style="background: #fff">
+                            <td colspan="18" style="background: #fff">
                                 <div class="tabFoot">
                                     <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
                                     <span class="recordScoreBtn">评分</span>

src/html/quexianDetail.html

@@ -25,6 +25,10 @@
         <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
+                <span class="filterItem typeFilter deptListWrap">
+                    <span>科室名称：</span>
+                    <span class="selectDepts" data-id="">全部</span>
+                </span>
                 <span class="filterItem">
                     <span>缺陷名称：</span>
                     <span class="">
@@ -53,7 +57,7 @@
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
                 <tbody>
-    
+                    
                 </tbody>
             </table>
             <div class="pagination"></div>

src/html/quexianDetailControl.html

@@ -25,6 +25,10 @@
         <div class="grayLine"></div>
         <div class="main-body">
             <div class="filterBox">
+                <span class="filterItem typeFilter deptListWrap">
+                    <span>科室名称：</span>
+                    <span class="selectDepts" data-id="">全部</span>
+                </span>
                 <span class="filterItem">
                     <span>缺陷名称：</span>
                     <span class="">

src/js/abnormal.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/abnormal.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -132,7 +132,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
 }
 
@@ -148,7 +148,6 @@ function bindScoreDetail(hisId){
     })
 }
 
-  
 function midifyMsgBox(item,type){
     const itemCopy = JSON.parse(JSON.stringify(item))
     let msgBox = ''

src/js/api.js

@@ -1,4 +1,3 @@
-
 const api = {
     getMenu:'/sys/user/getUserOrgMenu',     //获取菜单
     midifyPassword:'/sys/user/midifyPassword',     //修改密码

src/js/assertType.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/assertType.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -202,10 +202,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")

src/js/console.js

@@ -82,7 +82,7 @@ $(function(){
 function getDetails(){
     $(".part02 .bingliLis,.part03 .circle .title,.pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&deptType="+deptType)
     })
     $(".part02").on("click",".bingli li.sec",function(){
       focusMenuItem("YH-BLZK-ZKPF");

src/js/dayDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/dayDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -168,10 +168,7 @@ function renderTab(data,hisId,activePage){
         </thead>
         `}
         <tbody>
-            ${str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-                <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-                <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-                </td></tr>`}
+            ${str?str:emptyBox()}
         </tbody>
     `
     $('.tableDay').html(sts)

src/js/deptConsole.js

@@ -61,7 +61,7 @@ function tiaomu(){
         focusMenuItem("YH-BLZK-ZKPFKS");
         let dataC = $(this).attr("data-c")
         let chengdu = dataC == 1?'甲':dataC==2?'乙':'丙'
-        $(parent.document).find("#contentIframe").attr("src","./qcListDept.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&deptName="+curDept)
+        $(parent.document).find("#contentIframe").attr("src","./qcListDept.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&deptName="+curDept+"&deptId="+curDeptId)
     });
 }
 //判断有无某一权限
@@ -522,11 +522,7 @@ function emptyCircleB(data){
     let title = '总量';
     let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
     let echartData = data;
-    console.log(echartData,9999)
-    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,
@@ -618,10 +614,7 @@ function emptyCircleBc(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,

src/js/deptScoreDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,focusMenuItem} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -24,7 +24,7 @@ $(function(){
     deptList = JSON.parse(getCookie("deptList"))||[]
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
-    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"2"
     curDeptId = getUrlArgObjectNew("curDeptId",srcUrl)||""
     if(statisticsType == 1){
         $(".monthYear .mon").css({
@@ -203,10 +203,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")

src/js/deptScoreDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,focusMenuItem} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,focusMenuItem,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -17,13 +17,16 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,deptType = "",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[],hospital=getCookie("hospital");
   let srcUrl = $("#contentIframe",parent.document).attr("src")
-  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"2"
+  deptType = getUrlArgObjectNew("deptType",srcUrl)||""
   if(hospital == '台州市立'){
     $(".deptListWrap").css("display","inline-block")
+    $(".deptListWrap .selectDept").html(deptType||"全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    deptId = deptIdTemp = deptType
 }else{
     $(".deptListWrap").css("display","none")
   }
@@ -195,10 +198,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('.deptScoreDetailControlTable table').html(str?tHead+'<tbody>'+str+'</tbody>':tHead+`<tbody><tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr></tbody>`)
+    $('.deptScoreDetailControlTable table').html(str?tHead+'<tbody>'+str+'</tbody>':tHead+`<tbody>${emptyBox()}</tbody>`)
     bindScoreDetail(hisId)
     $(".goHomeDetailQuexian").click(function(){
         let deptName = $(this).attr("data-dept")

src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -153,10 +153,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-            </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
 }
 

src/js/moduleManager.js

@@ -6,7 +6,7 @@ require('./modal.js');
 
 // const  layui = require('layui-src');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,emptyBox} = require('./utils.js')
 function setTbaleInfoHei(){
  
     $(".tableInfo").css({
@@ -57,7 +57,7 @@ function renderTab(){
     //     <td class="totalSum"></td>
     // </tr>
     // `
-    $('.tableInfo table').html(str?str:'<tr><td colspan="17" style="text-align: center;color: #aaa">暂无数据~</td></tr>')
+    $('.tableInfo table').html(str?str:emptyBox())
     const tableInfoBox =  $(".tableInfo").height()
     const tableInfoHei =  $(".tableInfo table").height()
     if(tableInfoHei > tableInfoBox){

src/js/mukuai.js

@@ -3,7 +3,7 @@ require("../css/mukuai.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -256,10 +256,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/mukuaiControl.js

@@ -3,7 +3,7 @@ require("../css/mukuai.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -243,10 +243,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/partDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -198,10 +198,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")

src/js/partDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -156,10 +156,7 @@ function renderTab(data,hisId,activePage){
         `
     }
     // console.log(str)
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let deptName = $(this).attr("data-dept")

src/js/payDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/payDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -172,10 +172,7 @@ function renderTab(data,hisId,activePage){
         </thead>
         `}
         <tbody>
-            ${str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-            </td></tr>`}
+            ${str?str:emptyBox()}
         </tbody>
     `
     $('.tableDay').html(sts)

src/js/qcList.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcList.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -15,12 +15,35 @@ const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
+let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
+let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
+let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=["leave_hospital_date"],data_asc=[];
-
+if(chengdu){
+    levelTemp = chengdu
+    level = chengdu
+    $('.selectLevel').html(chengdu)
+    $(".levelList").css("display", "none")
+    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
+if(deptIdPram&&deptNamePram){
+    deptIdTemp = deptIdPram
+    deptId = deptIdPram
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
+    $(".deptList").css("display", "none")
+    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -58,9 +81,10 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
-        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
-        size: 15
+        leaveHosDateStart: behosDateStart, //出院日期--开始时间
+        leaveHosDateEnd: behosDateEnd, //出院日期--结束时间
+        size: 15,
+        statisticsType:statisticsType
     }
     post(api.qcList,param).then(res =>{
         if(res.data.code == '0'){
@@ -149,10 +173,7 @@ function renderTab(data,hisId){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-      $('tbody').html(`<tr><td colspan="17" style="text-align: center;color: #aaa">
-          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-      </td></tr>`)
+      $('tbody').html(emptyBox())
       return;
     }
     for(let i = 0; i < data.length; i++){
@@ -465,17 +486,26 @@ $(function() {
     initStatus: '请选择日期',
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(statisticsType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(statisticsType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1m" );
+    }).datepicker( "setDate", startDate);
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate", new Date());
+    }).datepicker( "setDate",endDate);
     $(".filter").click();   //初始查询
 });
 

src/js/qcListDept.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListDept.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -15,13 +15,41 @@ const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
+
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
+let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
+let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
+let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
+
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=["leave_hospital_date"],data_asc=[];
 //   $(".abnormalClear").click(function(){
 //     window.location.reload()
 // })
+
+if(chengdu){
+    levelTemp = chengdu
+    level = chengdu
+    $('.selectLevel').html(chengdu)
+    $(".levelList").css("display", "none")
+    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
+if(deptIdPram&&deptNamePram){
+    deptIdTemp = deptIdPram
+    deptId = deptIdPram
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
+    $(".deptList").css("display", "none")
+    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -59,7 +87,8 @@ function getTabData(activePage){
         doctorCode: doctorNum,
         leaveHosDateStart: behosDateStart, //1-单项否决 0-非
         leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
-        size: 15
+        size: 15,
+        statisticsType:statisticsType
     }
     post(api.qcListByDept,param).then(res =>{
         if(res.data.code == '0'){
@@ -164,10 +193,7 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-      $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-      </td></tr>`)
+      $('tbody').html(str?str:emptyBox())
       return;
     }
     for(let i = 0; i < data.length; i++){
@@ -464,16 +490,26 @@ $(function() {
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
 
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(statisticsType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(statisticsType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1m" );
+    }).datepicker( "setDate", startDate);
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate", new Date());
+    }).datepicker( "setDate",endDate);
     $(".filter").click();   //初始查询
 });
 

src/js/qcListPerson.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListPerson.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getUrlArgObject,getCookie} = require('./utils.js')
+const {post,getUrlArgObject,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -23,9 +23,36 @@ $('.selectDoctor').html(doctorName_global)
 // })
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
+let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
+let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
+let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
+
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global,data_desc=["leave_hospital_date"],data_asc=[];
 
+
+if(chengdu){
+    levelTemp = chengdu
+    level = chengdu
+    $('.selectLevel').html(chengdu)
+    $(".levelList").css("display", "none")
+    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
+if(deptIdPram&&deptNamePram){
+    deptIdTemp = deptIdPram
+    deptId = deptIdPram
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
+    $(".deptList").css("display", "none")
+    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -61,7 +88,8 @@ function getTabData(activePage){
         doctorName: doctorName,
         leaveHosDateStart: behosDateStart, //1-单项否决 0-非
         leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
-        size: 15
+        size: 15,
+        statisticsType:statisticsType
     }
     post(api.qcListByPerson,param).then(res =>{
         if(res.data.code == '0'){
@@ -164,10 +192,7 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-        $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-        </td></tr>`)
+        $('tbody').html(str?str:emptyBox())
         return;
     }
     for(let i = 0; i < data.length; i++){
@@ -460,16 +485,26 @@ $(function() {
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
 
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(statisticsType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(statisticsType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-1m" );
+    }).datepicker( "setDate", startDate);
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate", new Date());
+    }).datepicker( "setDate",endDate);
     $(".filter").click();   //初始查询
 });
 

src/js/qcScore.js

@@ -264,7 +264,7 @@ function showModal(flag,code,i){
   $("#delModal .confirm").off("click");
   $("#qcScore,#qcMsg").off("input");
   const flawsList = formatFlawKeys(global_flawData);
-  const info = flawsList[global_activeTab][i];
+  const info = flawsList[global_activeTab]&&flawsList[global_activeTab][i];
   if(flag==='0'){   //修改
     $("#delModal .title").text("修改");
     $("#delModal .confirm").text("保存");

src/js/quexianDetail.js

@@ -3,7 +3,7 @@ require("../css/quexianDetail.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -43,6 +43,7 @@ $(function(){
             backgroundColor:'#fff'
         })
     }
+    $(".selectDepts").html(deptName)
     getTabData(1)//条目缺陷    
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
@@ -294,10 +295,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/quexianDetailControl.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControl.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -43,6 +43,7 @@ $(function(){
             backgroundColor:'#fff'
         })
     }
+    $(".selectDepts").html(deptName)
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
         $(".partTitle .consoleD").click(function(){
@@ -281,10 +282,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/quexianDetailControlHome.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailControlHome.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -281,10 +281,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/quexianDetailHome.js

@@ -3,7 +3,7 @@ require("../css/quexianDetailHome.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -293,10 +293,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/quexianXQ.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/quexianXQ.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,emptyBox} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
@@ -126,10 +126,7 @@ function renderTab(data,hisId,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
 }
 

src/js/tiaomu.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} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -292,10 +292,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/tiaomuControl.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} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -263,10 +263,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/userManager.js

@@ -3,7 +3,7 @@ require("../css/itemManager.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post} = require('./utils.js')
+const {post,emptyBox} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -122,10 +122,7 @@ function renderTab(data,activePage){
             </tr>
         `
     }
-    $('tbody').html(str?str:`<tr><td colspan="17" style="text-align: center;color: #aaa">
-        <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-        <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-    </td></tr>`)
+    $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
 }
 

src/js/utils.js

@@ -34,7 +34,6 @@ const pageMap={
   "YH-KSZR-BASYHGLZB_XQ":'partDetail.html',
 
   "YH-JCSJWH-ZKLXWH":'assertType.html',
-
 };
 
 //重写assign方法
@@ -117,6 +116,7 @@ const post = function (url, data) {
       },
       error: function (error) {
         if(error.status===403||error.status===401){
+          console.log(url)
           return
           const wd = window.parent.window||window;
           wd.location.href = "../login.html";
@@ -198,6 +198,13 @@ function focusMenuItem(code){
   //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
   ele.click();
 }
+function emptyBox(name){
+  let str = `<tr><td colspan="17" style="text-align: center;color: #aaa">
+  <img style="margin-top:50px;width:100px;" src="${require('../images/empty1.png')}" />
+  <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">${name||'暂无数据~'}</p>
+  </td></tr>`
+  return str
+}
 module.exports = {
   pageMap,
   post,
@@ -209,5 +216,6 @@ module.exports = {
   delCookie,
   setBoxHeight,
   hasData,
-  focusMenuItem
+  focusMenuItem,
+  emptyBox
 };

webpack.config.js

@@ -6,8 +6,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:5858";
-// const proxyHost = "http://192.168.2.241:5858";
+// const proxyHost = "http://192.168.2.236:5858";
+const proxyHost = "http://192.168.2.241:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢
 // const proxyHost = "http://192.168.3.113:5858";//王峰
 module.exports = {