From 151bf5bf5c88f0311ce6935bda9937d20b620de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 23 Feb 2024 16:25:14 +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 | 8 ++++-
.../documentComparison/InitiateComparison.vue | 20 +++++++++++--
.../documentComparison/comparisonOfTerms.vue | 30 +++++++++++++++++--
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/jero-web/src/api/documentToolApi.js b/jero-web/src/api/documentToolApi.js
index 93b6822..1997bf7 100644
--- a/jero-web/src/api/documentToolApi.js
+++ b/jero-web/src/api/documentToolApi.js
@@ -53,12 +53,16 @@ const getInterpretationArticlesList = (params) => getAction('/laws/DocumentTool/
const withdrawPublication = (params) => postAction('/compare/sarFileCompareInfo/changeState', params)
// 文档对比-发起对比-获取页面数据
const getInitComparsionPageData = (params) => getAction('/laws/DocumentTool/documentSplit/queryByPage', params)
-// 文档对比-发起对比-提交数据
+// 文档对比-发起全文对比-提交数据
const submitInitComparsion = (params) => postAction('/compare/sarFileCompareInfo/fullTextComparison', params)
+// 文档对比-发起条款对比-提交数据
+const submitItemComparison = (params) => postAction('/compare/sarFileCompareInfo/itemComparison', params)
// 文档对比-文档对比-一致/保存
const docComparsionConsistentAndSave = (params) => postAction('/compare/sarFileCompareItemComment/add', params)
// 文档对比-文档对比-获取对比详情
const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/getComparisonDetail', params)
+// 文档对比-文档对比-条款对比左侧目录
+const getSplitMenusByInfo = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params)
// 文档对比-文档对比-自动匹配
const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params)
// 文档对比-添加全文评论
@@ -131,8 +135,10 @@ export {
withdrawPublication,
getInitComparsionPageData,
submitInitComparsion,
+ submitItemComparison,
docComparsionConsistentAndSave,
getComparisonDetail,
+ getSplitMenusByInfo,
clauseComparison,
addFullTextComment,
deleteComparisonResult,
diff --git a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue
index 449c2ac..73d3c1b 100644
--- a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue
+++ b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue
@@ -154,7 +154,7 @@ import { previewPdf } from '../../../utils/previewPdf.js'
import { Base64 } from 'js-base64'
import { mapGetters } from 'vuex'
import InternalDetailPage from '../../../components/InternalDetailPage.vue'
-import { getInitComparsionPageData, submitInitComparsion } from '../../../api/documentToolApi.js'
+import { getInitComparsionPageData, submitInitComparsion, submitItemComparison } from '../../../api/documentToolApi.js'
export default {
name: 'InitiateComparison',
@@ -355,8 +355,22 @@ export default {
remark: this.formInline.remark
}
if (type === 'comparisonOfTerms') {
- this.$router.push({
- path: '/documentTool/comparisonOfTerms'
+ submitItemComparison(query).then((res) => {
+ if (res.success) {
+ this.loading = false
+ this.$message.success(this.$t('operationSuccessful'))
+ this.$router.push({
+ path: '/documentTool/comparisonOfTerms',
+ query: {
+ id: res.result,
+ infoIdLeft: this.selectedRowsLeft[0].id,
+ infoIdRight: this.selectedRowsRight[0].id
+ }
+ })
+ } else {
+ this.loading = false
+ this.$message.warning(res.message)
+ }
})
} else {
submitInitComparsion(query).then((res) => {
diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
index 5478cef..5f766c5 100644
--- a/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
+++ b/jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue
@@ -20,7 +20,7 @@
:selected-keys="leftTreeSelectedKeys"
:replace-fields="{key: 'menuId'}"
@select="onSelectLeft"
- :tree-data="resultData.menuLeft">
+ :tree-data="menuLeft">
@@ -66,7 +66,7 @@
:selected-keys="rightTreeSelectedKeys"
:replace-fields="{key: 'menuId'}"
@select="onSelectRight"
- :tree-data="resultData.menuRight">
+ :tree-data="menuRight">
@@ -112,6 +112,7 @@