From 1fbdff1be0010f8e73264db6c1e5da9878a9cd13 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 16:23:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E7=9A=84id=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 15 +++++++++++-- .../CollectionTypeDisabled/index.vue | 22 +++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 21fee26a9..b00044d8c 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/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) diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue index 8369d66cd..d37359513 100644 --- a/jero-web/src/components/CollectionTypeDisabled/index.vue +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -728,8 +728,8 @@ -
+
{ if (res.type === 'pull_more') { From 8a4833f813656157bb6c8bf011baed3081b853f9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 30 Mar 2023 16:23:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=2067654=20=E4=BC=81=E4=B8=9A=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 5 ++--- .../vehicleinformation/components/basicInformation.vue | 7 +++++-- .../vehicleinformation/components/safetyPrecautions.vue | 1 + .../vehicleinformation/components/upgradeRequirements.vue | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 54ccc17db..bf9c32c44 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/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){ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 27d90dfd9..573c06e46 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -36,10 +36,10 @@ @@ -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 diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index d57a5aa42..0a195ba8e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/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 diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 42d0199c9..621c91ba3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/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