diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 78cd46eac..0a5a7eb63 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -675,5 +675,11 @@ module.exports = { basicInformationOfParameters:'Basic information of parameters', regulatoryCertificationTaskPlan:'Regulatory / certification task plan', bringInRelevantPersonnel:'Bring in relevant personnel', - confirmBringInRelevantPersonnel:'confirm Bring in relevant personnel' + confirmBringInRelevantPersonnel:'confirm Bring in relevant personnel', + problemType:'Problem type', + projectDetails:'Project details', + listOfRegulations:'List of regulations', + taskList:'Task list', + TaskParameterCollection:'Task parameter collection', + nonConformance:'Non conformance', } \ 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 147e766b6..c4cbd700f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -680,5 +680,10 @@ module.exports = { regulatoryCertificationTaskPlan:'法规/认证任务计划', bringInRelevantPersonnel:'带入相关人员', confirmBringInRelevantPersonnel:'确认带入相关人员?', - + problemType:'问题类型', + projectDetails:'项目详情', + listOfRegulations:'法规清单', + taskList:'任务清单', + TaskParameterCollection:'任务参数收集', + nonConformance:'未符合项', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index c8413059e..b1c26d5d1 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -10,28 +10,28 @@ -
+
-
+
- 项目详情 + {{$t('projectDetails')}}
-
+
- 法规清单 + {{$t('listOfRegulations')}}
-
+
- 任务清单 + {{$t('taskList')}}
-
+
- 任务参数收集 + {{$t('TaskParameterCollection')}}
-
+
- 未符合项 + {{$t('nonConformance')}}
@@ -39,6 +39,7 @@ +
@@ -50,6 +51,7 @@ import listOfRegulations from '../components/listOfRegulations' import ProjectDetailsName from '../components/ProjectDetails' import TaskParameterCollection from '../components/TaskParameterCollection' + import nonConformance from '../components/nonConformance' export default { name: 'ProjectDetails', @@ -57,11 +59,12 @@ TaskList, listOfRegulations, ProjectDetailsName, - TaskParameterCollection + TaskParameterCollection, + nonConformance }, data() { return { - title: '项目详情', + title: this.$t('projectDetails'), textTitle: '项目详情' } }, @@ -139,6 +142,9 @@ .Virtual-detail-left-text { padding: 2px 12px; cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue new file mode 100644 index 000000000..2af6ec662 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -0,0 +1,192 @@ + + + + \ No newline at end of file