From 6c87eb002f136bd6862da0c043941e1347557594 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 7 Jun 2023 14:16:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E6=8A=A5=E5=BA=93=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6=E6=A0=A1=E9=AA=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=80=97=E5=8F=B7=202.=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=B6=E9=97=B4=E8=AE=BE=E5=AE=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=203.=E4=B8=8A=E6=8A=A5=E5=BA=93=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E8=88=AC=E5=AF=BC=E5=87=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 4 +- jero-web/src/common/lang/zh-cn.js | 4 +- .../commponts/conventionalmodle.vue | 2 +- .../parameter/managementdetails/index.vue | 28 +- .../components/settingList.vue | 615 ++++++++++-------- 5 files changed, 378 insertions(+), 275 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 547a8153a..713d73d98 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1271,7 +1271,7 @@ module.exports = { turnOnAutoMatch:'Turn On Auto Match', Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', - punctuationmark:'You can only enter English punctuation marks except the # sign and commas', + punctuationmark:'You can only enter English punctuation marks except the # sign', created: 'Time of Creation', updated:'Last Updated', OpenOne:'Open', @@ -1839,4 +1839,6 @@ module.exports = { toResubmit:'To Resubmit', selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data', submissionProcess:'Submission Process', + localapproval1:'Local Approval1', + localapproval2:'Local Approval2', } \ 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 f92664c4a..38dad2ab0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1376,7 +1376,7 @@ module.exports = { regulatoryTechnicalAssessment: '法规技术评估', OpenOne: '公开', Privacy: '私密', - punctuationmark: '只能输入除#号和逗号外的英文标点符号', + punctuationmark: '只能输入除#号外的英文标点符号', created: '创建时间', updated: '更新时间', optionDropDownBox: '下拉选择', @@ -1940,4 +1940,6 @@ module.exports = { toResubmit:'重新提交', selectDesignConformanceAsConformance:'请选择设计符合性确认流程状态为符合或验证符合性确认流程状态为符合的数据', submissionProcess:'提交流程', + localapproval1:'地方批准1', + localapproval2:'地方批准2', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index af8c5105a..ad7f2ee2f 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -152,7 +152,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' }, { min:1, max: 1, message: this.$t('onlyone'), trigger: 'blur' }, { - pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?]+$/, + pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?\,]+$/, message: this.$t('punctuationmark'), trigger: 'blur' } diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 2b7829bc7..936066d2b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -92,6 +92,11 @@ {{$t('preservation')}} + +
+ + {{$t('dataExport')}} +
{{$t('ConventionalExport')}} @@ -182,7 +187,7 @@