diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index cf30618f..f5d6a844 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -1,5 +1,4 @@ // 本地工具-即文档功能对应的接口 - import { getAction, postAction } from './manage' // 文档拆分-发布 @@ -21,6 +20,8 @@ const docComparsionConsistentAndSave = (params) => postAction('/compare/sarFileC const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/getComparisonDetail', params) // 文档对比-文档对比-自动匹配 const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params) +// 文档对比-添加全文评论 +const addFullTextComment = (params) => postAction('/compare/sarFileCompareInfo/editComments', params) export { // 文档拆分 @@ -36,5 +37,6 @@ export { submitInitComparsion, docComparsionConsistentAndSave, getComparisonDetail, - clauseComparison + clauseComparison, + addFullTextComment } diff --git a/src/views/documentTool/documentComparison/ComparisonResults.vue b/src/views/documentTool/documentComparison/ComparisonResults.vue index ac2160c6..51ea1d09 100644 --- a/src/views/documentTool/documentComparison/ComparisonResults.vue +++ b/src/views/documentTool/documentComparison/ComparisonResults.vue @@ -137,7 +137,7 @@ 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 ComparisonResultEditModal from './modules/ComparisonResultEditModal.vue' import InternalDetailPage from '../../../components/InternalDetailPage.vue' export default { @@ -167,7 +167,7 @@ export default { } }, mounted () { - if (this.$route.query.isDisplay === 2) { + if (this.$route.query.isDisplay === '2') { this.isDisplay = false } else { this.isDisplay = true diff --git a/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/src/views/documentTool/documentComparison/DocumentDataComparison.vue index 9844dc87..b46bba75 100644 --- a/src/views/documentTool/documentComparison/DocumentDataComparison.vue +++ b/src/views/documentTool/documentComparison/DocumentDataComparison.vue @@ -99,12 +99,15 @@
+ {{ $t('docTool.comparison.consistentAssessment') }} + {{ $t('preservation') }}
- + + diff --git a/src/views/documentTool/documentComparison/InitiateComparison.vue b/src/views/documentTool/documentComparison/InitiateComparison.vue index 6c542853..ba448938 100644 --- a/src/views/documentTool/documentComparison/InitiateComparison.vue +++ b/src/views/documentTool/documentComparison/InitiateComparison.vue @@ -112,7 +112,7 @@ @@ -200,77 +200,67 @@ export default { columns: [ { title: this.$t('number'), - align: 'left', - width: 70, + width: 30, customRender: function (t, r, index) { return parseInt(index) + 1 } }, { title: this.$t('number'), - align: 'left', ellipsis: true, dataIndex: 'serialNumber', - width: 79 + width: 100 }, { title: this.$t('title'), - align: 'left', ellipsis: true, dataIndex: 'title', - width: 79 + width: 100 }, { title: this.$t('docTool.comparison.textStatus'), - align: 'left', ellipsis: true, dataIndex: 'fileType', - width: 79 + width: 100 }, { title: this.$t('fileName'), - align: 'left', ellipsis: true, dataIndex: 'fileName', - width: 79 + width: 100 } ], tableColumns: [ { title: this.$t('number'), - align: 'left', - width: 70, + width: 30, customRender: function (t, r, index) { return parseInt(index) + 1 } }, { title: this.$t('number'), - align: 'left', ellipsis: true, dataIndex: 'serialNumber', - width: 79 + width: 100 }, { title: this.$t('title'), - align: 'left', ellipsis: true, dataIndex: 'title', - width: 79 + width: 100 }, { title: this.$t('docTool.comparison.textStatus'), - align: 'left', ellipsis: true, dataIndex: 'fileType', - width: 79 + width: 100 }, { title: this.$t('fileName'), - align: 'left', ellipsis: true, dataIndex: 'fileName', - width: 79 + width: 100 } ], image: false, diff --git a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue index ff029df3..0d918477 100644 --- a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue +++ b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue @@ -26,7 +26,7 @@