首页日期

src/css/common.less

@@ -57,6 +57,101 @@ th[code]{
         background-size: 100%;
     }
 }
-.selectDates {
 
+.dataSelectDark {
+    // position: relative;
+    // display: inline-block;
+    margin: 4px 20px 10px 0;
+    top: 0px !important;
+    height: 34px !important;
+    line-height: 34px !important;
+    float: right !important;
+    span {
+        position: relative;
+        display: inline-block;
+        height: 34px !important;
+        line-height: 34px !important;
+        float: left;
+    }
+    input {
+        width: 120px;
+        height: 32px;
+        border-radius: 4px;
+        border: 1px solid @themeBorderClr;
+        outline: none;
+        padding: 0 10px;
+        box-sizing: border-box;
+        background-color: @themeColor;
+        color: @secColor;
+    }
+    .iconCalen{
+        position: absolute;
+        width: 15px;
+        top: 8px;
+        right: 10px;
+    }
+    .divide {
+        margin: 0 10px;
+        color: #fff;
+    }
+}
+
+.ui-datepicker-calendar {
+    border: 0 none;
+    min-width: 0;
+}
+.ui-datepicker thead {
+    background-color: #fff;
+    color: #c3cbd6;
+}
+.ui-datepicker td {
+    padding: 0;
+    height: auto;
+    color: #657180;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    text-align: center;
+    height: 30px;
+    line-height: 30px;
+}
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    border: 0;
+    background-color: #fff;
+    &:hover {
+        background-color: #c4d8fe;
+    }
+}
+
+.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    color: #333;
+    font-weight: normal;
+    height: 30px;
+    line-height: 30px;
+    margin: 0 5px;
+    width: 40%;
+    border-radius: 3px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 5px;
+}
+.ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: @activeColor !important;
+    color: #fff;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #fff5bf !important;
+    color: #657180;
+}
+.ui-widget-header {
+    background-color: #fff;
+    border: 0 none;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+
+input[type="number"] {
+    -moz-appearance: textfield;
 }

src/css/console.less

@@ -4,6 +4,64 @@ body.console {
   overflow: auto;
   overflow-y: hidden;
   background: @activeBg;
+
+  .ui-widget.ui-widget-content,
+  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    background-color: @themeColor;
+    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
+    color: @fstColor;
+  }
+  .ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #00A0FE;
+  }
+  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
+    background-color: #142753;
+  }
+  .ui-state-hover .ui-icon {
+    background-image:"url(../images/add.png)";
+  }
+  .dataSelectDark input {
+    height: 28px;
+  }
+  .ui-widget-header .ui-icon {
+    background-image:url(../images/down_blue.png);
+  }
+  // .ui-icon, .ui-widget-content .ui-icon {
+  //   background-image:"url(../images/logo.png)";
+  // }
+  .ui-datepicker th span {
+    color: @fstColor;
+  }
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget.ui-widget-content{
+    border-color: @themeBorderClr;
+  }
+  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #5B70A4 !important;
+  }
+  .sureDate {
+    cursor: pointer;
+    background-color: #00A1FF;
+    color: @fstColor;
+    border-left: 0 none;
+    border-radius: 4px;
+    overflow: hidden;
+    box-sizing: border-box;
+    height: 28px !important;
+    line-height: 28px !important;
+    box-sizing: border-box;
+    width: 48px;
+    margin: 3px 20px 0 10px;
+    text-align: center;
+    box-sizing: border-box;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+  }
   .innerOuter {
     display: none;
   }
@@ -179,8 +237,8 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    height: 30px;
-    line-height: 30px;
+    height: 28px;
+    line-height: 28px;
     cursor: pointer;
     margin-top: 7px;
     border: 0 none;
@@ -200,9 +258,11 @@ body.console {
       border-left: 0 none;
       border-radius:0 4px 4px 0;
       overflow: hidden;
+      box-sizing: border-box;
     }
     .mon {
       border: 1px solid @secColor;
+      box-sizing: border-box;
       border-radius: 4px 0 0 4px;
       border-right: 0 none;
       color: @secColor;

src/css/index.less

@@ -353,6 +353,13 @@
       height: 100%;
       overflow: auto;
     }
