Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/readmission.less

@@ -22,15 +22,21 @@ h2{
 }
 .main-body{
     .main-body-com;
+    // border: none;
+    // // border:10px @disColor solid;
+    // border-top:10px @disColor solid;
+    // border-left:10px @disColor solid;
+    // margin: 44px 0 0;
+    // min-width: 1090px;
+    // min-height: calc(100% - 84px);
+    // // overflow: auto;
+    // // height:  calc(100% - 44px);
+    // height: 100%;
     border: none;
-    // border:10px @disColor solid;
-    border-top:10px @disColor solid;
     border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    margin: 54px 0 0;
     min-width: 1090px;
-    min-height: calc(100% - 84px);
-    // overflow: auto;
-    height:  calc(100% - 44px);
+    min-height: calc(100% - 54px);
     .selectDefect{
         min-width: 120px;
         width: auto;

src/html/readmission.html

@@ -109,8 +109,8 @@
                       <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>
+                      <th class="beHospitalId textCenter">病历等级</th>
+                      <th class="beHospitalId textCenter">病历得分</th>
                       <th class="beHospitalId textCenter">科室</th>
                       <th class="beHospitalId textCenter">主诊断</th>
                       <th class="beHospitalId textCenter">入院日期</th>

src/js/console.js

@@ -12,10 +12,10 @@ 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, initScroll} = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData, initScroll,listenScroll} = require('../js/utils.js');
 const { get } = require('jquery');
 let payMoney = [],behosDateStart="",ownSelectDate='',behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="all",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
-
+listenScroll(".partWrap")
 $(function(){
     if(!hasData('YH-KZT')){
         $("body").html('')

src/js/deptConsole.js

@@ -10,9 +10,10 @@ 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,initScroll } = require('../js/utils.js');
+const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData,initScroll,listenScroll } = require('../js/utils.js');
 let payMoney = [],behosDateStart="",behosDateEnd="",ownSelectDate='',dayLis = [],dateType = 2,curDept = '',curDeptId='',datafst=[],datasec=[],datatrd=[],datafour=[],hospital=getCookie("hospital");
 $(function(){
+    listenScroll(".deptConsole")
     if(!hasData('YH-KZT')&&!hasData('YH-KZTKS')){
         $("body").html('')
     }

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,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData,initScroll } = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData,initScroll,listenScroll } = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -20,6 +20,7 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
+    listenScroll('.mukuai')
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""

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,emptyBox,setTitleTxt,setDatePicker,getPickerDate,downloadExportedData,expJson,initScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt,setDatePicker,getPickerDate,downloadExportedData,expJson,initScroll,listenScroll} = 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")
@@ -14,6 +14,7 @@ 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="下拉">`)
+listenScroll()
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="deptName",data_asc="";

src/js/qcListCopy.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/qcListCopy.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,focusMenuItem,listenScroll} = 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")
@@ -45,6 +45,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",
   data_desc=["leaveHospitalDate"],data_asc=[];
+listenScroll('.qcListCopy')
 if(chengdu){
     levelTemp = chengdu
     level = chengdu

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,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData,initScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setDatePicker,getPickerDate,expJson,downloadExportedData,initScroll,listenScroll} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -19,6 +19,7 @@ $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 // $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let deptList = []
 $(function(){
+    listenScroll('.quexianDetailControlHome')
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""

src/js/singleVeto.js

@@ -3,7 +3,7 @@ require("../css/single.less");
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,focusMenuItem,setDatePicker,getPickerDate,downloadExportedData,expJson, initScroll} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,focusMenuItem,setDatePicker,getPickerDate,downloadExportedData,expJson, initScroll,listenScroll} = require('./utils.js')
 const switchIconOpen = require("./../images/btn_open.png")
 const switchIconClose = require("./../images/btn_close.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -23,6 +23,7 @@ $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
+    listenScroll('.singleVeto')
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""

src/js/utils.js

@@ -3,7 +3,7 @@ const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
 require('./scrollBar.js');
-const baseUrl = "http://192.168.2.241:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',
@@ -439,6 +439,16 @@ function initScroll(el,sliderDir,sliderMode,top){
   });
   }
 }
+
+function listenScroll(dom){
+  $(dom?dom:".container").scroll(()=>{
+    $.datepicker._hideDatepicker($("#datepicker")[0]);
+    $.datepicker._hideDatepicker($("#datepicker2")[0]);
+    $("#datepicker").trigger('blur')
+    $("#datepicker2").trigger('blur')
+  })
+}
+
 module.exports = {
   pageMap,
   post,
@@ -459,5 +469,6 @@ module.exports = {
   setDatePicker,
   getPickerDate,
   isMac,
-  initScroll
+  initScroll,
+  listenScroll
 };