From af2dbe905417253c809d571ae8859fa7fadf9c97 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 2 Jun 2022 11:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug1?=
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 | 108 +++++++++---------
.../components/projectStatusAndProgress.vue | 6 +-
.../projectStatusBoard/index.vue | 6 +-
4 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 413b727f5..2eb508aaa 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -664,7 +664,9 @@ module.exports = {
alteration: 'Alteration',
fixedPlate: 'Fixed plate',
taskAffirmStatus: 'Task Confirmation Status',
+ taskAffirm:'Task Confirmation',
listConfirmationStatus: 'List Confirmation Status',
+ listConfirmation: 'List Confirmation',
ListConfirmationDeadline: 'List confirmation deadline',
dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
pleaseSelectPersonFirst: 'Please select a person first',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index a21ed39f9..309bb34df 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -604,7 +604,7 @@ module.exports = {
StandardImplementationDate: '标准实施日期',
regulatoryEngineer: '法规工程师',
certifiedEngineer: '认证工程师',
- judge:'判断',
+ judge: '判断',
engineeringInterfacePerson: '工程接口人',
typeOfDeliverables: '交付物类型',
deliverableTemplate: '交付物模板',
@@ -673,7 +673,9 @@ module.exports = {
alteration: '变更',
fixedPlate: '定版',
taskAffirmStatus: '任务确认状态',
+ taskAffirm: '任务确认',
listConfirmationStatus: '清单确认状态',
+ listConfirmation: '清单确认',
ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
@@ -855,57 +857,57 @@ module.exports = {
totalTable: '总数',
applicableSupplement: '适用增补件',
taskDescription: '任务说明',
- descriptionDeliverables:'交付物说明',
- startMonth:'开始日期',
- endMonth:'结束日期',
- Importing:'导入中...',
- projectDeliveryDescription:'工程交付说明',
- cancelConfirm:'取消确认',
- currentInformation:'当前信息',
- deliveryHistory:'交付历史',
- projectDeliveryRequirements:'工程交付说明',
- personLiableConfirm:'责任人确认',
- complianceResults:'符合性结果',
- noData:'暂无数据',
- confirmOperation:'确认操作',
- sponsorReview:'发起人审查',
- fillInProjectDelivery:'填写工程交付',
- Resubmit:'重新提交',
- Quantity:'数量',
- pleaseConfirmationResults:'请根据工程确认结果选择符合性状态',
- pleaseReviewTask:'请您添加对该条审查任务的工程确认信息',
- pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
- pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交',
- modelName:'车型名称',
- modelYear:'年款',
- NoteConfirmTheChange:'注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更',
- onlyDataChanged:'只能变更任务确认状态为接受的数据',
- inquiry:'询问',
- ConfirmationDeadline:'确认截止时间',
- regulatoryCertificationTaskConfirmation:'法规认证任务确认',
- confirmationEngineeringInterfacePerson:'工程接口人确认',
- engineerReply:'工程师回复',
- catalogFile:'目录文件',
- testScheme:'试验方案',
- testReportLocation:'检测报告位置',
- explain:'说明',
- dataCannotEmpty:'数据不能为空',
- documentDynamics:'文档动态',
- theNumberAgain:'编号已存在不能重复添加',
- myList:'我的待办',
- myNews:'我的消息',
- monthlyReportRegulations:'法规月报',
- Pending:'待处理',
- custom:'自定义',
- notSelected:'未选择',
- ExportReport:'导出报告',
- basicInformation:'基础信息',
- replyFromProjectContact:'工程接口人回复',
- pleaseUpload:'请上传',
- fullScreenView:'全屏查看',
- systemPrompt:'系统提示',
- loginExpired:'登录已过期',
- reportNotUploaded:'报告未上传',
+ descriptionDeliverables: '交付物说明',
+ startMonth: '开始日期',
+ endMonth: '结束日期',
+ Importing: '导入中...',
+ projectDeliveryDescription: '工程交付说明',
+ cancelConfirm: '取消确认',
+ currentInformation: '当前信息',
+ deliveryHistory: '交付历史',
+ projectDeliveryRequirements: '工程交付说明',
+ personLiableConfirm: '责任人确认',
+ complianceResults: '符合性结果',
+ noData: '暂无数据',
+ confirmOperation: '确认操作',
+ sponsorReview: '发起人审查',
+ fillInProjectDelivery: '填写工程交付',
+ Resubmit: '重新提交',
+ Quantity: '数量',
+ pleaseConfirmationResults: '请根据工程确认结果选择符合性状态',
+ pleaseReviewTask: '请您添加对该条审查任务的工程确认信息',
+ pleaseWillBeReturned: '请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回',
+ pleaseSubmitStatus: '请把工程确认的数据都点为确认状态进行提交',
+ modelName: '车型名称',
+ modelYear: '年款',
+ NoteConfirmTheChange: '注意：变更后该条清单变为未审查状态，将从内部审查工作开始从头进行，历史数据都将丢弃是否确认变更',
+ onlyDataChanged: '只能变更任务确认状态为接受的数据',
+ inquiry: '询问',
+ ConfirmationDeadline: '确认截止时间',
+ regulatoryCertificationTaskConfirmation: '法规认证任务确认',
+ confirmationEngineeringInterfacePerson: '工程接口人确认',
+ engineerReply: '工程师回复',
+ catalogFile: '目录文件',
+ testScheme: '试验方案',
+ testReportLocation: '检测报告位置',
+ explain: '说明',
+ dataCannotEmpty: '数据不能为空',
+ documentDynamics: '文档动态',
+ theNumberAgain: '编号已存在不能重复添加',
+ myList: '我的待办',
+ myNews: '我的消息',
+ monthlyReportRegulations: '法规月报',
+ Pending: '待处理',
+ custom: '自定义',
+ notSelected: '未选择',
+ ExportReport: '导出报告',
+ basicInformation: '基础信息',
+ replyFromProjectContact: '工程接口人回复',
+ pleaseUpload: '请上传',
+ fullScreenView: '全屏查看',
+ systemPrompt: '系统提示',
+ loginExpired: '登录已过期',
+ reportNotUploaded: '报告未上传',
// 认证权限状态
CollectionInitiated: '待发起收集、',
handledInterface: '待工程接口人处理、',
@@ -918,5 +920,5 @@ module.exports = {
Statusis: '状态为',
toHavePermission: '才有权限',
and: '并且',
- pleaseWaitWhileRunning:'运行中请稍等',
+ pleaseWaitWhileRunning: '运行中请稍等'
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
index ace12773b..28255cf3d 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
@@ -19,7 +19,7 @@
:columns="columns"
>
- {{this.$t('projectStatus')}}
+ {{this.$t('CurrentStatusOfTheProject')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}}
@@ -27,11 +27,11 @@
{{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}}
- {{this.$t('listConfirmationStatus')}}
+ {{this.$t('listConfirmation')}}
{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}
- {{this.$t('taskAffirmStatus')}}
+ {{this.$t('taskAffirm')}}
{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index cc6b64298..de0083ecd 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -73,7 +73,7 @@
:columns="columns"
>
- {{this.$t('projectStatus')}}
+ {{this.$t('CurrentStatusOfTheProject')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}}
@@ -81,11 +81,11 @@
{{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}}
- {{this.$t('listConfirmationStatus')}}
+ {{this.$t('listConfirmation')}}
{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}
- {{this.$t('taskAffirmStatus')}}
+ {{this.$t('taskAffirm')}}
{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}