修改bug67226

数据导入传参otaId

jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue

@@ -85,7 +85,7 @@
                       <span class="title-text-text" :title="$t('cause') + (index+1)">{{$t('cause') + (index+1)}}</span>
                     </div>
                     <a-form-model-item class="itemModel">
-                      <a-textarea class="box-input"
+                      <a-input class="box-input"
                                   v-model="item.cause"
                                   :placeholder="$t('PleaseEnter')+$t('cause')"/>
                     </a-form-model-item>
@@ -137,10 +137,8 @@
                   <span class="title-text-text" :title="$t('implementationrecords')">{{$t('implementationrecords')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="implementationrecords">
-                  <a-textarea
-                    :placeholder="$t('PleaseEnter')+$t('implementationrecords')"
-                    :disabled="disabled"
-                    v-model="formInline.implementationrecords"/>
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('implementationrecords')"
+                              :rows="2" v-model="formInline.remarks"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -362,7 +360,7 @@ export default {
   width: calc(100% - 130px);
   display: inline-block;
   margin-top: 2px;
-  height: 40px;
+  min-height: 40px;
   margin-bottom: 24px;
 }
 

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'),//导入
       },
     }
   },

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'),//导入
       },
     }
   },

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'),//导入
       },
     }
   },

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,

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:[],

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'),//导入
       },
     }
   },

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"
       >

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,

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: [
           {

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

@@ -15,81 +15,81 @@
       <div style='width: 400px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('componentname')}}</span>
         <span class='radio-text' :title="$t('networksecurityrequirements')">
-          {{$t('networksecurityrequirements')}}
+          &nbsp;&nbsp;{{$t('networksecurityrequirements')}}
         </span>
         <span class='radio-text' :title="$t('millimeterwaveradar')">
-          {{$t('millimeterwaveradar')}}
+          &nbsp;&nbsp;{{$t('millimeterwaveradar')}}
         </span>
         <span class='radio-text' :title="$t('ultrasonicradar')">
-          {{$t('ultrasonicradar')}}
+          &nbsp;&nbsp;{{$t('ultrasonicradar')}}
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('camera')">
-            {{$t('camera')}}
+            &nbsp;&nbsp;{{$t('camera')}}
           </span>
           <span class='text-text-two' :title="$t('asternimage')">
-            {{$t('asternimage')}}
+            &nbsp;&nbsp;{{$t('asternimage')}}
           </span>
           <span class='text-text-two' :title="$t('Monocularbinocularmultiocular')">
-            {{$t('Monocularbinocularmultiocular')}}
+            &nbsp;&nbsp;{{$t('Monocularbinocularmultiocular')}}
           </span>
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('driverattentionmonitoringsystem')">
-            {{$t('driverattentionmonitoringsystem')}}
+            &nbsp;&nbsp;{{$t('driverattentionmonitoringsystem')}}
           </span>
           <span class='text-text-two' :title="$t('driversurveillancecamera')">
-            {{$t('driversurveillancecamera')}}
+            &nbsp;&nbsp;{{$t('driversurveillancecamera')}}
           </span>
           <span class='text-text-two' :title="$t('drivermonitoringinfraredsensor')">
-            {{$t('drivermonitoringinfraredsensor')}}
+            &nbsp;&nbsp;{{$t('drivermonitoringinfraredsensor')}}
           </span>
         </span>
         <span class='text-box-two' >
           <span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
-            {{$t('positioningandnavigationsystem')}}
+            &nbsp;&nbsp;{{$t('positioningandnavigationsystem')}}
           </span>
           <span class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
-            {{$t('vehiclesatellitepositioningequipment')}}
+            &nbsp;&nbsp;{{$t('vehiclesatellitepositioningequipment')}}
           </span>
           <span class='text-text-three' :title="$t('inertialnavigationsystem')">
-            {{$t('inertialnavigationsystem')}}
+            &nbsp;&nbsp;{{$t('inertialnavigationsystem')}}
           </span>
           <span class='text-text-three' :title="$t('wheelspeedmeter')">
-            {{$t('wheelspeedmeter')}}
+            &nbsp;&nbsp;{{$t('wheelspeedmeter')}}
           </span>
           <span class='text-text-three' :title="$t('highprecisionmap')">
-            {{$t('highprecisionmap')}}
+            &nbsp;&nbsp;{{$t('highprecisionmap')}}
           </span>
           <span class='text-text-five' :title="$t('electronicfence')">
-            {{$t('electronicfence')}}
+            &nbsp;&nbsp;{{$t('electronicfence')}}
           </span>
         </span>
         <span class='text-box-three' :title="$t('vehiclecommunicationsystem')">
-          {{$t('vehiclecommunicationsystem')}}
+          &nbsp;&nbsp;{{$t('vehiclecommunicationsystem')}}
         </span>
         <span class='text-box-four'>
           <span class='four-text-text' :title="$t('signalingdevices')">
-            {{$t('signalingdevices')}}
+            &nbsp;&nbsp;{{$t('signalingdevices')}}
           </span>
           <span class='four-text' :title="$t('driverassistancefunctioncontrols')">
-            {{$t('driverassistancefunctioncontrols')}}
+            &nbsp;&nbsp;{{$t('driverassistancefunctioncontrols')}}
           </span>
           <span class='four-text' :title="$t('drivingassistancefunctionindicatorsignaldevice')">
-            {{$t('drivingassistancefunctionindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('drivingassistancefunctionindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('steerinwheelreleaseindicatorsignaldevice')">
-            {{$t('steerinwheelreleaseindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('steerinwheelreleaseindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('driverattentionindicatorsignaldevice')">
-            {{$t('driverattentionindicatorsignaldevice')}}
+            &nbsp;&nbsp;{{$t('driverattentionindicatorsignaldevice')}}
           </span>
         </span>
         <span class='text-box-five' :title="$t('automaticDrivingDataRecordingSystem')">
-          {{$t('automaticDrivingDataRecordingSystem')}}
+          &nbsp;&nbsp;{{$t('automaticDrivingDataRecordingSystem')}}
         </span>
         <span class='text-box-five' :title="$t('eventdatarecordingsystem')">
-          {{$t('eventdatarecordingsystem')}}
+          &nbsp;&nbsp;{{$t('eventdatarecordingsystem')}}
         </span>
       </div>
       <div style='width: 300px'>
@@ -212,7 +212,7 @@
       <div style='width: 300px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('ParameterName')}}</span>
         <span v-for='(item,index) in dataSource' class='content-text'>
-          {{item.ParameterName}}
+          &nbsp;&nbsp;{{item.ParameterName}}
         </span><br>
       </div>
       <div style='width: 700px'>
@@ -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: [
         {

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: [
           {

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: [
         {

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: [

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"
       >