+    
+    .dateDetail {
+      font-size: 12px;
+      color: @secColor;
+      margin-right: 30px;
+      font-weight: normal;
+    }
   }
   //修改密码
   .modalAction {

src/css/qcList.less

@@ -314,62 +314,3 @@ table{
 
 
 
-.ui-datepicker-calendar {
-    border: 0 none;
-    min-width: 0;
-}
-.ui-datepicker thead {
-    background-color: #fff;
-    color: #c3cbd6;
-}
-.ui-datepicker td {
-    padding: 0;
-    height: auto;
-    color: #657180;
-}
-.ui-datepicker td span, .ui-datepicker td a {
-    text-align: center;
-    height: 30px;
-    line-height: 30px;
-}
-
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-    border: 0;
-    background-color: #fff;
-    &:hover {
-        background-color: #c4d8fe;
-    }
-}
-.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    color: #333;
-    font-weight: normal;
-    height: 30px;
-    line-height: 30px;
-    margin: 0 5px;
-    width: 40%;
-    border-radius: 3px;
-}
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
-    top: 5px;
-}
-.ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: @activeColor !important;
-    color: #fff;
-}
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {
-    background-color: #fff5bf !important;
-    color: #657180;
-}
-.ui-widget-header {
-    background-color: #fff;
-    border: 0 none;
-}
-
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-}
-
-input[type="number"] {
-    -moz-appearance: textfield;
-}

src/html/console.html

@@ -12,15 +12,16 @@
       <span class="mon">本月</span>
       <span class="year">本年</span>
     </div>
-    <!-- <span class="selectDates filterItem typeFilter clearfix" style="margin-top: 3px;">
-        <span class="fl">出院日期：</span>
-        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
-        <span  class="divide fl">-</span>
-        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /></span>
-    </span> -->
     <div class="dateDetail fr">
       
     </div>
+    <span class="dataSelectDark filterItem typeFilter clearfix">
+        <!-- <span class="fl">出院日期：</span> -->
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="divide fl">-</span>
+        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" /><img class="iconCalen" src="../images/icon_calen_grey.png" /></span>
+        <span class="sureDate">查询</span>
+    </span>
   </div>
   <div class="partTitleT"></div>
   <!--<div class="grayLine"></div>-->

src/html/index.html

@@ -73,6 +73,9 @@
                           <li><a class="login-out" href="./login.html">退出</a></li>
                       </ul>
                   </div>
+                  <div class="dateDetail fr">
+                
+                  </div>
               </div>
               <iframe src="./console.html" frameborder="0" id="contentIframe"></iframe>
           </div>

src/html/qcList.html

@@ -45,7 +45,7 @@
                     <span>医生工号：</span>
                     <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                 </span>
-                    <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
+                <span class="filterItem typeFilter clearfix" style="margin-top: 3px;">
                     <span class="fl">出院日期：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" /></span>
                     <span  class="divide fl">-</span>

src/js/console.js

@@ -1,4 +1,5 @@
 const $ = require('jquery');
+
 require("../css/reset.less")
 require("../css/console.less")
 require("../images/logo.png")
@@ -7,8 +8,11 @@ require("../images/arrow_down.png")
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
 const echarts = require('echarts');
