From 32cd71750169393abc52b0a6328e5a39aeb7b574 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 14:48:03 +0800 Subject: [PATCH 1/3] =?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 2/3] =?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 8cee573d994e0abc3058c1d662860ea9759e9c2c Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 27 Mar 2023 15:12:37 +0800 Subject: [PATCH 3/3] =?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;