diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 03a7c2498..b76f1b294 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable {
//新添字段
private String relatedAreasCn;//相关领域中文
private String relatedAreasEn;//相关领域英文
- private String source;//来源
+ private String sourceCn;//来源中文
+ private String sourceEn;//来源英文
private String time;//日期
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
index 6b2ef20e5..699e217ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
@@ -31,7 +31,8 @@
-
+
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index 6cb4f2bcf..6ecc9ce43 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -519,7 +519,8 @@ public class WordUtil {
String cut) {
String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文
String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文
- String source = lawsMonthlyReportWriteEO.getSource();//来源
+ String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源
+ String sourceEn = lawsMonthlyReportWriteEO.getSourceEn();
String time = lawsMonthlyReportWriteEO.getTime();//日期
String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文
String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文
@@ -545,7 +546,7 @@ public class WordUtil {
//第1行
setCell(table, 0, "相关领域",relatedAreasCn);
//第2行
- setCell(table,1, "来源",source);
+ setCell(table,1, "来源",sourceCn);
//第3行
setCell(table,2, "日期",time);
//第4行
@@ -556,7 +557,7 @@ public class WordUtil {
//第1行
setCell(table,0, "Related Areas",relatedAreasEn);
//第2行
- setCell(table,1,"source",source);
+ setCell(table,1,"Source",sourceEn);
//第3行
setCell(table,2,"Date",time);
//第4行
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index e4abc53ed..db047cf8f 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -133,33 +133,34 @@
@click="checkedClick(item)"
:class="{ 'null-input':item.checked }">
-
+
@@ -167,21 +168,21 @@
>
-
-
-
+
@@ -684,7 +685,7 @@
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.pdf') {
- window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+ window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank')
@@ -720,6 +721,10 @@
height: 18px !important;
line-height: 18px !important;
}
+
+ .tooltip-index {
+ max-width: calc(100% - 300px) !important;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
index 85b4932ba..a1e8e6ef0 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
@@ -10,7 +10,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,7 +82,7 @@
return {
checkboxText: [],
url: {
- getInfoList: 'search/document/getFullTextInfoList'
+ getInfoList: '/search/lawsMonthlyReport/page'
},
loading: false,
conList: [],
@@ -95,12 +117,18 @@
methods: {
...mapGetters(['userInfo']),
checkedClick(item) {
- if (item.checked) {
- this.checkboxText = this.checkboxText.filter(res => {
- return res !== item.id
- })
- } else {
- this.checkboxText.push(item.id)
+ let fileName = item.file_name
+ let index1 = fileName.lastIndexOf('.')
+ let index2 = fileName.length
+ let fileSuffix = fileName.substring(index1, index2)
+ if (fileSuffix == '.pdf') {
+ window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username))
+ } else if (fileSuffix == '.docx') {
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+ window.open(url, '_blank')
+ } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+ window.open(url, '_blank')
}
},
ResetSearch() {
@@ -190,7 +218,7 @@
}
.tooltip-index {
- max-width: 600px !important;
+ max-width: calc(100% - 300px) !important;
}