+require('./../resource/jquery-ui/jquery-ui.min.js');
+require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData} = require('../js/utils.js');
-let payMoney = [],dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
+let payMoney = [],behosDateStart="",behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="合格率",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
+
 $(function(){
     if(!hasData('YH-KZT')){
         $("body").html('')
@@ -21,12 +25,12 @@ $(function(){
     //     $(".innerOuter").css("display","none")
     // }
     $(".partTitle p span").html(hospital)
-    setInterval(() => {
-        getTimeDetail()
-    }, 1000);
+    // setInterval(() => {
+    //     getTimeDetail()
+    // }, 1000);
     resizeBox()
     initConsole()//质控列表
-    getBarData(2)//图标数据获取
+    // getBarData(2)//图标数据获取
     dateChange()
     $(window).resize(function(){
         resizeBox()
@@ -112,7 +116,6 @@ $(function(){
       $(this).find(".explainNum").css("color","#A5ADBF")
     })
     getDetails()
-    getAverageScoreLis()
     getEveryDeptLevel()
 })
 function getDetails(){
@@ -193,9 +196,7 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 1
-            getBarData(1)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(1)
         })
         $(".monthYear .year").click(function(){
             $(this).css({
@@ -208,11 +209,11 @@ function resizeBox(){
                 backgroundColor:'#203463'
             })
             dateType = 2
-            getBarData(2)
-            getAverageScoreLis()
-            getEveryDeptLevel()
+            dateConsole(2)
         })
     }
+
+
 //控制台数
 function initConsole(result){
     let url = {
@@ -264,7 +265,9 @@ function getAverageScoreLis(){
     }
     post(url,{//各科室质控平均分
         "type": dateType||1,//1月2年
-        "deptClass":deptType
+        "deptClass":deptType,
+        "startDate":behosDateStart,
+        "endDate":behosDateEnd
     }).then((res)=>{
         let data = res.data;
         if(data.code == 0){
@@ -280,10 +283,12 @@ function getAverageScoreLis(){
 }
 //获取各科室病历等级占比
 function getEveryDeptLevel(){
-    if(1){
+    if(1){//权限暂无
         post(api.qcResultLevelPercent,{//各科室病历等级占比
             "type": dateType||2,//1月2年
-            "level":level
+            "level":level,
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -368,7 +373,9 @@ function getBarData(type){
     // }
     if(hasData("FUNC000075")){
         post(api.homePageLevelLimit,{//病案首页
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -391,7 +398,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000049')){
         post(api.leaveHosCount,{//出院人数统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -404,7 +413,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000050')){
         post(api.mrCount,{//质控病历统计
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data
             if(data.code == 0){
@@ -415,7 +426,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000051')){
         post(api.entryCountGroupByCase,{//各模块缺陷占比排行
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -427,7 +440,9 @@ function getBarData(type){
     }
     if(hasData('FUNC000052')){
         post(api.entryCountGroupByEntry,{//条目缺陷占比
-            "type": type||1//1月2年
+            "type": type||1,//1月2年
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -460,6 +475,8 @@ function getBarData(type){
             "type": type||2,//1月2年
             "deptClass": "",
             "level": "",
+            "startDate":behosDateStart,
+            "endDate":behosDateEnd
         }).then((res)=>{
             let data = res.data;
             if(data.code == 0){
@@ -820,7 +837,6 @@ function lineChartHome(dataX,dataY){
     $(window).resize(function(){
         myCharts.resize()
     });
-    console.log(lineType)
     option = {
         color:(lineType == "合格率")?'#00A1FF':(lineType=="完整率"?'#FF2B92':'#3EFFD1'),   
         title: {
@@ -905,6 +921,7 @@ function lineChartHome(dataX,dataY){
         yAxis: {
             type: 'value',
             min:0,
+            max:100,
             boundaryGap: [0.01, 0.01],axisLabel: {  
                 show: true,  
                 },  
@@ -1675,4 +1692,102 @@ function getTimeDetail(){
     let hour = d.getHours()
     let str = `${d.getFullYear()}年${d.getMonth()+1}月${d.getDate()}日 / ${days[d.getDay()]} / ${hour>9?hour:'0'+hour}:${min>9?min:'0'+min}:${sec>9?sec:'0'+sec}`
     $(".dateDetail").html(str)
-}
+}
+$(".sureDate").click(function(){
+    getStaticDate()
+    getAverageScoreLis()
+    getBarData(dateType)
+    getEveryDeptLevel()
+})
+//日期联动
+function dateConsole(dateType){
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(dateType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(dateType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate = "-1m"
+    }
+    $( "#datepicker" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    $( "#datepicker2" ).datepicker({
+        yearRange: "2015:"+year,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",endDate);
+    getStaticDate()
+    getAverageScoreLis()
+    getBarData(dateType)
+    getEveryDeptLevel()
+}
+function getStaticDate(){
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    const start = new Date(behosDateStart).getTime()
+    const end = new Date(behosDateEnd).getTime()
+    if(start > end){
+        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    }
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+}
+$(function() {
+    const  iconCalenBlue= require("./../images/darkDate.png")
+    const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+    $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    dateConsole(dateType)
+    // $(".filter").click();   //初始查询
+    $('.iconCalen').on("mouseenter", function(e){
+        $(this).attr("src", iconCalenBlue)
+    })
+    $('.iconCalen').on("mouseleave", function(e){
+        $(this).attr("src", iconCalenGrey)
+    })
+    $('.iconCalen').on("click", function(e){
+        $(this).parent().find("input").focus()
+    })
+});

src/js/deptConsole.js

@@ -21,9 +21,9 @@ $(function(){
         $(".circleBLis").css("display","block")
     }
     $(".partTitle p span").html(hospital)
-    setInterval(() => {
-        getTimeDetail()
-    }, 1000);
+    // setInterval(() => {
+    //     getTimeDetail()
+    // }, 1000);
     // resizeBox()
     initConsole()//质控列表
     getOwnDept()

src/js/index.js

@@ -9,6 +9,9 @@ let userInfo={};
 $(function(){
   getMenu();
   getOwnDept();
+  setInterval(() => {
+      getTimeDetail()
+  }, 1000);
   //菜单展开收起
   sureChangeWord()
   $(".main").css({
@@ -245,3 +248,14 @@ $("#changeWord").click(function(e){
 $(".login-out").click(function(){
   delCookie('accessToken')
 })
+
+//时间获取
+function getTimeDetail(){
+  const d = new Date();
+  const days = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"];
+  let sec = d.getSeconds()
+  let min = d.getMinutes()
+  let hour = d.getHours()
+  let str = `${d.getFullYear()}年${d.getMonth()+1}月${d.getDate()}日 / ${days[d.getDay()]} / ${hour>9?hour:'0'+hour}:${min>9?min:'0'+min}:${sec>9?sec:'0'+sec}`
+  $(".dateDetail").html(str)
+}

src/js/qcList.js

@@ -21,6 +21,7 @@ let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
 let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
 let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",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,