From ba709306e6ea19fbd2bfd5d5b53a643812a47613 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 5 May 2022 16:25:47 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86?= 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 | 4 +- .../parameterlist/components/addModel.vue | 26 +++++++------ .../ProjectDetails/index.vue | 4 +- .../components/TaskParameterCollection.vue | 38 +++++++++---------- 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0ee398229..1ee1c249a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + collectionCompletionTime: 'collection Completion Time', + parameterTemplateName: 'parameter Template Name', onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered', templateName: 'template Name', pleaseSelectData: 'please Select Data', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 42c8141c4..965a20fe0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -686,7 +686,7 @@ module.exports = { projectDetails:'项目详情', listOfRegulations:'法规清单', taskList:'任务清单', - TaskParameterCollection:'任务参数收集', + TaskParameterCollection:'认证参数收集', nonConformance:'未符合项', deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间', prehomoConfirmationDeadline:'PreHomo确认截止时间', @@ -712,6 +712,8 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + collectionCompletionTime: '收集完成时间', + parameterTemplateName: '参数模板名称', onlyThree: '只能输入字母，数字，横杠（-）三种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 48cec5a17..486d48376 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -202,7 +202,7 @@ + @click="clickButtonToUpload('fileTemplateConnectId')"> {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' || formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -376,20 +376,17 @@ export default { this.formInline = { ...this.formInline } }, clickButtonToUpload(item) { - // this.$refs.uploadFile.perentHandleFunc() - // this.$refs.uploadFile.state = item.flag this.$refs.uploadFile.visible = true - // this.uploadName = item.db_field_name - // getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => { - // if (res.success) { - // this.$refs.uploadFile.perentHandleFunc(res.result) - // } else { - // this.$refs.uploadFile.perentHandleFunc() - // } - // }) + getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) }, Onchangelabel(val) { - + console.log(val,'val,,,,') // this.formInline.certCategoryParamsInfoEOList = [] val.forEach((item) => { this.contentList.push({ @@ -436,6 +433,11 @@ export default { this.$nextTick(() => { this.formInline = value }) + // if(value.certCategoryParamsInfoEOList.length > 0 ) { + // this.contentList = value.certCategoryParamsInfoEOList + // } + console.log(this.contentList,'this.contentList') + console.log(value.certCategoryParamsInfoEOList,'lllll') }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index e1cdaba08..f51b28255 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -39,7 +39,7 @@ {{$t('taskList')}} -
+
{{$t('TaskParameterCollection')}}
@@ -52,7 +52,7 @@ - +
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 3c61dbeb6..c983bda63 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -4,10 +4,10 @@
-
- {{$t('certificationType')}} +
+ {{$t('title')}}
-
@@ -70,19 +70,9 @@ return{ columns:[ { - title: this.$t('NiONumber'), + title: this.$t('title'), align: 'center', - dataIndex: 'NiONumber', - }, - { - title: this.$t('ParameterName'), - align: 'center', - dataIndex: 'ParameterName', - }, - { - title: this.$t('ParameterDescription'), - align: 'center', - dataIndex: 'ParameterDescription', + dataIndex: 'title', }, { title: this.$t('status'), @@ -90,20 +80,30 @@ dataIndex: 'status', }, { - title: this.$t('Operator'), + title: this.$t('parameterTemplateName'), align: 'center', - dataIndex: 'Operator', + dataIndex: 'ParameterDescription', }, { - title: this.$t('operationTime'), + title: this.$t('collectionCompletionTime'), align: 'center', - dataIndex: 'operationTime', + dataIndex: 'status', }, { title: this.$t('Version'), align: 'center', dataIndex: 'Version', }, + { + title: this.$t('creator'), + align: 'center', + dataIndex: 'Version', + }, + { + title: this.$t('createTime'), + align: 'center', + dataIndex: 'Version', + }, { title: this.$t('operation'), align: 'center',