diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index bac59d7..3cab229 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -100,6 +100,9 @@ public class CommomSearchController { private EmrPdfWaterSetMapper pdfWaterSetMapper; @Value("${initialization}") private String initialization; + + @Value("${export_pdf_hospital_info}") + private String hospitalName; @Autowired private EmrPrintDownloadInfoMapper emrPrintDownloadInfoMapper; @@ -350,6 +353,7 @@ public class CommomSearchController { if (null != user) { model.addAttribute("user", user); model.addAttribute("roleId", user.getRoleId()); + model.addAttribute("hospitalName", hospitalName); } List printCount = null; try { diff --git a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp index 219945b..e3b11b3 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp @@ -298,6 +298,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp index 4fda212..c99e8ef 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp @@ -522,9 +522,9 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp index 411517c..b685312 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp @@ -519,9 +519,9 @@ }); }); - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp b/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp index 475dc71..f8f6806 100644 --- a/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp +++ b/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp @@ -227,9 +227,9 @@ - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp b/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp index 266c5c9..3604722 100644 --- a/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp +++ b/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp @@ -407,9 +407,9 @@ - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp index 708b9a6..0b9b8b3 100644 --- a/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp +++ b/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp @@ -212,8 +212,8 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - - + + <%@ include file="/WEB-INF/jspf/loading.jspf" %> diff --git a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp index 623eda1..7b9643e 100644 --- a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp +++ b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp @@ -213,8 +213,8 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - - + + <%@ include file="/WEB-INF/jspf/loading.jspf" %> diff --git a/src/main/webapp/WEB-INF/views/font/commomListSouth.jsp b/src/main/webapp/WEB-INF/views/font/commomListSouth.jsp index 06eee9a..9296a28 100644 --- a/src/main/webapp/WEB-INF/views/font/commomListSouth.jsp +++ b/src/main/webapp/WEB-INF/views/font/commomListSouth.jsp @@ -710,10 +710,10 @@ - - - - - + + + + + diff --git a/src/main/webapp/WEB-INF/views/font/recordList.jsp b/src/main/webapp/WEB-INF/views/font/recordList.jsp index f9b49ff..41a2373 100644 --- a/src/main/webapp/WEB-INF/views/font/recordList.jsp +++ b/src/main/webapp/WEB-INF/views/font/recordList.jsp @@ -65,6 +65,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/font/recordListSouth.jsp b/src/main/webapp/WEB-INF/views/font/recordListSouth.jsp index c15d82a..3663d6b 100644 --- a/src/main/webapp/WEB-INF/views/font/recordListSouth.jsp +++ b/src/main/webapp/WEB-INF/views/font/recordListSouth.jsp @@ -131,9 +131,9 @@ - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/font/showPdfFrameFont.jsp b/src/main/webapp/WEB-INF/views/font/showPdfFrameFont.jsp index 37730fa..79bfb0f 100644 --- a/src/main/webapp/WEB-INF/views/font/showPdfFrameFont.jsp +++ b/src/main/webapp/WEB-INF/views/font/showPdfFrameFont.jsp @@ -37,6 +37,6 @@

- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp b/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp index 5db7641..134d38f 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp @@ -186,10 +186,10 @@ - + - + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js?<%= System.currentTimeMillis() %>"> + - + + diff --git a/src/main/webapp/WEB-INF/views/font/showRecordFontSouth.jsp b/src/main/webapp/WEB-INF/views/font/showRecordFontSouth.jsp index 67b861e..284980d 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordFontSouth.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordFontSouth.jsp @@ -178,7 +178,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframeFont.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframeFont.jsp index d7396ef..5352560 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordIframeFont.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordIframeFont.jsp @@ -107,7 +107,7 @@ aria-labelledby="myModalLabel" aria-hidden="true">
- - + + diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframeFontSouth.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframeFontSouth.jsp index 3357c66..3641fe3 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordIframeFontSouth.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordIframeFontSouth.jsp @@ -109,7 +109,7 @@
- - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp index 7a73e8b..255011c 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp @@ -167,7 +167,7 @@ --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/browseRecords.jsp b/src/main/webapp/WEB-INF/views/otherManage/browseRecords.jsp index c1498a4..d45503b 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/browseRecords.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/browseRecords.jsp @@ -147,7 +147,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp b/src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp index d6af554..c6a71bc 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp @@ -108,7 +108,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/dictionaryList.jsp b/src/main/webapp/WEB-INF/views/otherManage/dictionaryList.jsp index c294143..076299e 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/dictionaryList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/dictionaryList.jsp @@ -276,6 +276,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp index c483c83..5169188 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp @@ -164,8 +164,8 @@ - - - + + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp b/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp index 72b94ef..09c4728 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp @@ -252,7 +252,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/interfaceDatabase.jsp b/src/main/webapp/WEB-INF/views/otherManage/interfaceDatabase.jsp index cd15e5a..b772b8c 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/interfaceDatabase.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/interfaceDatabase.jsp @@ -157,7 +157,7 @@ --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp index cf086d3..9b03305 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/lockList.jsp @@ -174,7 +174,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp b/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp index 8a1f48c..9b64180 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp @@ -193,7 +193,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp index beec5cf..4f10cff 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/pdfWaterSetList.jsp @@ -279,7 +279,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp index 9aa65fb..934261e 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp @@ -165,8 +165,8 @@ - - - + + + diff --git a/src/main/webapp/WEB-INF/views/otherManage/recordLogList.jsp b/src/main/webapp/WEB-INF/views/otherManage/recordLogList.jsp index fd2f7fc..e490d1f 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/recordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/recordLogList.jsp @@ -164,7 +164,7 @@ --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/quality/quality.jsp b/src/main/webapp/WEB-INF/views/quality/quality.jsp index fc58294..1099a5a 100644 --- a/src/main/webapp/WEB-INF/views/quality/quality.jsp +++ b/src/main/webapp/WEB-INF/views/quality/quality.jsp @@ -161,7 +161,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/bloodApproveList.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/bloodApproveList.jsp index 557bf07..3dab179 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/bloodApproveList.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/bloodApproveList.jsp @@ -206,7 +206,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/documentList.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/documentList.jsp index 6b0787b..4600322 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/documentList.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/documentList.jsp @@ -516,8 +516,8 @@ - - - + + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/flowLogList.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/flowLogList.jsp index 891d0c9..2fa926d 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/flowLogList.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/flowLogList.jsp @@ -183,7 +183,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp index ee47b6a..9c4aedb 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecords.jsp @@ -404,7 +404,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecordsSum.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecordsSum.jsp index 2544558..48a436d 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecordsSum.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/inspectionRecordsSum.jsp @@ -196,7 +196,7 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/list.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/list.jsp index dac8b34..b7e3bb1 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/list.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/list.jsp @@ -357,10 +357,10 @@ }) + src="${path}/static/js/recordManage/bloodPurification/searchBloodCommomMethodqf.js?<%= System.currentTimeMillis() %>"> - - + src="${path}/static/js/recordManage/bloodPurification/commomBloodListqf.js?<%= System.currentTimeMillis() %>"> + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/recordLogList.jsp b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/recordLogList.jsp index 656fd42..0b805ae 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/recordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/bloodPurification/recordLogList.jsp @@ -161,7 +161,7 @@ --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp index 4d4356b..a373470 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -1211,11 +1211,11 @@ }) + src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js?<%= System.currentTimeMillis() %>"> - - - + src="${path}/static/js/recordManage/commomSearch/commomListqf.js?<%= System.currentTimeMillis() %>"> + + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp index 93f9e7a..85548f0 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp @@ -196,12 +196,13 @@ + + +
- - 病案浏览 - +
@@ -1135,9 +1136,9 @@
- + + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js?<%= System.currentTimeMillis() %>"> diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp index a966773..757b715 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordBlood.jsp @@ -449,6 +449,6 @@ $(".imgALink").prop("href",srcStr); --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp index 78c207e..91a9881 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframe.jsp @@ -80,6 +80,6 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp index 49e9c12..bd408f7 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp @@ -260,11 +260,11 @@ + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBlood.js?<%= System.currentTimeMillis() %>"> + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js?<%= System.currentTimeMillis() %>"> + src="${path}/static/pdfjs/web/viewer2.js?<%= System.currentTimeMillis() %>"> diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBloodFont.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBloodFont.jsp index 98659b7..c61feca 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBloodFont.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBloodFont.jsp @@ -255,9 +255,9 @@ + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js?<%= System.currentTimeMillis() %>"> + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js?<%= System.currentTimeMillis() %>"> diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeSouth.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeSouth.jsp index 633ca88..a367c51 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeSouth.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeSouth.jsp @@ -257,9 +257,9 @@ + src="${path}/static/js/recordManage/commomSearch/showRecordIframeSouth.js?<%= System.currentTimeMillis() %>"> + src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js?<%= System.currentTimeMillis() %>"> diff --git a/src/main/webapp/WEB-INF/views/recordManage/printing/printManage.jsp b/src/main/webapp/WEB-INF/views/recordManage/printing/printManage.jsp index 6467629..265c7b6 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/printing/printManage.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/printing/printManage.jsp @@ -205,6 +205,6 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/printing/printManageIframe.jsp b/src/main/webapp/WEB-INF/views/recordManage/printing/printManageIframe.jsp index af9408b..4ac08b0 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/printing/printManageIframe.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/printing/printManageIframe.jsp @@ -269,6 +269,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp index 7edda1f..d78f7a6 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/customSearchIfameqf.jsp @@ -317,10 +317,10 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - - + + - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp index b9c82bb..1894aca 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp @@ -215,6 +215,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp index 7382488..815bd8c 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp @@ -243,6 +243,6 @@ - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp index fa94125..99a3ae0 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp @@ -199,6 +199,6 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 52112f0..034f5cc 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -75,6 +75,10 @@ justify-content: center; line-height: normal; } + + .newlogoContent p{ + margin: 0; + } <% String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD"); @@ -129,14 +133,13 @@ <%-- --%>