From 6adbe332886d66a9ba1de474af168691eef6677d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 29 Feb 2024 15:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E6=96=87=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E5=BE=97=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocumentDataComparison.vue | 128 +++++++++++++++++- .../comparisonTermsView.vue | 6 +- .../modules/viewDifferenceModal.vue | 116 +++++++++++++++- 3 files changed, 240 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue index 5f058bf..1959d8d 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue @@ -60,10 +60,31 @@
+
{{ item.itemsNum + ' ' + item.itemsName }}
+
+
+
+
+
+
+
+
+ +
+ + 提交 + +
+
@@ -122,17 +143,39 @@
-
- {{ item.itemsNum + ' ' + item.itemsName }} +
+
+ {{ item.itemsNum + ' ' + item.itemsName }} +
+
+
+
+
+
+
+
+
-
+
+ +
+ + 提交 + +
+
+
- @@ -141,6 +184,7 @@ import InternalDetailPage from '../../../components/InternalDetailPage.vue' import { getComparisonDetail, clauseComparison } from '../../../api/documentToolApi.js' +import { postAction } from '../../../api/manage' export default { name: 'DocumentDataComparison', @@ -164,6 +208,28 @@ export default { rightHighlightMenuId: null, // 右侧高亮数据的menuId similarityDegree: '', textContent: '', + itemLeftIndex: '', + itemRightIndex: '' + } + }, + watch: { + itemRightIndex: { + deep: true, + handler (newVal, oldVal) { + if (oldVal !== '') { + this.resultData.textRight[oldVal].addModalState = false + this.resultData.textRight[oldVal].closeBtn = false + } + } + }, + itemLeftIndex: { + deep: true, + handler (newVal, oldVal) { + if (oldVal !== '') { + this.resultData.textLeft[oldVal].addModalState = false + this.resultData.textLeft[oldVal].closeBtn = false + } + } } }, mounted () { @@ -191,6 +257,7 @@ export default { this.leftTreeSelectedKeys = [item.menuId] this.similarityDegree = '' this.textContent = '' + this.itemLeftIndex = num if (item.id === this.dataLeft.id && !this.isMatching) { this.dataLeft = {} this.leftHighlightMenuId = null @@ -221,6 +288,7 @@ export default { this.rightTreeSelectedKeys = [item.menuId] this.similarityDegree = '' this.textContent = '' + this.itemRightIndex = num if (item.id === this.dataRight.id && !this.isMatching) { this.dataRight = {} this.rightHighlightMenuId = null @@ -276,6 +344,7 @@ export default { const index = this.resultData.textLeft.findIndex(tt => tt.menuId === node.menuId) this.dataLeft = this.resultData.textLeft[index] this.dataLeft.numIndex = index + this.itemLeftIndex = index this.leftHighlightMenuId = this.dataLeft.menuId this.leftTreeSelectedKeys = [this.dataLeft.menuId] this.handleJumpLeftData(index) @@ -302,6 +371,7 @@ export default { const index = this.resultData.textRight.findIndex(tt => tt.menuId === node.menuId) this.dataRight = this.resultData.textRight[index] this.dataRight.numIndex = index + this.itemRightIndex = index this.rightHighlightMenuId = this.dataRight.menuId this.rightTreeSelectedKeys = [this.dataRight.menuId] this.handleJumpRightData(index) @@ -352,6 +422,45 @@ export default { }, changeRightCatalogueShow () { this.rightCatalogueShow = !this.rightCatalogueShow + }, + // 添加笔记 + addViewRemark (item) { + item.addModalState = true + item.closeBtn = true + }, + closeView (item) { + // if (item.remark !== item.oldRemark) { + // this.$confirm({ + // title: '提示', + // content: '

笔记内容有修改，是否保存?

', + // onOk: () => { + // this.modalSave(item) + // item.closeBtn = false + // item.addModalState = false + // }, + // onCancel: () => { + // item.closeBtn = false + // item.addModalState = false + // } + // }) + // } else { + item.closeBtn = false + item.addModalState = false + // } + }, + modalSave (item) { + const query = { + remark: item.remark, + id: item.id + } + postAction('/compare/sarFileCompareItem/edit', query).then((res) => { + item.oldRemark = item.remark + if (res.success) { + this.$message.success(res.message) + } else { + this.$message.warning(res.message) + } + }) } } } @@ -506,6 +615,7 @@ export default { border: 1px solid #EFF1F3; cursor: pointer; background-color: white; + position: relative; } .detail-content-right-item { @@ -514,6 +624,7 @@ export default { border: 1px solid #EFF1F3; cursor: pointer; background-color: white; + position: relative; } .detail-content-left-item:last-child { @@ -681,4 +792,13 @@ export default { text-align: right; padding-right: 16px; } + .addRemarkBtn{ + position: absolute; + bottom: 0; + right: -10px; + /*z-index: 10;*/ + } + .iconClass{ + font-size: 18px; + } diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue index 7a85f9b..dee7443 100644 --- a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue +++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue @@ -14,14 +14,13 @@ :columns="columns" :data-source="dataSource" :can-drag="true" - :loading="loading" :pagination="ipagination" :scroll="{x: '100%', y: yScrollHeight}" @operationClick="operationClick" :operation-list="operationList"> - + @@ -113,6 +112,9 @@ export default { viewDifferenceClick (item) { console.log(item) this.$refs.viewDifferenceModalRef.open(item) + }, + viewDifferenceModalForm () { + this.loadData() } } } diff --git a/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue index d0ca19f..ad4bc02 100644 --- a/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue +++ b/jero-web/src/views/documentTool/documentComparison/modules/viewDifferenceModal.vue @@ -6,9 +6,9 @@ :confirm-loading="confirmLoading" :maskClosable="false" switchFullscreen - @cancel="visible = false"> + @cancel="cancel"> @@ -23,7 +23,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + 提交 + +
@@ -35,8 +56,29 @@
+
+
+
+
+
+
+
+
+
+ +
+ + 提交 + +
+
@@ -47,6 +89,7 @@