From 56b92a9568d4078a8cebe0248b5f355b50679ff1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 7 Sep 2022 19:19:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=9D=A1=E7=9B=AE=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compare/service/impl/SarFileCompareInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index c148912d6..c97fca666 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -155,6 +155,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl Date: Wed, 7 Sep 2022 20:04:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E6=9D=A1=E7=9B=AE=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/compare/utils/DiffUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java index 649c82785..586f01ee6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java @@ -2229,6 +2229,9 @@ public class DiffUtils { } public List getHtmlDiffStr(String text1,String text2){ + text1 = text1.replaceAll("", ""); + text2 = text2.replaceAll("", ""); + LinkedList diffs = diff_main(text1, text2); //定义输出结果 String LResultStr=""; From 29e41a93560bac427d7937f09d1de7a6329131e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 7 Sep 2022 20:05:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/parameter/parameterexport/index.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 70e73ed56..b60c0964e 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -44,10 +44,10 @@ :columns="columns" > - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} - {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }} + {{ text }} {{$t('edit')}} @@ -150,6 +150,7 @@ export default { title: this.$t('templateName'), align: 'center', dataIndex: 'templateName', + ellipsis: true, width: 300, scopedSlots: { customRender: 'templateName' } }, @@ -157,25 +158,29 @@ export default { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', + ellipsis: true, width: 300, scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', - width: 100, + width: 120, + ellipsis: true, dataIndex: 'state_dictText' }, { title: this.$t('creater'), align: 'center', - width: 100, + width: 120, + ellipsis: true, dataIndex: 'createBy' }, { title: this.$t('Latestupdatetime'), align: 'center', width: 180, + ellipsis: true, dataIndex: 'updateTime' }, { From 4a91131efcc4e4ce128e9963e96126a718874f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 7 Sep 2022 20:20:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index1.vue | 2 +- jero-web/src/views/externalReports/index.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index bda28497b..6cffad599 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -221,7 +221,7 @@ selectedRowrowValue: [], dataSource: [], pageNo: 1, - pageSize: 10, + pageSize: 100, pageSizeOptions: ['100', '200'], total: 0, searchParmes: {}, diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 7bf1cd665..5521247db 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -767,6 +767,11 @@ export default { this.loading = true getAction(this.url.list, params).then(res => { if (res.success) { + if (res.result.pageList.current > 1 && res.result.pageList.records.length == 0) { + this.pageNo = 1 + this.loadData() + return + } this.dataSource = res.result.pageList.records || [] this.authmanage =res.result.auth_manage this.total = res.result.pageList.total From cb662275ecce0d963cc9e9770b1066de884e0190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 7 Sep 2022 20:22:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index1.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 6cffad599..49369bcd8 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -505,7 +505,9 @@ getTableListReset() { let params = { paramsManifestId: this.$route.query.id, - userTypes: this.currentPersonRole + userTypes: this.currentPersonRole, + pageNo:this.pageNo, + pageSize:this.pageSize } this.loading = true this.$emit('listReset', '') From 619c33305c5395e10ef500cd3c44e199063b8d3b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 7 Sep 2022 20:32:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?59339=E5=A4=84=E7=90=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E5=AF=BC=E5=87=BA=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=E5=86=85=E5=AE=B9=E4=B8=AD=E7=9A=84

=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 260cb2f41..e4fb88ea4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -331,6 +331,10 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl } } + if(StringUtils.isNotEmpty(itemContent)){ + itemContent = itemContent.replaceAll("

","").replaceAll("

","\r\n"); + } + dataRow.createCell(2).setCellValue(itemContent); dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getEvaluatorName()); dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getEvaluationMethodsName());