Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1842,4 +1842,6 @@ module.exports = {
   designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
   uploadedfilelarger:'文件大于',
+  uploadedfilelarger:'文件大于50M',
+  marketCertificationList:'市场认证清单',
 }

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

jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue

@@ -15,10 +15,10 @@
             <a-row :gutter="24">
               <a-col :md="12" :sm="8">
                 <div class="box-title-text">
-                  <div class="title-text" :title="$t('CertificationListName')">
-                    <span>{{$t('CertificationListName')}}</span>
+                  <div class="title-text" :title="$t('marketCertificationList')">
+                    <span>{{$t('marketCertificationList')}}</span>
                   </div>
-                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('marketCertificationList')"
                            v-model="queryParam.name"></j-input>
                 </div>
               </a-col>
@@ -87,7 +87,7 @@
         selectedRowKeys: [],
         columns: [
           {
-            title: this.$t('CertificationListName'),
+            title: this.$t('marketCertificationList'),
             dataIndex: 'name',
             align: 'left',
             ellipsis: true,

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')