From 66acb9c18cfa4c2efd0311d0687d647c63d254aa Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 18 Jul 2022 11:51:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/entity/ParamsCollectManifestBaseEO.java | 3 --- .../impl/ParamsCollectManifestEOServiceImpl.java | 12 ++++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java index ab5cc26e9..8e42caf35 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java @@ -1,8 +1,6 @@ package com.jero.modules.cert.collect.entity; -import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -121,7 +119,6 @@ public class ParamsCollectManifestBaseEO implements Serializable { /**工程接口人*/ @Excel(name = "工程接口人", width = 15) @ApiModelProperty(value = "工程接口人") - @TableField(updateStrategy = FieldStrategy.IGNORED) private String sdt; /**填写人*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 3821d7723..3afdc6d0f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -382,7 +382,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Mon, 18 Jul 2022 13:54:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 + jero-web/src/common/lang/zh-cn.js | 4 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/documentDataComparison.vue | 385 ++++++++++++++++++ .../documentComparison/index.vue | 2 +- 6 files changed, 400 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3d6d5c93d..9c6d5420c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1154,6 +1154,10 @@ module.exports = { noComparisonDocumentSelected:'No comparison document selected', RemarkInfo:'Remarks Info', initiateDocumentComparison:'Initiate Document Comparison', + comparativeComments:'Comparative Comments', + viewTheComparisonResults:'View The Comparison Results', + addFullTextComment:'Add Full Text Comment', + turnOffAutomaticMatching:'Turn Off Automatic Matching', Deriveconformanceresults:'Derive Conformance Results', Regulatorycompliancekanban:'Regulatory Compliance Kanban', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 18530b213..303b3ba6a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1160,4 +1160,8 @@ module.exports = { noComparisonDocumentSelected:'未选择对比文档', RemarkInfo:'备注信息', initiateDocumentComparison:'发起文档对比', + comparativeComments:'对比评论', + viewTheComparisonResults:'查看对比结果', + addFullTextComment:'添加全文评论', + turnOffAutomaticMatching:'关闭自动匹配', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 42889f88b..042a5d153 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -97,6 +97,7 @@ this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || + this.$route.path == '/documentDataComparison' || this.$route.path == '/initiateDocumentComparison' || this.$route.path == '/evaluationProcess' || this.$route.path == '/evaluationResultsClause' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 827486c44..2f59d7f5e 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -387,6 +387,11 @@ export const constantRouterMap = [ name: 'initiateDocumentComparison', component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/initiateComparison') }, + { + path: '/documentDataComparison', + name: 'documentDataComparison', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/documentDataComparison') + }, { path: '/handshakeProcess', name: 'handshakeProcess', diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue new file mode 100644 index 000000000..4b0eee9f0 --- /dev/null +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -0,0 +1,385 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index af40eee99..6f9e548a4 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -261,7 +261,7 @@ }, initiatingProcessClick(){ let newUrl = this.$router.resolve({ - path: '/initiateDocumentComparison', + path: '/documentDataComparison', }) window.open(newUrl.href, '_blank') },