From ca8d334c4521c7290b2e2d38ffa90fda897d990a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 22 Aug 2023 16:12:33 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86=E6=8B=86=E5=88=86=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 2 +- src/views/documentTool/DocumentComparison.vue | 61 ++++----- .../documentTool/modules/CommentList.vue | 123 ++---------------- .../modules/ComparisonAddFullComment.vue | 77 +++++++++++ .../modules/ComparisonAddReplyComment.vue | 122 +++++++++++++++++ .../modules/ComparisonResults.vue | 2 +- .../modules/DocumentDataComparison.vue | 76 ++--------- .../documentTool/modules/ImportResult.vue | 36 ++--- .../modules/InitiateComparison.vue | 2 +- 9 files changed, 276 insertions(+), 225 deletions(-) create mode 100644 src/views/documentTool/modules/ComparisonAddFullComment.vue create mode 100644 src/views/documentTool/modules/ComparisonAddReplyComment.vue diff --git a/src/assets/less/common.less b/src/assets/less/common.less index a3f8e35f..a3be1e76 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -204,7 +204,7 @@ width: calc(100% - 130px); display: inline-block; margin-top: 2px; - height: 40px; + height: 100%; margin-bottom: 24px; /deep/ .ant-form-item-control-wrapper { width: 100%; diff --git a/src/views/documentTool/DocumentComparison.vue b/src/views/documentTool/DocumentComparison.vue index 53822050..168af4b5 100644 --- a/src/views/documentTool/DocumentComparison.vue +++ b/src/views/documentTool/DocumentComparison.vue @@ -231,31 +231,32 @@ export default { this.getList() }, getList () { - const queryParam = JSON.parse(JSON.stringify(this.queryParam)) - Object.keys(queryParam).forEach(val => { - if (queryParam[val] instanceof Array) { - queryParam[val] = queryParam[val].join(',') - } - }) - const query = { - pageNo: this.ipagination.current, - pageSize: this.ipagination.pageSize, - ...queryParam - } - this.loading = true - getAction(this.url.list, query).then((res) => { - if (res.success) { - if (res.result.current > 1 && res.result.records.length === 0) { - this.ipagination.current = 1 - this.getList() - return - } - this.dataSource = res.result.records || [] - this.ipagination.total = res.result.total - } - }).finally(() => { - this.loading = false - }) + this.dataSource = [{ id: 1, serialNumberLeft: '11' }] + // const queryParam = JSON.parse(JSON.stringify(this.queryParam)) + // Object.keys(queryParam).forEach(val => { + // if (queryParam[val] instanceof Array) { + // queryParam[val] = queryParam[val].join(',') + // } + // }) + // const query = { + // pageNo: this.ipagination.current, + // pageSize: this.ipagination.pageSize, + // ...queryParam + // } + // this.loading = true + // getAction(this.url.list, query).then((res) => { + // if (res.success) { + // if (res.result.current > 1 && res.result.records.length === 0) { + // this.ipagination.current = 1 + // this.getList() + // return + // } + // this.dataSource = res.result.records || [] + // this.ipagination.total = res.result.total + // } + // }).finally(() => { + // this.loading = false + // }) }, batchDelete () { if (this.selectedRowKeys.length > 0) { @@ -263,11 +264,11 @@ export default { content: this.$t('confirmBatchDeletion'), onOk: () => { const idList = [] - const selectedRowKeysRecord = JSON.parse(JSON.stringify(this.selectedRowKeysRecord)) - for (let i = 0; i < selectedRowKeysRecord.length; i++) { - if (selectedRowKeysRecord[i].createBy === this.userInfoQuery.username && - selectedRowKeysRecord[i].releaseState === 'draft') { - idList.push(selectedRowKeysRecord[i].id) + const selectedRows = JSON.parse(JSON.stringify(this.selectedRows)) + for (let i = 0; i < selectedRows.length; i++) { + if (selectedRows[i].createBy === this.userInfoQuery.username && + selectedRows[i].releaseState === 'draft') { + idList.push(selectedRows[i].id) } } if (idList.length > 0) { diff --git a/src/views/documentTool/modules/CommentList.vue b/src/views/documentTool/modules/CommentList.vue index 44e159d7..3535c368 100644 --- a/src/views/documentTool/modules/CommentList.vue +++ b/src/views/documentTool/modules/CommentList.vue @@ -14,7 +14,7 @@ :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comment')" v-model="commentContent"> {{$t('query')}} - + {{$t('docTool.comparison.publishComment')}} @@ -57,80 +57,28 @@
{{$t('docTool.comparison.noComment')}}
- - - - -
-
- * - {{title}} -
- - - - - - -
-
-
-
-
+ + + diff --git a/src/views/documentTool/modules/ComparisonAddReplyComment.vue b/src/views/documentTool/modules/ComparisonAddReplyComment.vue new file mode 100644 index 00000000..f226aece --- /dev/null +++ b/src/views/documentTool/modules/ComparisonAddReplyComment.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/views/documentTool/modules/ComparisonResults.vue b/src/views/documentTool/modules/ComparisonResults.vue index fb7fdd02..f77dd027 100644 --- a/src/views/documentTool/modules/ComparisonResults.vue +++ b/src/views/documentTool/modules/ComparisonResults.vue @@ -243,7 +243,7 @@ export default { ...mapGetters(['userInfo']), goBack () { this.$router.push({ - path: '/documentComparison' + path: '/documentTool/documentComparison' }) }, // 评论按钮点击 diff --git a/src/views/documentTool/modules/DocumentDataComparison.vue b/src/views/documentTool/modules/DocumentDataComparison.vue index e67be099..2db8a6cd 100644 --- a/src/views/documentTool/modules/DocumentDataComparison.vue +++ b/src/views/documentTool/modules/DocumentDataComparison.vue @@ -113,51 +113,24 @@ - - - -
-
- {{$t('docTool.comparison.fullTextComments')}} -
- - - -
-
-
+