diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..1db4084cc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1173,4 +1173,6 @@ module.exports = { convertFailed:'Convert Failed', standardData:'Standard Data', Theorganization:'The Organization', + originalText:'Original Text', + translatedText:'Translated Text', } \ 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 43142beb5..29c912d1d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1177,4 +1177,6 @@ module.exports = { convertFailed:'转换失败', standardData:'标准数据', Theorganization:'组织机构', + originalText:'原文', + translatedText:'译文', } \ 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 3d15fba0b..43d3b7322 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -99,6 +99,7 @@ this.$route.path == '/TaskPlanList' || this.$route.path == '/documentDataComparison' || this.$route.path == '/comparisonResults' || + this.$route.path == '/documentTranslationResults' || this.$route.path == '/initiateDocumentComparison' || this.$route.path == '/evaluationProcess' || this.$route.path == '/evaluationResultsClause' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index be6370596..b4a8ba6b4 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -387,6 +387,11 @@ export const constantRouterMap = [ name: 'initiateDocumentComparison', component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/initiateComparison') }, + { + path: '/documentTranslationResults', + name: 'documentTranslationResults', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentTranslation/components/documentTranslationResults') + }, { path: '/documentDataComparison', name: 'documentDataComparison', diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 7237ce8f6..fe311363b 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -73,7 +73,7 @@ class="box-input-One" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguage"> + v-model="formInline.sourceLanguage"> @@ -91,7 +91,7 @@ class="box-input-One" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguageOne"> + v-model="formInline.targetLanguage"> diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index 2838e708c..a96e3a73b 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -18,11 +18,11 @@ {{$t('file')}} - + - {{ (formInline.file === 'null' || formInline.file === '' || - formInline.file == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('sourceFileId')"> + {{ (formInline.sourceFileId === 'null' || formInline.sourceFileId === '' || + formInline.sourceFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -37,7 +37,7 @@ @@ -54,7 +54,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationResults"> + v-model="formInline.textStatus"> @@ -77,7 +77,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguage"> + v-model="formInline.sourceLanguage"> @@ -95,7 +95,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguageOne"> + v-model="formInline.targetLanguage"> @@ -133,7 +133,7 @@ confirmLoading: false, formInline: {}, rules: { - file: [ + sourceFileId: [ { required: true, message: this.$t('file') + this.$t('cannotEmpty'), diff --git a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue new file mode 100644 index 000000000..0247520ec --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index fddde2cf3..0f01630f4 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -30,7 +30,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.translationResults"> + v-model="queryParam.translationResult"> @@ -51,7 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.flowStatus"> + v-model="queryParam.releaseCondition"> @@ -105,7 +105,7 @@ {{$t('view')}} - {{$t('check')}} + {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}} @@ -200,7 +200,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'TextStatus' + dataIndex: 'textStatus' }, { title: this.$t('fileName'), @@ -212,13 +212,13 @@ { title: this.$t('translationLanguage'), align: 'center', - dataIndex: 'translationLanguage', + dataIndex: 'targetLanguage', width: 170 }, { title: this.$t('translationResults'), align: 'center', - dataIndex: 'translationResults', + dataIndex: 'translationResult', width: 170 }, { @@ -226,14 +226,14 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'conversionTime' + dataIndex: 'translationTime' }, { title: this.$t('releaseSituation'), align: 'center', width: 170, ellipsis: true, - dataIndex: 'releaseSituation' + dataIndex: 'releaseCondition' }, { title: this.$t('operation'), @@ -303,11 +303,14 @@ this.selectedRowKeys = value }, viewClick(row) { - - }, - checkClick(row) { - + let newUrl = this.$router.resolve({ + path: '/documentTranslationResults' + }) + window.open(newUrl.href, '_blank') }, + // checkClick(row) { + // + // }, downloadData() { }, @@ -320,7 +323,7 @@ RetrieveFilesClick() { this.$refs.RetrieveFilesListRef.addModel() }, - BatchDelete(){ + BatchDelete() { }, deleteData(val) {