diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f796ac8..bbd3eb2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -484,7 +484,7 @@ module.exports = { remarkInfo: 'Remarks Info', comparisonOfTerms: 'Comparison Of Terms', comparison: 'Comparison', - initiateDocumentComparison: 'Initiate Document Comparison', + initiateDocumentComparison: 'Full Text Comparison', documentComparison: 'Doc Comparison', viewTheComparisonResults: 'View Results', addFullTextComment: 'Full Text Comment', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9af0cec..da13cde 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -496,7 +496,7 @@ module.exports = { remarkInfo: '备注信息', comparisonOfTerms: '条款对比', comparison: '比对', - initiateDocumentComparison: '发起文档对比', + initiateDocumentComparison: '全文对比', documentComparison: '文档对比', viewTheComparisonResults: '查看对比结果', addFullTextComment: '添加全文评论', diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 34a3a2a..85d845f 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -48,7 +48,7 @@ export const constantRouterMap = [ path: '/documentTool/DocumentDataComparison', name: 'documentTool-DocumentDataComparison', meta: { - title: '新旧拆分单对比-文档对比' + title: '新旧拆分单对比-全文对比' }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/DocumentDataComparison') }, diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index addc8a5..9ffa880 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -300,16 +300,14 @@ export default { } }) } else { - if (item.releaseState === 'draft') { - item.isDisplay = 2 - } else { - item.isDisplay = 1 - } this.$router.push({ - path: '/documentTool/ComparisonResults', + path: '/documentTool/DocumentDataComparison', query: { id: item.id, - isDisplay: item.isDisplay + infoNameLeft: item.titleLeft, + infoNumberLeft: item.serialNumberLeft, + infoNameRight: item.titleRight, + infoNumberRight: item.serialNumberRight } }) } diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue index a323eff..13cbeb7 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue @@ -1,39 +1,21 @@ diff --git a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue index dae0fe5..800292b 100644 --- a/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue @@ -33,7 +33,7 @@ :can-drag="true" :loading="loadingLeft" :pagination="false" - :scroll="{x: '100%',y:340}" + :scroll="{x: '100%',y:'calc(100vh - 400px)'}" rowKey="id" :data-source="dataSourceLeft" :row-selection="{ selectedRowKeys: selectedRowKeysLeft, onChange: onSelectChangeLeft, columnTitle:' ', type: 'radio'}" @@ -88,7 +88,7 @@ :can-drag="true" :loading="loadingRight" :pagination="false" - :scroll="{x: '100%',y:340}" + :scroll="{x: '100%',y:'calc(100vh - 400px)'}" rowKey="id" :data-source="dataSourceRight" :row-selection="{ selectedRowKeys: selectedRowKeysRight, onChange: onSelectChangeRight, columnTitle:' ', type: 'radio'}" @@ -112,21 +112,21 @@ -
- -
-
- {{ $t('docTool.comparison.remarkInfo') }} -
- - - -
-
-
+ + + + + + + + + + + + + + +
@@ -346,55 +346,55 @@ export default { this.$message.warning(this.$t('docTool.comparison.pleaseSelectTheDataCompared')) return } - this.$refs.ruleForm.validate(valid => { - if (valid) { - this.loading = true - const query = { - leftStandard: this.selectedRowsLeft[0].id, - rightStandard: this.selectedRowsRight[0].id, - remark: this.formInline.remark - } - if (type === '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, - infoNameLeft: this.selectedRowsLeft[0].title, - infoNumberLeft: this.selectedRowsLeft[0].serialNumber, - infoIdRight: this.selectedRowsRight[0].id, - infoNameRight: this.selectedRowsRight[0].title, - infoNumberRight: this.selectedRowsRight[0].serialNumber, - } - }) - } else { - this.loading = false - this.$message.warning(res.message) + this.loading = true + const query = { + leftStandard: this.selectedRowsLeft[0].id, + rightStandard: this.selectedRowsRight[0].id, + remark: this.formInline.remark + } + if (type === '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, + infoNameLeft: this.selectedRowsLeft[0].title, + infoNumberLeft: this.selectedRowsLeft[0].serialNumber, + infoIdRight: this.selectedRowsRight[0].id, + infoNameRight: this.selectedRowsRight[0].title, + infoNumberRight: this.selectedRowsRight[0].serialNumber } }) } else { - submitInitComparsion(query).then((res) => { - if (res.success) { - this.loading = false - this.$message.success(this.$t('operationSuccessful')) - this.$router.push({ - path: '/documentTool/DocumentDataComparison', - query: { - id: res.result - } - }) - } else { - this.loading = false - this.$message.warning(res.message) + this.loading = false + this.$message.warning(res.message) + } + }) + } else { + submitInitComparsion(query).then((res) => { + if (res.success) { + this.loading = false + this.$message.success(this.$t('operationSuccessful')) + this.$router.push({ + path: '/documentTool/DocumentDataComparison', + query: { + id: res.result, + infoNameLeft: this.selectedRowsLeft[0].title, + infoNumberLeft: this.selectedRowsLeft[0].serialNumber, + infoNameRight: this.selectedRowsRight[0].title, + infoNumberRight: this.selectedRowsRight[0].serialNumber } }) + } else { + this.loading = false + this.$message.warning(res.message) } - } - }) + }) + } }, getListLeft () { const queryParam = JSON.parse(JSON.stringify(this.queryParamLeft)) @@ -498,8 +498,8 @@ export default { .detail-content-box { display: flex; - height: calc(100% - 152px); - min-height: calc(340px + 46px + 40px + 72px + 48px); + height: calc(100% - 12px); + /*min-height: calc(340px + 46px + 40px + 72px + 48px);*/ } .detail-content-left {