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

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

@@ -918,7 +918,7 @@ module.exports = {
   virtualAuthenticationListDetails: '虚拟认证清单详情',
   VirtualAuthenticationList: '虚拟认证清单',
   maintainVirtualList: '维护市场清单',
-  certificationListMaintenance: '认证清单维护',
+  certificationListMaintenance: '市场认证清单维护',
   reasonsForRejection: '驳回原因',
   inconformity: '不符合',
   toTrack: '待追踪',

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -155,17 +155,19 @@
               <div class="title-text-add">
                 <span class="title-text-text plus3" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
               </div>
-              <a-form-model-item class="itemModel" style="width: 38%">
-                  <a-select class="box-input" v-model="form.dllx1"  allowClear :disabled="disabled"  :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
-                    <a-select-option v-for="(item, key) in projectNameList1"
-                                   :key="key"
-                                   :value="item">
-                                   {{ item }}
-                    </a-select-option>
-                  </a-select>
-              </a-form-model-item>
-              <a-form-model-item class="itemModel" style="width: 40%;margin-left:20px">
-                <a-select v-model="form.dllx2" class="box-input"   allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
+                <a-form-model-item class="itemModel">
+                <div style="display:flex;flex-wrap: nowrap;width: 100%;">
+                  <div style="width: 90%;margin-right: 20px;">
+                      <a-select class="box-input" style="width: 100%;" v-model="form.dllx1"  allowClear :disabled="disabled"  :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
+                        <a-select-option v-for="(item, key) in projectNameList1"
+                                       :key="key"
+                                       :value="item">
+                                       {{ item }}
+                        </a-select-option>
+                      </a-select>
+                </div>
+                <div style="width: 100%;">
+                      <a-select v-model="form.dllx2" class="box-input"   allowClear :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
                   <a-select-option v-for="(item, key) in projectNameList2"
                                    :key="key"
                                    :value="item">
@@ -175,7 +177,9 @@
                      </span> -->
                   </a-select-option>
                 </a-select>
-              </a-form-model-item>
+                </div>
+                </div>
+                </a-form-model-item>
             </div>
           </a-col>
           <a-col :span="24">
@@ -343,7 +347,7 @@ import { message } from 'ant-design-vue'
             if(res.result.dllx2 == null){
               res.result.dllx2 = undefined
             }
-           
+
             if(res.result.cplb == null){
               res.result.cplb = undefined
             }
@@ -380,7 +384,7 @@ import { message } from 'ant-design-vue'
             if(otaId==null || otaId == undefined){
               otaId=''
             }
-          
+
             postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)
@@ -419,7 +423,7 @@ import { message } from 'ant-design-vue'
         if(this.form.dllx1=='其他'){
           this. projectNameList2=['其他']
         }
-        
+
 
       },
       update(){

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{isTrue ? $t('certificationListMaintenance'):$t('virtualAuthenticationListDetails')}}
+          {{isTrue ? $t('certificationListMaintenance'):$t('marketCertificationListDetails')}}
         </span>
       </div>
       <div class="Virtual-detail-right">
@@ -393,7 +393,7 @@
       },
       //模板下载
       handleModule() {
-        downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {})
+        downloadFile(this.url.exportTemplate, this.$t('marketCertificationList') + this.$t('importTemplate') + '.xls', {})
       },
       //调取
       transferClick() {
@@ -411,7 +411,7 @@
           ids: selectedRowKeys.join(','),
           authDummyInventoryBaseId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.name + this.$t('certificationList') + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.name + this.$t('marketCertificationList') + '.zip', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []