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

jero-web/src/components/CollectionType/index.vue

@@ -966,8 +966,19 @@
           }
         })
       },
-      generateRandom() {
-        return Math.random().toString(32)
+      generateRandom(size = 16) {
+        let urlAlphabet =
+          'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+        let id = ''
+        // A compact alternative for `for (var i = 0; i < step; i++)`.
+        let i = size
+        while (i--) {
+          // `| 0` is more compact and faster than `Math.floor()`.
+          id += urlAlphabet[(Math.random() * 64) | 0]
+        }
+        return id
+        // return Math.random().toString(32)
       },
       addconfig() {
         let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -728,8 +728,8 @@
               </a-button>
             </div>
           </div>
-            <div @click="addconfig" class='addicon'
-                 v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
+          <div @click="addconfig" class='addicon'
+               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
@@ -840,15 +840,29 @@
           }
         })
       },
-      generateRandom() {
-        return Math.random().toString(32)
+      generateRandom(size = 16) {
+
+        let urlAlphabet =
+          'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+        let id = ''
+        // A compact alternative for `for (var i = 0; i < step; i++)`.
+        let i = size
+        while (i--) {
+          // `| 0` is more compact and faster than `Math.floor()`.
+          id += urlAlphabet[(Math.random() * 64) | 0]
+        }
+        return id
+        // return Math.random().toString(32)
       },
+
       addconfig() {
         let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)
         for (let i = 0; i < paramsConfigData.length; i++) {
           if (i == paramsConfigData.length - 1) {
             let name = paramsConfigData[i]
             let generateRandom = this.generateRandom()
+            console.log(generateRandom)
             this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name]))
             this.detailDate.paramsConfigData[generateRandom].forEach(res => {
               if (res.type === 'pull_more') {

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -168,7 +168,7 @@ import ImportFile from '@/components/ImportFileData/index'
         confirmLoading: false,
         disabled: false,
         form:{
-          qymc:''
+          qymc:'安徽江淮汽车集团股份有限公司'
         },
         url: {
           exportData: '/ota/otaBaSjSjmbcx/exportData',
@@ -215,8 +215,7 @@ import ImportFile from '@/components/ImportFileData/index'
             this.form.bapc=undefined
             this.form.dllx1=undefined
             this.form.dllx2=undefined
-            // this.form.qymc='安徽江淮汽车集团股份有限公司'
-            this.form.qymc=''
+            this.form.qymc='安徽江淮汽车集团股份有限公司'
           }else{
             this.form=res.result
             if(res.result.dllx1==null){

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

@@ -36,10 +36,10 @@
                <a-form-model-item class="itemModel">
                 <a-input
                 :max-length="50"
-                :disabled="disabled"
                 class="box-input"
                 :placeholder="$t('pleaseEnter')"
                 :title='form.qymc'
+                disabled
                 v-model="form.qymc">
               </a-input>
               </a-form-model-item>
@@ -245,7 +245,7 @@ import { message } from 'ant-design-vue'
           cxmb:undefined,
           txzd:'',
           djbh:'',
-          qymc:'',
+          qymc:'安徽江淮汽车集团股份有限公司',
           cplb:undefined,
           cpsb:'',
           ggpc:'',
@@ -343,6 +343,9 @@ import { message } from 'ant-design-vue'
             if(res.result.cplb == null){
               res.result.cplb = undefined
             }
+           if(res.result.qymc == null){
+             res.result.qymc = '安徽江淮汽车集团股份有限公司'
+           }
            this.form.dllx1=res.result.dllx1
            this.form.dllx2=res.result.dllx2
            this.form.cplb=res.result.cplb

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

@@ -207,6 +207,7 @@ import ImportFile from '@/components/ImportFileData/index'
           this.dataSource[2].info= res.result.sjsbcs
           this.dataSource[3].info= res.result.xxaqjz
            if(res.result.zmclList.length != 0){
+             this.dataSource[0].uploadName = res.result.zmclList
              this.dataSource[0].certifyingmaterials = this.$t('viewFile')
            }
            this.fileList.uploadName = res.result.zmclList

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

@@ -229,6 +229,7 @@ export default {
           this.dataSource[8].relevantverification=Number(res.result.sjgg)
           this.dataSource[9].relevantverification=Number(res.result.sjzt)
           if(res.result.zmclList.length != 0){
+            this.dataSource[0].uploadName = res.result.zmclList
             this.dataSource[0].certifyingmaterials = this.$t('viewFile')
           }
           this.fileList.uploadName = res.result.zmclList