From 4a216291ba2c1dfd01cc686b333ce0e156b0f77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 27 Mar 2023 14:22:38 +0800 Subject: [PATCH 01/11] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/beupgradedonline.vue | 10 +++++----- .../components/safetyPrecautions.vue | 12 ++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index d952d59ea..8cf9c9cf3 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -70,7 +70,7 @@ - + @@ -93,10 +93,10 @@ }}
-

注:附件包括测试项目清单、测试报告．测试标准或技术规范

-

    支持doc/docx/pdf格式,大小50M以内

+

{{ $t('note') }}

+

    {{ $t('format') }}

- +
{{$t('preservation')}} @@ -317,7 +317,7 @@ import ImportFile from '@/components/ImportFileData/index' otaIdT='' } getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ - if(res.code==200){ + if(res.code==200){ if(res.result.list.length==0){ this.dataSource=[ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 5af1ca8bd..66653b1ed 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -38,6 +38,10 @@ +
+

{{ $t('note') }}

+

    {{ $t('format') }}

+
{{$t('preservation')}} {{$t('last')}} @@ -182,10 +186,10 @@ import ImportFile from '@/components/ImportFileData/index' // this.getList() this.getData() }, - + methods: { // 模板下载 - + handleModule() { downloadFile('ota/otaBaCxAqcs/exportTemplate', '安全措施' + '.zip', {}) }, @@ -196,7 +200,7 @@ import ImportFile from '@/components/ImportFileData/index' } getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code == 200){ - + this.dataSource[0].info = res.result.bhjz this.dataSource[1].info =res.result.fsxjz // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs) @@ -211,7 +215,7 @@ import ImportFile from '@/components/ImportFileData/index' this.loading = false } }) - + }, uploadSuccess(data) { let attIdList = [] From 0e69863928fe3e98c8f7bac2653330991fe4a096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 14:31:59 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E8=BF=9B=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=9C=8B=E4=B8=8D=E8=A7=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 62 ++++++++++--------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 95cfd3f19..8053df156 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -761,14 +761,14 @@ scopedSlots: { customRender: 'verifyDeliverableTemplateName' } } ] - }, - { - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 260, - scopedSlots: { customRender: 'operation' } } + // { + // title: this.$t('operation'), + // align: 'left', + // fixed: 'right', + // width: 260, + // scopedSlots: { customRender: 'operation' } + // } ], columnsAll: [], columnsFileAll: [ @@ -1998,39 +1998,43 @@ moduleFlag: '法规清单' }).then((res) => { if (res.success) { - this.columnsAll = res.result - for (let j = 0; j < this.columnsAll.length; j++) { - for (let i = 0; i < this.column.length; i++) { - if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { - if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + if (res.result && res.result.length > 0) { + this.columnsAll = res.result + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) { + if (this.column[i].title == this.$t('confirmationOfDesignConformity')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { - if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { - if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { - for (let k = 0; k < this.columnsAll[j].children.length; k++) { - for (let l = 0; l < this.column[i].children.length; l++) { - if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { - this.columnsAll[j].children[k] = this.column[i].children[l] + } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) { + if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) { + if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) { + for (let k = 0; k < this.columnsAll[j].children.length; k++) { + for (let l = 0; l < this.column[i].children.length; l++) { + if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) { + this.columnsAll[j].children[k] = this.column[i].children[l] + } } } } } - } - } else { - if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { - this.columnsAll[j] = this.column[i] + } else { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] + } } } } + } else { + this.columnsAll = this.column } this.columnsAll.push({ title: this.$t('operation'), From e6a31897508c5bec65a64e4795ac9b4bbc0f107e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 14:45:39 +0800 Subject: [PATCH 03/11] bug67280 --- jero-web/src/components/uploadFile/file.vue | 10 +++++----- .../components/upgradeRequirements.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 601685f03..f56d53f73 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl','accept', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled', 'thisFileUploadUrl','acceptcode', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -89,13 +89,13 @@ console.log(file) this.fileTypeSatus = true //根据格式拦截 - if(this.accept){ + if(this.acceptcode){ let fileNames = file.name.split('.') let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase() - let extList = this.accept.split(',') + let extList = this.acceptcode.split(',') if (!extList.find((item) => item == fileType)) { - this.$message.error(this.$t('uploadOnly') + this.accept + this.$t('type')) - reject(false) + this.$message.error(this.$t('uploadOnly') + this.acceptcode + this.$t('type')) + return false } } if (this.isMultiple) { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index a0c80c65d..5dbb6bc44 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -34,7 +34,7 @@ {{ $t('last') }} {{ $t('next') }}
- +
From 32cd71750169393abc52b0a6328e5a39aeb7b574 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 14:48:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 16 +++++++++------- .../components/usernotification.vue | 6 ++++++ .../components/beupgradedonline.vue | 12 +++++++----- .../vehicleinformation/components/other.vue | 14 +++++++------- .../components/recordparameters.vue | 13 ++++++++----- 5 files changed, 37 insertions(+), 24 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 30c367db6..1aa0154f3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -76,6 +76,8 @@ module.exports = { numericalValue: '数值', yes: '是', not: '否', + have:'有', + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', @@ -1595,11 +1597,11 @@ module.exports = { electroniccontrollertype:'电子控制器型号', hardwareversioninformation:'硬件版本信息', initialsoftwareversionnumber:'初始软件版本号', - inflammatorydata:'初始软件包的完整性验证数据', - environmentalprotection:'升级是否影响整车安全啊、节能、环保、防盗等性能', + inflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', + environmentalprotection:'升级是否影响整车安全、节能、环保、防盗等性能', operatingsystemtype:'操作系统类型', operatingsystemmanufacturer:'操作系统生产企业', - operatingsystemversion:'操作系统版本号', + operatingsystemversion:'软件版本号', addcontroller:'添加控制器', addsystem:'添加系统', functionname:'功能名称', @@ -1635,7 +1637,7 @@ module.exports = { Taskconfirmationresult:'任务确认结果', Compliancetaskhandling:'符合性任务办理', resultofhandling:'处理结果', - networksecurityrequirements:'网络安全要求', + networksecurityrequirements:'激光雷达', upgradefunctionrequirements:'升级功能要求', usernotificationrequirement:'用户告知要求', ineffectiveupgrades:'应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级', @@ -1666,7 +1668,7 @@ module.exports = { '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' + '\n' + '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。', - upgradepacketprotectionmeasures:'升级包保护措施', + upgradepacketprotectionmeasures:'软件版本（集）识别与存储', otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施', authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)', failsafmechanism:'防失效保护机制(可多选)', @@ -1696,7 +1698,7 @@ module.exports = { vehiclecommunicationsystem:'车载通信系统', driversurveillancecamera:'驾驶员监控摄像头', drivermonitoringinfraredsensor:'驾驶员监控红外传感器', - vehiclesatellitepositioningequipment:'车载卫星定位设备', + vehiclesatellitepositioningequipment:'车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）', inertialnavigationsystem:'惯性导航系统', wheelspeedmeter:'轮速计', highprecisionmap:'高精度地图', @@ -1743,7 +1745,7 @@ module.exports = { afterthesoftwareversionupgraded:'软件版本号升级后', beforetheOSversionupgraded:'操作系统版本号升级前', aftertheoperatingsystemversionupgraded:'操作系统版本号升级后', - initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据', + initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', upgradepackageintegrityverificationdata:'升级包完整性验证数据', upgradepackagesize:'升级包大小', differentialupgradeornot:'是否差分升级', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 7b7d6f0b2..5a5717e53 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -228,10 +228,16 @@ export default { } }) }, + save(){ + + }, + next(){ + this.save() this.$emit('recordparametersdown') }, last(){ + this.save() this.$emit('recordparametersup') }, dateChange(item) { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8cf9c9cf3..1b6efda2d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -53,10 +53,10 @@ - + - + @@ -87,12 +87,14 @@ {{$t('delete')}} -
+ +
+ 证明材料: {{ (fileList === 'null' || fileList === '' || fileList == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} -
+

{{ $t('note') }}

    {{ $t('format') }}

@@ -135,7 +137,7 @@ import ImportFile from '@/components/ImportFileData/index' gnmc:'车道偏离预警(LDW)', }, { - gnmc:'百区监测(BSD)', + gnmc:'盲区监测(BSD)', }, { gnmc:'驾驶员疲劳监测(DFM)', diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index 0002405fb..fec52fa31 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -113,15 +113,15 @@ export default { } .title-text-add { - width: 114px; + width: 200px; text-align: right; display: inline-block; font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; @@ -133,9 +133,9 @@ export default { font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 17df00500..7b337e867 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -95,7 +95,7 @@
{{$t('fillincontent')}} - + {{ $t('yes') }} {{ $t('not') }} @@ -239,8 +239,8 @@ - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('have') }} + {{ $t('nothing') }} @@ -263,7 +263,7 @@ - {{$t('addcontroller')}} + {{$t('addcontroller')}} {{$t('delete')}} @@ -977,11 +977,14 @@ export default { return obj; }, addlineAtBot(){ - let obj={bjmc:'车端OTA升级功能模块'} + let obj={} + obj.bjmc='车端OTA升级功能模块' this.dataSourceList.push(obj) + this.$forceUpdate() }, deleteData(record){ this.dataSourceList.splice(this.dataSourceList.indexOf(record),1) + this.$forceUpdate() }, } } From 79ffc2ba35d08f8ba72b99663cd16b6e4ae40c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:02:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E-=E9=99=84=E4=BB=B6=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/uploadFileChange/file.vue | 335 +++++++++--------- .../parameterlist/components/addModel.vue | 2 +- 2 files changed, 173 insertions(+), 164 deletions(-) diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index a27e816c9..f12def90c 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -9,7 +9,7 @@ name="file" :file-list="myfileList" :multiple="true" - :action="uploadAction+'?state='+2+'&cut='+cut" + :action="actionUrl" :headers="headers" @preview="preview" :before-upload="beforeUpload" @@ -26,127 +26,118 @@ \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 922689d45..250e8cca1 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -317,7 +317,7 @@ {{$t('submit')}}
- +
From 4d950e242e6aaba67cb1f4dd95775b1f063df69c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 15:11:54 +0800 Subject: [PATCH 06/11] bug67205 --- jero-web/src/components/uploadFileOta/file.vue | 12 +++++++++++- .../components/beupgradedonline.vue | 8 ++++---- .../components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradedonline.vue | 4 ++-- .../otamanagement/vehicleregistration/index.vue | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index 510dc1a4c..d61721059 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -88,6 +88,16 @@ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); console.log(file) this.fileTypeSatus = true + //根据格式拦截 + if(this.acceptcode){ + let fileNames = file.name.split('.') + let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase() + let extList = this.acceptcode.split(',') + if (!extList.find((item) => item == fileType)) { + this.$message.error(this.$t('uploadOnly') + this.acceptcode + this.$t('type')) + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded')) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8cf9c9cf3..6d1537b41 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -50,13 +50,13 @@ - + - + - + @@ -103,7 +103,7 @@ {{$t('last')}} {{$t('next')}}
- +
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 66653b1ed..2690dc4a0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -47,7 +47,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 9d3871bec..5f4f216e0 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -32,7 +32,7 @@ - + @@ -99,7 +99,7 @@ {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index dd41cd958..84613bcec 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -104,7 +104,7 @@ {{ $t('datamaintenance') }}
- +
From 8cee573d994e0abc3058c1d662860ea9759e9c2c Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 15:12:37 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradetargetmodel.vue | 13 +++++++---- .../components/recordparameters.vue | 22 +++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 28cdc7401..c77924cae 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -10,6 +10,7 @@ {{$t('templateDownload')}}
+ @@ -58,7 +59,7 @@
-
+
{{$t('Modelandfunctionrecord')}}
@@ -288,9 +289,9 @@ import ImportFile from '@/components/ImportFileData/index' font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; @@ -336,4 +337,8 @@ import ImportFile from '@/components/ImportFileData/index' .bootom-button{ text-align: center!important; } + .plus{ + margin-top: 5px; + line-height: 1.4 !important; + } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 7b337e867..f72635bab 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -1145,7 +1145,7 @@ button{ line-height: 50px; } .text-box-three{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1153,7 +1153,7 @@ button{ line-height: 250px; } .text-box-four{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1161,15 +1161,18 @@ button{ line-height: 600px; } .four-text-text{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 50%; height: 600px; - line-height: 600px; + line-height: 20px; + display: flex; + justify-content: center; + align-items: center; } .four-text{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 50%; @@ -1177,7 +1180,7 @@ button{ line-height: 150px; } .text-box-five{ - isplay: inline-block; + display: inline-block; float: left; border: #e8e8e8 solid 1px; width: 100%; @@ -1185,9 +1188,10 @@ button{ line-height: 100px; } span{ - overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + /* overflow: hidden; /*超出部分隐藏*/ + /* text-overflow: ellipsis; 超出部分省略号表示 */ + white-space: wrap; + /* word-wrap: normal; */ } .item-input{ margin-top: 9px; From fb45ce36c6a8d74a881d2001267b348884bb6570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:32:12 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=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 | 1 + jero-web/src/common/lang/zh-cn.js | 3 ++- .../projectManagement/components/listOfRegulations.vue | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b64ce7989..4731695af 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1719,4 +1719,5 @@ module.exports = { note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification', format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", + theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', } \ 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 1aa0154f3..3b05b3e70 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -77,7 +77,7 @@ module.exports = { yes: '是', not: '否', have:'有', - + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', @@ -1821,4 +1821,5 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", + theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8053df156..ac361119e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1528,7 +1528,7 @@ _this.selectedRowKeys = [] _this.getList() if (detailedWarningList && detailedWarningList.length > 0) { - this.promptInformation(detailedWarningList) + _this.promptInformation(detailedWarningList) } } else { _this.$message.warning(_this.$t('operationFailed')) @@ -2389,9 +2389,11 @@ _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } + } if (this.requestsNum == 0) { - _this.promptInformation(_this.detailedWarningList) + this.$message.warning(_this.$t('theDataYouInitiate')) + // _this.promptInformation(_this.detailedWarningList) this.JTextLoading = false } }, From 2c87e4a12b7e392a5db22a4b0b74e8b7fe373fe4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 15:32:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 8 +++--- .../auxiliaryupgradehavechanged.vue | 26 ++----------------- .../thetargetvehicleofthisupgrade.vue | 1 + .../components/upgradehavechanged.vue | 2 +- .../components/upgradeimpactassessment.vue | 17 ++++++++---- .../components/usernotification.vue | 5 +++- 6 files changed, 24 insertions(+), 35 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 1aa0154f3..93b2e98a9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1618,7 +1618,7 @@ module.exports = { thetargetvehicleofthisupgrade:'本次升级的目标车辆', upgradeimpactassessment:'升级影响评估', upgradehavechanged:'本次升级的系统名称与参数变化', - auxiliaryupgradehavechanged:'本次升级的架势辅助功能名称与参数变化', + auxiliaryupgradehavechanged:'本次升级的驾驶辅助功能名称与参数变化', usernotification:'用户告知内容及方式', informationaboutotherupgradetasks:'其他升级任务信息', totalquantity:'总数量（辆）', @@ -1735,7 +1735,7 @@ module.exports = { upgradeactivitiesaffectvehiclesafety:'升级活动是否影响车辆安全', upgradeactivityprovidesuserconfirmationoptions:'升级活动是否提供用户确认选项', upgradepackagetest:'升级包测试(可多选)', - reliabilityofonlineupgradeactivities:'是杏已验证确认在线升级活动的安全性和可靠性', + reliabilityofonlineupgradeactivities:'是否已验证确认在线升级活动的安全性和可靠性', adjustmentofchangedBulletinparameters:'已变更《公告》参数的对应调整（如有）', preupgrade:'升级前', afterupgrade:'升级后', @@ -1746,8 +1746,8 @@ module.exports = { beforetheOSversionupgraded:'操作系统版本号升级前', aftertheoperatingsystemversionupgraded:'操作系统版本号升级后', initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', - upgradepackageintegrityverificationdata:'升级包完整性验证数据', - upgradepackagesize:'升级包大小', + upgradepackageintegrityverificationdata:'升级包完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）', + upgradepackagesize:'升级包大小（MB）', differentialupgradeornot:'是否差分升级', upgradedestinationype:'升级目的类型', functionalchangedescription:'功能变更描述', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 22bcac59c..04e659072 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -43,18 +43,13 @@ - - - - - - + {{$t('add')}} - {{$t('delete')}} + {{$t('delete')}}
@@ -155,23 +150,6 @@ export default { width: 170, scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, }, - { - title: this.$t('functiondescription'), - align: 'left', - dataIndex: 'functiondescription', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'functiondescription' }, - }, - { - title: this.$t('applicationconditions'), - align: 'left', - dataIndex: 'applicationconditions', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'applicationconditions' }, - }, - { title: this.$t('operation'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 161896a0e..379e1167e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -79,6 +79,7 @@ formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

支持cxv格式，大下20M以内，数量1-10个

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4193f643a..cd4a3a125 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -63,7 +63,7 @@ {{$t('addcontroller')}} - {{$t('delete')}} + {{$t('delete')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 14424544b..6905c3bfe 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -478,8 +478,12 @@ this.$forceUpdate() border-bottom: none; vertical-align: top; overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + // text-overflow: ellipsis; /*超出部分省略号表示*/ + white-space: wrap; + display: flex; + // justify-content: center; + align-items: center; + line-height: 1.3; } //::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{ // min-width: 723px !important; @@ -511,14 +515,17 @@ this.$forceUpdate() display: inline-block; width: 100%; height: 50px; - line-height: 50px; + line-height: 1.3; border: black solid 1px; vertical-align: top; border-right: none; border-bottom: none; overflow: hidden; /*超出部分隐藏*/ - text-overflow: ellipsis; /*超出部分省略号表示*/ - white-space: nowrap; + // text-overflow: ellipsis; /*超出部分省略号表示*/ + white-space: wrap; + display: flex; + // justify-content: center; + align-items: center; } .sider-span{ display: inline-block; diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 5a5717e53..58ccc5d5f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -260,7 +260,10 @@ export default { display: flex; } - +h1{ + font-weight: 700; + font-style: 20px; +} .title-text-add { width: 440px; text-align: right; From 276fb7dd704e806a5fed5938dc0f131163c98fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 15:55:31 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=B8=8D=E7=AC=A6=E5=90=88=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA;=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88-=E4=B8=8D=E5=A1=AB=E5=86=99=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/certificationList/index.vue | 62 +++++++++++++------ .../components/listOfRegulations.vue | 21 ++++--- 4 files changed, 57 insertions(+), 28 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4731695af..73cd82371 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1720,4 +1720,5 @@ module.exports = { format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', + dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', } \ 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 a6a83d627..9369a1133 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1822,4 +1822,5 @@ module.exports = { format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', + dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 21166c48f..cf788bfe9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -402,6 +402,7 @@ + {{ $t('Submitting') }} @@ -514,6 +515,7 @@ pageNo: 1, pageSize: 50, total: 0, + JTextLoading: false, CertificationColor: { 'Test passed': 'accordColor', 'Test failed': 'nonConformityColor', @@ -973,25 +975,49 @@ processResetClick() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$confirm({ - content: _this.$t('confirmResetProcess'), - onOk() { - let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectCertificationInventoryEO/resetFlow', { - ids: idList.join(','), - projectLibraryId: _this.$route.query.id, - operatorType: 'certificationInventoryStudioReset' - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(res.message) - } - }) + let ids = [] + let notConditions = [] + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'List to be released') { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } else { + ids.push(this.selectedRowKeysList[i].id) } - }) + } + let data = '' + if (notConditions && notConditions.length > 0) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('dataWithProcessReleasedCannotBeReset') + } + if (ids && ids.length > 0) { + this.$confirm({ + content: _this.$t('confirmResetProcess'), + onOk() { + _this.JTextLoading = true + let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectCertificationInventoryEO/resetFlow', { + ids: idList.join(','), + projectLibraryId: _this.$route.query.id, + operatorType: 'certificationInventoryStudioReset' + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + _this.JTextLoading = false + } else { + _this.$message.warning(res.message) + _this.JTextLoading = false + } + }) + } + }) + } else { + this.failedMessage(data) + this.JTextLoading = false + } } else { this.$message.warning(this.$t('selectLeastOne')) } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ac361119e..7ab49a743 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1689,19 +1689,20 @@ for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - content.push(this.dataSource[i]) + // content.push(this.dataSource[i]) + isTrue = true } } } - for (let i = 0; i < content.length; i++) { - if (content[i].designFlowStatus == 'List to be released' && - content[i].verifyFlowStatus == 'List to be released') { - isTrue = false - - } else { - isTrue = true - } - } + // for (let i = 0; i < content.length; i++) { + // if (content[i].designFlowStatus == 'List to be released' && + // content[i].verifyFlowStatus == 'List to be released') { + // isTrue = false + // + // } else { + // isTrue = true + // } + // } if (isTrue) { this.changeInterface(selectedRowKeys) } From 0e829b33040d11044d99909c553c9c23949b1d28 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 27 Mar 2023 16:05:27 +0800 Subject: [PATCH 11/11] bug 67300 bug 67307 bug 67303 --- .../components/maintenance.vue | 17 +++++++++--- .../otamanagement/upgradeactivity/index.vue | 4 +-- .../auxiliaryupgradehavechanged.vue | 2 +- .../thetargetvehicleofthisupgrade.vue | 2 +- .../components/upgradehavechanged.vue | 2 +- .../components/upgradeimpactassessment.vue | 2 +- .../components/upgradetargetmodel.vue | 2 +- .../components/usernotification.vue | 2 +- .../components/maintenance.vue | 26 +++++++++++++++---- .../vehicleregistration/index.vue | 6 ++--- 10 files changed, 45 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 75237d8fc..0993686b4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -41,7 +41,7 @@ :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.batjsj" :disabled="false" - style="width: 100%"/> + style="width: 90%"/>
@@ -52,9 +52,10 @@ {{$t('remarks')}}
- +
@@ -95,6 +96,9 @@ export default { trigger: 'change' } ], + bz: [ + { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } + ] // listConfirmation: [ // { // required: true, @@ -154,6 +158,11 @@ export default { edit(row) { if(row instanceof Array){ this.ids = row.join(',') + this.formInline = { + bazt:undefined, + batjsj:'', + bz:'', + } }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj @@ -189,7 +198,7 @@ export default { }, handleCancel() { this.formInline = { - bazt:'', + bazt:undefined, batjsj:'', bz:'',} this.ids = '' @@ -274,7 +283,7 @@ export default { .box-input { display: inline-block; height: 38px; - width: 100%; + width: 90%; } .itemModel { diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 7ac514e96..42ea1fcf1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -111,7 +111,7 @@
+ :accept="'.zip'" @getList="getList"/>
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 161896a0e..23fd852bf 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4193f643a..d9357c17f 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 14424544b..2f91e3e28 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index c77924cae..bee003e7b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 5a5717e53..a226d99b5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -3,7 +3,7 @@
- +
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue index 98267cd05..ddba93e87 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue @@ -20,6 +20,7 @@
@@ -40,7 +41,7 @@ format="YYYY-MM-DD" :getCalendarContainer="(trigger) => trigger.parentNode" v-model="formInline.batjsj" - style="width: 100%"/> + style="width: 90%"/>
@@ -51,9 +52,10 @@ {{$t('remarks')}}
- +
@@ -75,7 +77,7 @@ export default { visible: false, confirmLoading: false, formInline: { - bazt:'', + bazt:undefined, batjsj:'', bz:'', }, @@ -94,6 +96,9 @@ export default { trigger: 'change' } ], + bz: [ + { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } + ] // designDeadline: [ // { // required: true, @@ -139,6 +144,11 @@ export default { edit(row) { if(row instanceof Array){ this.ids = row.join(',') + this.formInline = { + bazt:undefined, + batjsj:'', + bz:'', + } }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj @@ -172,9 +182,15 @@ export default { } }) }, + selectchange(value){ + this.$nextTick(() => { + this.formInline = { ...this.formInline } + this.$refs.ruleForm.validateField('bazt') + }) + }, handleCancel() { this.formInline = { - bazt:'', + bazt:undefined, batjsj:'', bz:'',} this.ids = '' @@ -259,7 +275,7 @@ export default { .box-input { display: inline-block; height: 38px; - width: 100%; + width: 90%; } .itemModel { diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 84613bcec..9ddc8ef68 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -6,10 +6,10 @@
-
- {{ $t('upgraderegistrationnumber') }} +
+ {{ $t('registrationnumber') }}
-