From 4573e4dc24bf61324f038b94716c2369b936ced0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 18 Jul 2022 10:57:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3=E5=AF=B9?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/initiateComparison.vue | 445 ++++++++++++++++++ .../documentComparison/index.vue | 5 +- 6 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index fbec2b870..299e1f65d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1151,4 +1151,7 @@ module.exports = { CommentsCollectionResultsForReference:'Comments Collection Results For Reference', TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference', ComplianceConfirmationRecord:'Compliance Confirmation Record', + noComparisonDocumentSelected:'No comparison document selected', + RemarkInfo:'Remarks Info', + initiateDocumentComparison:'Initiate Document Comparison', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ac2cf6d24..7a52eeddf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1155,4 +1155,7 @@ module.exports = { CommentsCollectionResultsForReference:'意见收集结果参考', TechnicalEvaluationResultsForReference:'技术评估结果参考', ComplianceConfirmationRecord:'符合性确认记录', + noComparisonDocumentSelected:'未选择对比文档', + RemarkInfo:'备注信息', + initiateDocumentComparison:'发起文档对比', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 216d49f12..42889f88b 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -97,6 +97,7 @@ this.$route.path == '/handshakeProcess' || this.$route.path == '/projectStatusAndProgress' || this.$route.path == '/TaskPlanList' || + this.$route.path == '/initiateDocumentComparison' || this.$route.path == '/evaluationProcess' || this.$route.path == '/evaluationResultsClause' || this.$route.path == '/evaluationResultsWhole' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 648696c1d..827486c44 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -382,6 +382,11 @@ export const constantRouterMap = [ name: 'evaluationProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index') }, + { + path: '/initiateDocumentComparison', + name: 'initiateDocumentComparison', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/initiateComparison') + }, { path: '/handshakeProcess', name: 'handshakeProcess', diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue new file mode 100644 index 000000000..5d8f4bae2 --- /dev/null +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -0,0 +1,445 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 9038af696..af40eee99 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -260,7 +260,10 @@ }, initiatingProcessClick(){ - + let newUrl = this.$router.resolve({ + path: '/initiateDocumentComparison', + }) + window.open(newUrl.href, '_blank') }, deleteData(val){ let _this = this