From f33318a1fbccc042e0926d87dfa4205c69ee989c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 25 Jul 2022 10:31:22 +0800 Subject: [PATCH 01/45] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/RetrieveFilesList.vue | 4 +- .../components/addModel.vue | 18 +- .../components/documentTranslationResults.vue | 234 ++++++++++++++++++ .../documentTranslation/index.vue | 29 ++- 8 files changed, 271 insertions(+), 24 deletions(-) create mode 100644 jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue 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) { From aabbb7b5ce7b63b9311499cf0276fc89bbe21faa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 25 Jul 2022 11:33:09 +0800 Subject: [PATCH 02/45] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 9 ++ jero-web/src/common/lang/zh-cn.js | 9 ++ .../externalReports/components/addModel.vue | 91 +++++++++++++++---- jero-web/src/views/externalReports/index.vue | 45 ++++++--- .../commponts/conventionalmodle.vue | 3 + .../ParameterItemCollectionList.vue | 35 +++++-- 6 files changed, 150 insertions(+), 42 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..3a21c67e7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1173,4 +1173,13 @@ module.exports = { convertFailed:'Convert Failed', standardData:'Standard Data', Theorganization:'The Organization', + Addingfolder:'Adding a folder', + Addingsubfolders:'Adding Subfolders', + Editfolder:'Edit Folder', + Deletefolders:'Delete Folders', + Foldername:'Folder Name', + Folderpermissions:'Folder Permissions', + Folderorder:'Folder Order', + Downloadprivileges:'Download Privileges', + Openpersonnel:'Open Personnel' } \ 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..4ca188418 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1177,4 +1177,13 @@ module.exports = { convertFailed:'转换失败', standardData:'标准数据', Theorganization:'组织机构', + Addingfolder:'新增文件夹', + Addingsubfolders:'新增子文件夹', + Editfolder:'编辑文件夹', + Deletefolders:'删除文件夹', + Foldername:'文件夹名称', + Folderpermissions:'文件夹权限', + Folderorder:'文件夹顺序', + Downloadprivileges:'下载权限', + Openpersonnel:'开放人员' } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index c557ad5d5..190946488 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -1,4 +1,5 @@ diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index f261141e4..17b431dae 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -44,17 +44,18 @@ @@ -184,15 +185,19 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - - + + - - + + - + @@ -220,13 +225,14 @@ import Vue from 'vue' import moment from 'moment' import eventBUs from '@/common/event' import { mapGetters } from 'vuex' +import PersonnelSelection from '@/components/PersonnelSelection/index' export default { name: 'SplitDetail', components: { addModel, handleModel, - // exportTree, + PersonnelSelection, globalAdvancedQuery // ImportFile }, @@ -242,6 +248,7 @@ export default { }, pageSize: 10, pageNo: 1, + disabled:false, total: 0, tableData: [], selectedRowKeys: [], @@ -393,6 +400,10 @@ export default { this.contentVisible = true this.contentValue = val }, + PersonnelSelectionChange(value, id) { + this.form[value] = id + this.form = { ...this.form } + }, //关闭条款内容弹框 handleCancel() { this.contentVisible = false @@ -549,12 +560,18 @@ export default { }, //树形新增 orgAdd() { - this.menuTitle = this.$t('add') + this.menuTitle = this.$t('Addingfolder') this.isEdit = false this.form = {} this.menuRightVisible = true }, + orgAdds(){ + this.menuTitle = this.$t('Addingsubfolders') + this.isEdit = false + this.form = {} + this.menuRightVisible = true + }, //树形修改 orgEdit() { this.menuTitle = this.$t('edit') diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index ead1ddc77..56a23cacc 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -17,6 +17,7 @@
+ * {{$t('certificationCategory')}}
@@ -35,6 +36,7 @@
+ * {{$t('configure')}}
@@ -59,6 +61,7 @@
+ * {{$t('WhetherMergeParameters')}}
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 682fbe51a..5ef39eb9b 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -108,7 +108,7 @@ - + @@ -140,28 +124,28 @@ trigger: 'change' } ], - standard: [ + serialNumber: [ { required: true, message: this.$t('standard') + this.$t('cannotEmpty'), trigger: 'change' } ], - translationResults: [ + textStatus: [ { required: true, message: this.$t('TextStatus') + this.$t('cannotEmpty'), trigger: 'change' } ], - translationLanguage: [ + sourceLanguage: [ { required: true, message: this.$t('translationLanguage') + this.$t('cannotEmpty'), trigger: 'change' } ], - translationLanguageOne: [ + targetLanguage: [ { required: true, message: this.$t('translationLanguage') + this.$t('cannotEmpty'), @@ -175,8 +159,18 @@ } }, mounted() { + this.getTextStatus() }, methods: { + getTextStatus() { + getAction('/docTranslation/docTranslationEO/queryTextStatusVal', {}).then((res) => { + if (res.success) { + this.translationResultsList = res.result || [] + } else { + this.translationResultsList = [] + } + }) + }, add() { this.visible = true this.formInline = {} @@ -193,18 +187,16 @@ handleOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - let ids = JSON.parse(JSON.stringify(this.ids)) let query = { - ids: ids.join(','), ...this.formInline } this.confirmLoading = true - postAction(this.url.setBatch, query).then((res) => { + postAction('/docTranslation/docTranslationEO/add', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('batSettingList') + this.$emit('addModelForm') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -232,20 +224,36 @@ /** 上传文件的回调 */ uploadSuccess(data) { let attIdList = [] + let fileName = [] if (data && data.length > 0) { data.map(item => { attIdList.push(item.id || data.name) + fileName.push(item.fileName) }) } /** 赋值给当前对应的表单文件 */ this.formInline[this.uploadName] = attIdList.join(',') + this.formInline.fileName = fileName.join(',') this.formInline = { ...this.formInline } + this.$nextTick(() => { + if (this.formInline[this.uploadName]) { + this.$refs.ruleForm.validateField([this.uploadName]) + } + }) }, standardClick() { this.$refs.standardDataRef.addModel() }, - standardDataForm() { - + standardDataForm(row) { + this.formInline.serialNumber = row.serial_number + this.formInline.title = row.title + this.formInline.bussDocumentLibraryId = row.id + this.formInline = { ...this.formInline } + this.$nextTick(() => { + if (this.formInline.serialNumber) { + this.$refs.ruleForm.validateField(['serialNumber']) + } + }) } } } diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue index 9ba6c282c..4ea4ffa48 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue @@ -157,7 +157,7 @@ total: 0, fieldList: [], queryConditionVOList: [], - selectedRowKeysRecord:[], + selectedRowKeysRecord: [] } }, mounted() { @@ -214,12 +214,12 @@ } }) }, - onSelectChange(value) { + onSelectChange(value,record) { this.selectedRowKeys = value if (this.selectedRowKeys.length > 1) { this.selectedRowKeys.shift() } - this.selectedRowKeysRecord = record.filter(res=>{ + this.selectedRowKeysRecord = record.filter(res => { return res.id == this.selectedRowKeys[0] }) this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] @@ -229,8 +229,7 @@ }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.confirmLoading = true - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + this.$emit('standardDataForm', this.selectedRowKeysRecord[0]) this.visible = false } else { this.$message.warning(this.$t('selectLeastOne')) diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 0f01630f4..2c3b82588 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -26,19 +26,10 @@
{{$t('translationResults')}}
- - - - {{ item.name }} - - - +
@@ -106,12 +88,17 @@ {{$t('view')}} - - {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}} + + {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}} - {{$t('download')}} - {{$t('delete')}} + {{$t('download')}} + {{$t('delete')}}
@@ -133,9 +120,11 @@