From fbe03c05643178f1d5dd187f9ab6e98a464f5a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 20 Sep 2023 10:39:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/documentToolApi.js                       | 11 ++++++++++-
 .../documentComparison/ComparisonResults.vue     | 16 +++++++++-------
 .../modules/ComparisonResultEditModal.vue        |  4 ++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js
index f5d6a844..9a1fe0f9 100644
--- a/src/api/documentToolApi.js
+++ b/src/api/documentToolApi.js
@@ -22,6 +22,12 @@ const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/
 const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params)
 // 文档对比-添加全文评论
 const addFullTextComment = (params) => postAction('/compare/sarFileCompareInfo/editComments', params)
+// 文档对比-对比结果-删除
+const deleteComparisonResult = (params) => postAction('/compare/sarFileCompareItemComment/delete', params)
+// 文档对比-对比结果-获取对比结果详情
+const getComparisonResultDetail = (params) => getAction('/compare/sarFileCompareItemComment/queryCompareResult', params)
+// 文档对比-编辑对比评论
+const editComparisonComment = (params) => postAction('/compare/sarFileCompareItemComment/edit', params)
 
 export {
   // 文档拆分
@@ -38,5 +44,8 @@ export {
   docComparsionConsistentAndSave,
   getComparisonDetail,
   clauseComparison,
-  addFullTextComment
+  addFullTextComment,
+  deleteComparisonResult,
+  getComparisonResultDetail,
+  editComparisonComment
 }
diff --git a/src/views/documentTool/documentComparison/ComparisonResults.vue b/src/views/documentTool/documentComparison/ComparisonResults.vue
index 51ea1d09..ab5597da 100644
--- a/src/views/documentTool/documentComparison/ComparisonResults.vue
+++ b/src/views/documentTool/documentComparison/ComparisonResults.vue
@@ -122,7 +122,8 @@
       </div>
     </div>
     <commentList ref="commentListRef" />
-    <comparison-result-edit-modal ref="comparisonResultEditModal" @ok="getData"></comparison-result-edit-modal>
+    <!--编辑（对比评论）-->
+    <comparison-result-edit-modal ref="comparisonResultEditModal" @ok="getData" />
     <div id="images">
       <div class="image" v-viewer="{movable: false}">
         <img v-show="image" :src="imageUrl">
@@ -132,13 +133,14 @@
 </template>
 
 <script>
-import { getAction, downloadFile, deleteAction, getFileAccessHttpUrl } from '../../../api/manage.js'
+import { getAction, downloadFile, getFileAccessHttpUrl } from '../../../api/manage.js'
 import { previewPdf } from '../../../utils/previewPdf.js'
 import { Base64 } from 'js-base64'
 import { mapGetters } from 'vuex'
 import CommentList from '../modules/CommentList.vue'
 import ComparisonResultEditModal from './modules/ComparisonResultEditModal.vue'
 import InternalDetailPage from '../../../components/InternalDetailPage.vue'
+import { deleteComparisonResult, getComparisonResultDetail } from '../../../api/documentToolApi.js'
 
 export default {
   name: 'ComparisonResults',
@@ -266,7 +268,7 @@ export default {
         comment: this.comment
       }
       this.loading = true
-      getAction('/compare/sarFileCompareItemComment/queryCompareResult', query).then((res) => {
+      getComparisonResultDetail(query).then((res) => {
         if (res.success) {
           this.resultData = res.result || {}
         } else {
@@ -319,12 +321,12 @@ export default {
       this.$confirm({
         content: this.$t('confirmDeletion'),
         onOk: () => {
-          deleteAction('/compare/sarFileCompareItemComment/delete', { id: val.id }).then((res) => {
+          deleteComparisonResult({ id: val.id }).then((res) => {
             if (res.success) {
-              this.$message.success(this.$t('operationSuccessful'))
+              this.$message.success(res.message)
               this.getData()
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              this.$message.warning(res.message)
             }
           })
         }
@@ -395,7 +397,7 @@ export default {
 }
 
 .scroll-content {
-  height: calc(100% - 76px - 71px - 24px);
+  height: calc(100% - 76px - 71px - 58px);
   overflow: auto;
 }
 
diff --git a/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
index e21041c6..d1b21fa6 100644
--- a/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
@@ -44,7 +44,7 @@
 
 <script>
 import { putAction } from '../../../../api/manage.js'
-import { addFullTextComment } from '../../../../api/documentToolApi.js'
+import { addFullTextComment, editComparisonComment } from '../../../../api/documentToolApi.js'
 
 export default {
   name: 'ComparisonResultEditModal',
@@ -113,7 +113,7 @@ export default {
         id: this.formInlineText.id,
         comment: this.formInlineText.comment
       }
-      putAction('/compare/sarFileCompareItemComment/edit', query).then((res) => {
+      editComparisonComment(query).then((res) => {
         if (res.success) {
           this.$message.success(this.$t('operationSuccessful'))
           this.visible = false