diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 5743d2c61..c3bed400a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -85,7 +85,7 @@ {{$t('cause') + (index+1)}} - @@ -137,10 +137,8 @@ {{$t('implementationrecords')}} - + @@ -362,7 +360,7 @@ export default { width: calc(100% - 130px); display: inline-block; margin-top: 2px; - height: 40px; + min-height: 40px; margin-bottom: 24px; } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 94d70de89..07f92fd14 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -210,7 +210,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjfzbh/exportData', - importZipUrl: '/ota/otaBaSjSjfzbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjfzbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index bdbaf46d0..161896a0e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -113,7 +113,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjSjmbcl/exportData', - importZipUrl: '/ota/otaBaSjSjmbcl/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 69ba8eaba..8a9ba250d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -246,7 +246,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjxtbh/exportData', - importZipUrl: '/ota/otaBaSjSjxtbh/importData',//导入 + importZipUrl: '/ota/otaBaSjSjxtbh/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index cba9b95c1..14424544b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -167,7 +167,7 @@ export default { ], url: { exportData: '/ota/otaBaSjSjyxpg/exportData', - importZipUrl: '/ota/otaBaSjSjyxpg/importData',//导入 + importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, loading: false, disable:false, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 586cc9396..28cdc7401 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -167,7 +167,7 @@ import ImportFile from '@/components/ImportFileData/index' }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', - importZipUrl: '/ota/otaBaSjSjmbcx/importData',//导入 + importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'], projectNameList2:[], diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 3e4680d34..7b7d6f0b2 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -192,7 +192,7 @@ export default { formInline:{}, url: { exportData: '/ota/otaBaSjGgnrfs/exportData', - importZipUrl: '/ota/otaBaSjGgnrfs/importData',//导入 + importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index 24c13f9b2..76fc112de 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" > diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8f5a15039..754c0b314 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -240,7 +240,7 @@ import { message } from 'ant-design-vue' formRules:[], url: { exportData: '/ota/otaBaCxJbxx/exportData', - importZipUrl: '/ota/otaBaCxJbxx/importData',//导入 + importZipUrl: '/ota/otaBaCxJbxx/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, form:{ cxmb:undefined, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 8e9e85708..5c9c59deb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -125,7 +125,7 @@ import ImportFile from '@/components/ImportFileData/index' fileList:'', url: { exportData: '/ota/otaBaCxKsjjsmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjjsmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 277fe7021..0c2bb82ca 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -15,81 +15,81 @@
{{$t('componentname')}} - {{$t('networksecurityrequirements')}} +   {{$t('networksecurityrequirements')}} - {{$t('millimeterwaveradar')}} +   {{$t('millimeterwaveradar')}} - {{$t('ultrasonicradar')}} +   {{$t('ultrasonicradar')}} - {{$t('camera')}} +   {{$t('camera')}} - {{$t('asternimage')}} +   {{$t('asternimage')}} - {{$t('Monocularbinocularmultiocular')}} +   {{$t('Monocularbinocularmultiocular')}} - {{$t('driverattentionmonitoringsystem')}} +   {{$t('driverattentionmonitoringsystem')}} - {{$t('driversurveillancecamera')}} +   {{$t('driversurveillancecamera')}} - {{$t('drivermonitoringinfraredsensor')}} +   {{$t('drivermonitoringinfraredsensor')}} - {{$t('positioningandnavigationsystem')}} +   {{$t('positioningandnavigationsystem')}} - {{$t('vehiclesatellitepositioningequipment')}} +   {{$t('vehiclesatellitepositioningequipment')}} - {{$t('inertialnavigationsystem')}} +   {{$t('inertialnavigationsystem')}} - {{$t('wheelspeedmeter')}} +   {{$t('wheelspeedmeter')}} - {{$t('highprecisionmap')}} +   {{$t('highprecisionmap')}} - {{$t('electronicfence')}} +   {{$t('electronicfence')}} - {{$t('vehiclecommunicationsystem')}} +   {{$t('vehiclecommunicationsystem')}} - {{$t('signalingdevices')}} +   {{$t('signalingdevices')}} - {{$t('driverassistancefunctioncontrols')}} +   {{$t('driverassistancefunctioncontrols')}} - {{$t('drivingassistancefunctionindicatorsignaldevice')}} +   {{$t('drivingassistancefunctionindicatorsignaldevice')}} - {{$t('steerinwheelreleaseindicatorsignaldevice')}} +   {{$t('steerinwheelreleaseindicatorsignaldevice')}} - {{$t('driverattentionindicatorsignaldevice')}} +   {{$t('driverattentionindicatorsignaldevice')}} - {{$t('automaticDrivingDataRecordingSystem')}} +   {{$t('automaticDrivingDataRecordingSystem')}} - {{$t('eventdatarecordingsystem')}} +   {{$t('eventdatarecordingsystem')}}
@@ -212,7 +212,7 @@
{{$t('ParameterName')}} - {{item.ParameterName}} +   {{item.ParameterName}}
@@ -295,7 +295,7 @@ export default { radioList:9, url: { exportData: '/ota/otaBaCxJsfzbacs/exportData', - importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入 + importZipUrl: '/ota/otaBaCxJsfzbacs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index a4de6370e..398a0da8a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -63,7 +63,7 @@ import ImportFile from '@/components/ImportFileData/index' return { url: { exportData: '/ota/otaBaCxAqcs/exportData', - importZipUrl: '/ota/otaBaCxAqcs/importData',//导入 + importZipUrl: '/ota/otaBaCxAqcs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 5e3e7c5a2..7485d89bd 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -46,7 +46,7 @@ export default { return { url: { exportData: '/ota/otaBaCxZxsjyq/exportData', - importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入 + importZipUrl: '/ota/otaBaCxZxsjyq/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, dataSource: [ { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 5121c9a8e..09b03809d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -120,7 +120,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' return { url: { exportData: '/ota/otaBaCxKsjxtmccs/exportData', - importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入 + importZipUrl: '/ota/otaBaCxKsjxtmccs/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, fileList:'', dataSource: [ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index c91ca4f3b..503940a48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -53,7 +53,7 @@ class="table" :columns="columnshistory" :pagination="false" - :scroll="{x: '100%', y: 400}" + :scroll="{x: '100%', y: 'calc(100vh - 330px)'}" :data-source="dataSourcehistory" :loading="loading" >