diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 40c09c25f..7b534e09c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -712,6 +712,7 @@ module.exports = { uploadTime: 'Upload Time', enclosure: 'Enclosure', // 认证 + ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration', theCurrent: 'The current status of this data is', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7ab56bbee..c99f0daca 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -697,7 +697,7 @@ module.exports = { projectDetails: '项目详情', listOfRegulations: '法规清单', taskList: '任务清单', - TaskParameterCollection: '认证参数收集', + TaskParameterCollection: '认证参数列表', nonConformance: '未符合项', deadlineForConfirmationOfDesignCompliance: '设计符合性确认截止时间', prehomoConfirmationDeadline: 'Pre-Homo确认截止时间', @@ -723,6 +723,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '所选项目有未完成收集数据,不能添加配置', theCurrent: '此数据当前状态为', diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index e1300427f..07c804f03 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -337,10 +337,15 @@ export const constantRouterMap = [ name: 'ProjectDetails', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index') }, + // { + // path: '/ParameterItemCollection', + // name: 'ParameterItemCollection', + // component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ParameterItemCollection/ProjectDetails/index') + // }, { path: '/ParameterItemCollection', name: 'ParameterItemCollection', - component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ParameterItemCollection/ProjectDetails/index') + component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/components/ParameterItemCollectionList') }, { path: '/taskListProcess', diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 9600e1ba0..83e7306b1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -1,66 +1,75 @@