From 45256f2066308398cbeb0d77bd222660c905701b Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 24 Jul 2020 17:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- src/main/webapp/WEB-INF/jspf/comm.jspf | 16 +-- .../views/beHospitaledDir/beHospList.jsp | 19 +++- .../views/dictionaryDir/dictionary.jsp | 42 +++---- .../WEB-INF/views/faultDir/faultList.jsp | 61 +++++----- .../views/faultTypeDir/faultTypeList.jsp | 21 ++-- .../WEB-INF/views/flowInfo/flowInfoList.jsp | 23 ++-- .../views/holidaySetDir/holidaySetList.jsp | 10 +- .../views/inHospitalDir/inHositalList.jsp | 29 +++-- src/main/webapp/WEB-INF/views/index.jsp | 3 +- .../views/lastVerifyDir/lastVerifyList.jsp | 22 ++-- .../medicalRecallDateDir/recallDateList.jsp | 14 +-- .../medicalRecallDir/medicalRecallList.jsp | 2 +- .../views/statistics/finalStatistics.jsp | 20 +++- .../statistics/finalStatisticsDetail.jsp | 23 ++-- .../views/statistics/firstStatistics.jsp | 20 +++- .../WEB-INF/views/statistics/printCount.jsp | 19 +++- .../WEB-INF/views/statistics/printInfo.jsp | 19 +++- .../WEB-INF/views/statistics/scanCount.jsp | 19 +++- .../WEB-INF/views/statistics/scanInfo.jsp | 19 +++- .../views/statistics/statisticsDetail.jsp | 23 ++-- .../unfileMedicalDir/unfileMedicalList.jsp | 29 +++-- .../views/vCountDir/doctorFileList.jsp | 8 +- .../WEB-INF/views/vCountDir/vCountList.jsp | 104 ++++++++++-------- src/main/webapp/static/css/comm.css | 6 +- .../webapp/static/js/beHospList/beHospList.js | 10 +- src/main/webapp/static/js/comm.js | 83 ++++++++++++++ .../webapp/static/js/flowInfo/flowInfoList.js | 6 +- .../static/js/holidaySet/holidaySetList.js | 14 +-- .../static/js/hospitalLoadPdf/loadPdf.js | 94 +++++++--------- .../js/lastVerifyList/lastVerifyList.js | 12 +- .../js/medicalRecallList/medicalRecallList.js | 12 +- .../static/js/statistics/finalStatistics.js | 6 +- .../js/statistics/finalStatisticsDetail.js | 6 +- .../static/js/statistics/firstStatistics.js | 6 +- .../webapp/static/js/statistics/printCount.js | 6 +- .../webapp/static/js/statistics/printInfo.js | 6 +- .../webapp/static/js/statistics/scanCount.js | 6 +- .../webapp/static/js/statistics/scanInfo.js | 6 +- .../static/js/statistics/statisticsCommom.js | 90 +++++++-------- .../static/js/statistics/statisticsDetail.js | 6 +- 41 files changed, 553 insertions(+), 391 deletions(-) diff --git a/.gitignore b/.gitignore index f3cefb9..7a45b09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/target/ +target /.idea/ -emr_medical_record.iml \ No newline at end of file +*.iml \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index 62c1ab8..b7f1ecb 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -73,13 +73,15 @@ * 判断出院时间是否是1801-02-03 * */ function operDisTime(value){ - if(value != '' && '1801-02-03' == value.substring(0, 10)){ - value = ''; - } - if(value.length >= 19){ - return value.substring(0, 19); - }else{ - return value; + if(value != '' && value != null){ + if (value.length >= 10 && '1801-02-03' == value.substring(0, 10)) { + value = ''; + } + if(value.length >= 19){ + return value.substring(0, 19); + }else{ + return value; + } } } //封装改变日期方法 diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index bf41283..f8ca0d4 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -167,14 +167,14 @@ - + -
+
@@ -205,11 +205,20 @@
- + - - +
+
+ + +
@@ -120,7 +122,7 @@
- +
@@ -130,7 +132,7 @@
- +
@@ -139,7 +141,7 @@
- +
@@ -148,7 +150,7 @@
- +
@@ -157,7 +159,7 @@
- +
@@ -166,7 +168,7 @@
- +
@@ -175,7 +177,7 @@
- +
@@ -185,8 +187,8 @@ <%--
--%> <%--
--%> - <%----%> - <%--
--%> + <%----%> + <%--
--%> <%-- @@ -210,7 +212,7 @@
- +
@@ -219,8 +221,8 @@
- -
+ +
@@ -241,7 +243,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 4106dea..3d6005d 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -51,8 +51,8 @@ - -
+ +
@@ -71,11 +71,20 @@
- + - - +
+
+ + +
                - -                 - -                 - - + +
+
+
+
+ +
+
-
@@ -155,9 +164,6 @@ pagination: true, // 在表格底部显示分页组件，默认false paginationShowPageGo: true, pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 - smartDisplay: false, - pageSize: 2, // 页面数据条数 - pageNumber: 1, // 初始化加载第一页，默认第一页 sidePagination: 'server', // 设置为服务器端分页 客户端：client search: false, showColumns: true, @@ -166,7 +172,7 @@ undefinedText: '---', //当数据为 undefined 时显示的字符 singleSelect: false,//设置True 将禁止多选 clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox - height: getHeight(208), //定义表格的高度。 + height: getHeight(219), //定义表格的高度。 searchTimeOut: 500,// 默认500 设置搜索超时时间。 toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 @@ -344,6 +350,7 @@ ], onLoadSuccess: function (result) { //加载成功时执行 //console.info("加载成功"); + $(".page-list").show(); tipLoad = 0; }, onLoadError: function () { //加载失败时执行 @@ -418,6 +425,6 @@ }); }); - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp index 2902e78..4ea455c 100644 --- a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp @@ -25,14 +25,14 @@ .zTreeDemo { margin-left: 38px; - height: 800px; + height: calc(100vh - 130px); overflow: auto; } .content { margin-left: 20px; background-color: #fff; - height: 600px; + height:100%; padding-top: 0; } @@ -42,6 +42,7 @@ .control-label { margin-right: -25px; + margin-top:5px; } .left { @@ -79,16 +80,16 @@
 缺陷类别信息
-
+
-