From 9971cd369bc112f50f77cb91b6f90b03df179e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 27 Feb 2024 18:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=9D=A1=E6=AC=BE=E6=AF=94?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/documentToolApi.js | 3 + .../documentComparison/DocumentComparison.vue | 33 ++- .../documentComparison/comparisonOfTerms.vue | 4 +- .../comparisonTermsView.vue | 83 +++++--- .../modules/viewDifferenceModal.vue | 198 ++++++++++++++++++ 5 files changed, 279 insertions(+), 42 deletions(-) create mode 100644 jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue diff --git a/jero-web/src/api/documentToolApi.js b/jero-web/src/api/documentToolApi.js index c2872a8..21862df 100644 --- a/jero-web/src/api/documentToolApi.js +++ b/jero-web/src/api/documentToolApi.js @@ -67,6 +67,8 @@ const getSplitMenusByInfo = (params) => getAction('/split/sarFileSplitMenu/getSp const documentSplitView = (params) => postAction('/laws/DocumentTool/documentSplit/queryDocumentSplitDetail', params) // 文档对比-文档对比-条款对比对比按钮 const clauseComparisonEvent = (params) => postAction('/compare/sarFileCompareItem/clauseComparisonEvent', params) +// 文档对比-文档对比-条款对比对比按钮 +const getComparisonTermsViewList = (params) => getAction('/compare/sarItemsCompareHis/page', params) // 文档对比-文档对比-自动匹配 @@ -147,6 +149,7 @@ export { getSplitMenusByInfo, documentSplitView, clauseComparisonEvent, + getComparisonTermsViewList, clauseComparison, addFullTextComment, deleteComparisonResult, diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index c8089d1..8aaf049 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -277,18 +277,31 @@ export default { }, // 对比结果按钮点击 comparisonResultsClick (item) { - if (item.releaseState === 'draft') { - item.isDisplay = 2 + if (item.compareType === 'item') { + this.$router.push({ + path: '/documentTool/comparisonTermsView', + query: { + id: item.id, + titleLeft: item.titleLeft, + titleRight: item.titleRight, + serialNumberLeft: item.serialNumberLeft, + serialNumberRight: item.serialNumberRight + } + }) } else { - item.isDisplay = 1 - } - this.$router.push({ - path: '/documentTool/ComparisonResults', - query: { - id: item.id, - isDisplay: item.isDisplay + if (item.releaseState === 'draft') { + item.isDisplay = 2 + } else { + item.isDisplay = 1 } - }) + this.$router.push({ + path: '/documentTool/ComparisonResults', + query: { + id: item.id, + isDisplay: item.isDisplay + } + }) + } }, // 撤回按钮点击 subscribe (record) { diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue index 0c559a0..28fc3ea 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue @@ -159,7 +159,9 @@ export default { }, methods: { handleBack () { - + this.$router.push({ + path: '/documentTool/documentComparison' + }) }, // 左侧树选择 onSelectLeft (selectedKeys, exports) { diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue index 88d0b82..7a85f9b 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue @@ -5,6 +5,9 @@ need-custom-back-func @back="handleBack">
+
+ {{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}} +
- - -
+ diff --git a/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue new file mode 100644 index 0000000..296ab8e --- /dev/null +++ b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue @@ -0,0 +1,198 @@ + + + + +