From 32d69722cc7343677cffa6431c7d18b06c68eccd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 14:00:41 +0800 Subject: [PATCH 1/2] bug 67634 --- .../vehicleregistration/components/maintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 69d150010..ddba93e87 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -168,7 +168,7 @@ export default { ids:this.ids } this.confirmLoading = true - postAction('ota/otaBaSjList/batchRecord', query).then((res) => { + postAction('ota/otaBaCxList/batchRecord', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false From 28a026b4a4c74071d3c5f95d9c720c3f3653731d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 30 Mar 2023 14:04:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= 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 | 2 ++ .../components/transferList.vue | 8 ++++---- .../components/transferListvirtal.vue | 17 ++++++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b07dc98e7..17314e220 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,7 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', + uploadedfilelarger:'The uploaded file is larger than 50 MB', + marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', } \ 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 37ca1e33e..d0446cff7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1842,4 +1842,6 @@ module.exports = { designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', uploadedfilelarger:'文件大于', + uploadedfilelarger:'文件大于50M', + marketCertificationList:'市场认证清单', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index f1fda8f8b..548f3c44d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('CertificationListName')}} +
+ {{$t('marketCertificationList')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('CertificationListName'), + title: this.$t('marketCertificationList'), dataIndex: 'name', align: 'left', ellipsis: true, diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue index c26d49d02..8a661ce0e 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue @@ -242,7 +242,22 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result && res.result.length > 0) { + let detailedWarningList = [] + res.result.forEach(val => { + detailedWarningList.push( + < div > { val } < /div>) + }) + this.$warning({ + content: ( + < div > + { detailedWarningList } + < /div> + ) + }) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('transferListFormHomo')