From 826fb69663df351a358267dbdaaca1fcd7e3adc7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 19 Apr 2022 19:51:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E7=BC=96=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=98=BE=E9=9A=90=20=EF=BC=9B=202.=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8A=A0url=E9=AA=8C=E8=AF=81=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/ProjectDetails.vue | 31 ++++++++++++------- .../projectManagement/components/addModel.vue | 23 +++++++++++++- .../components/listOfRegulations.vue | 12 +++++-- 5 files changed, 54 insertions(+), 14 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3ff638c59..bbd75adb0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -685,4 +685,5 @@ module.exports = { deadlineForConfirmationOfDesignCompliance:'Deadline for confirmation of design compliance', prehomoConfirmationDeadline:'Prehomo confirmation deadline', verificationComplianceConfirmationDeadline:'Verification compliance confirmation deadline', + pleaseEnterTheCorrectWebAddress:'Please enter the correct web address', } \ 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 580ae40f0..8d5cdc02f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -689,4 +689,5 @@ module.exports = { deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间', prehomoConfirmationDeadline:'PreHomo确认截止时间', verificationComplianceConfirmationDeadline:'验证符合性确认截止时间', + pleaseEnterTheCorrectWebAddress:'请输入正确的网址', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 59c98ca75..5131a0142 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -6,57 +6,57 @@
{{$t('entryName')}} - {{queryForm.projectName}}
{{$t('targetMarket')}} - {{queryForm.targetMarket_dictText}}
{{$t('projectStatus')}} - {{queryForm.projectStatus_dictText}}
{{$t('IPDInformation')}} - {{queryForm.ipdInfo}}
{{$t('DigitalPlatform')}} - {{queryForm.digitalPlatform_dictText}}
{{$t('ModelPlatform')}} - {{queryForm.vehiclePlatform_dictText}}
{{$t('StudioEngineer')}} - {{queryForm.studioEngineerName}}
{{$t('certifiedEngineer')}} - {{queryForm.certificationEngineerName}}
{{$t('dehicleDevelopmentPlan')}} - {{queryForm.vehicleDevelopmentPlan}}
{{$t('certificationProgram')}} - {{queryForm.attestationPlan}}
{{$t('ListOfRelevantPersonnel')}} - @@ -195,6 +195,11 @@ ListOfRelevantPersonnelClick(){ this.$refs.listOfRelevantPersonnelRef.getData() }, + urlClick(val){ + if (val){ + window.open(val) + } + }, } } @@ -334,4 +339,8 @@ } } + .text-field-right-color{ + color: #00B3BE!important; + cursor: pointer; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 6aa19f9ca..a81d6bab4 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -105,6 +105,8 @@ :placeholder="$t('PleaseEnter')+$t('IPDInformation')"/>
+ @@ -192,7 +194,26 @@ formInline: {}, confirmLoading: false, visible: false, - rules: {}, + rules: { + ipdInfo: [ + { + pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, + message: this.$t('pleaseEnterTheCorrectWebAddress') + } + ], + vehicleDevelopmentPlan: [ + { + pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, + message: this.$t('pleaseEnterTheCorrectWebAddress') + } + ], + attestationPlan: [ + { + pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/, + message: this.$t('pleaseEnterTheCorrectWebAddress') + } + ] + }, disabled: false, projectNameList: [], title: '' diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e014e2b4b..1a9a41f34 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -123,8 +123,16 @@ :columns="columns" > - {{$t('edit')}} - {{$t('deleteLib')}} + + {{$t('edit')}} + + + {{$t('deleteLib')}} + {{text && text.length > 20 ? text.slice(0,19)+'...':text}}