Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -111,7 +111,7 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
+                <span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
               </div>
               <a-form-model-item class="itemModel" style="width: 38%">
                 <!-- <j-dict-select-tag class="box-input"
@@ -274,9 +274,12 @@ import ImportFile from '@/components/ImportFileData/index'
            if(res.code==200){
             this.selectListPc=[]
             res.result.forEach(item=>{
-              let obj={}
-               obj=item
-               this.selectListPc.push(obj)
+              if(item.ggpc !="" && item.ggpc !=null){
+                let obj={}
+                obj=item
+                this.selectListPc.push(obj)
+              }
+             
             })
            }
          })
@@ -395,6 +398,10 @@ import ImportFile from '@/components/ImportFileData/index'
     margin-top: 5px;
     line-height: 1.4 !important;
   }
+  .plus2{
+       word-break: break-all;
+    line-height: 1.3;
+  }
   .Required {
   color: red;
   margin-right: 3px;

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

@@ -281,7 +281,6 @@ import { message } from 'ant-design-vue'
        localStorage.removeItem('otaIdT')
        localStorage.setItem('otaIdT',value)
       
-       this.$forceUpdate()
        this.getData()
       },
       // 模板下载

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')">
-          &nbsp;&nbsp;{{$t('networksecurityrequirements')}}
+          {{$t('networksecurityrequirements')}}
         </span>
         <span class='radio-text' :title="$t('millimeterwaveradar')">
-          &nbsp;&nbsp;{{$t('millimeterwaveradar')}}
+          {{$t('millimeterwaveradar')}}
         </span>
         <span class='radio-text' :title="$t('ultrasonicradar')">
-          &nbsp;&nbsp;{{$t('ultrasonicradar')}}
+          {{$t('ultrasonicradar')}}
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('camera')">
-            &nbsp;&nbsp;{{$t('camera')}}
+            {{$t('camera')}}
           </span>
           <span class='text-text-two' :title="$t('asternimage')">
-            &nbsp;&nbsp;{{$t('asternimage')}}
+            {{$t('asternimage')}}
           </span>
           <span class='text-text-two' :title="$t('Monocularbinocularmultiocular')">
-            &nbsp;&nbsp;{{$t('Monocularbinocularmultiocular')}}
+            {{$t('Monocularbinocularmultiocular')}}
           </span>
         </span>
         <span class='text-box'>
           <span class='text-text' :title="$t('driverattentionmonitoringsystem')">
-            &nbsp;&nbsp;{{$t('driverattentionmonitoringsystem')}}
+            {{$t('driverattentionmonitoringsystem')}}
           </span>
           <span class='text-text-two' :title="$t('driversurveillancecamera')">
-            &nbsp;&nbsp;{{$t('driversurveillancecamera')}}
+            {{$t('driversurveillancecamera')}}
           </span>
           <span class='text-text-two' :title="$t('drivermonitoringinfraredsensor')">
-            &nbsp;&nbsp;{{$t('drivermonitoringinfraredsensor')}}
+            {{$t('drivermonitoringinfraredsensor')}}
           </span>
         </span>
         <span class='text-box-two' >
-          <span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
-            &nbsp;&nbsp;{{$t('positioningandnavigationsystem')}}
+          <span class='text-text' style='height: 450px;line-height: 20px' :title="$t('positioningandnavigationsystem')">
+            {{$t('positioningandnavigationsystem')}}
           </span>
-          <span style="padding: 5px" class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
-            &nbsp;&nbsp;{{$t('vehiclesatellitepositioningequipment')}}
+          <span style="padding: 10px" class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
+            {{$t('vehiclesatellitepositioningequipment')}}
           </span>
           <span class='text-text-three' :title="$t('inertialnavigationsystem')">
-            &nbsp;&nbsp;{{$t('inertialnavigationsystem')}}
+            {{$t('inertialnavigationsystem')}}
           </span>
           <span class='text-text-three' :title="$t('wheelspeedmeter')">
-            &nbsp;&nbsp;{{$t('wheelspeedmeter')}}
+            {{$t('wheelspeedmeter')}}
           </span>
           <span class='text-text-three' :title="$t('highprecisionmap')">
-            &nbsp;&nbsp;{{$t('highprecisionmap')}}
+            {{$t('highprecisionmap')}}
           </span>
           <span class='text-text-five' :title="$t('electronicfence')">
-            &nbsp;&nbsp;{{$t('electronicfence')}}
+            {{$t('electronicfence')}}
           </span>
         </span>
         <span class='text-box-three' :title="$t('vehiclecommunicationsystem')">
-          &nbsp;&nbsp;{{$t('vehiclecommunicationsystem')}}
+          {{$t('vehiclecommunicationsystem')}}
         </span>
         <span class='text-box-four'>
           <span style="padding: 10px" class='four-text-text' :title="$t('signalingdevices')">
-            &nbsp;&nbsp;{{$t('signalingdevices')}}
+            {{$t('signalingdevices')}}
           </span>
           <span class='four-text' :title="$t('driverassistancefunctioncontrols')">
-            &nbsp;&nbsp;{{$t('driverassistancefunctioncontrols')}}
+            {{$t('driverassistancefunctioncontrols')}}
           </span>
           <span class='four-text' :title="$t('drivingassistancefunctionindicatorsignaldevice')">
-            &nbsp;&nbsp;{{$t('drivingassistancefunctionindicatorsignaldevice')}}
+            {{$t('drivingassistancefunctionindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('steerinwheelreleaseindicatorsignaldevice')">
-            &nbsp;&nbsp;{{$t('steerinwheelreleaseindicatorsignaldevice')}}
+            {{$t('steerinwheelreleaseindicatorsignaldevice')}}
           </span>
           <span class='four-text' :title="$t('driverattentionindicatorsignaldevice')">
-            &nbsp;&nbsp;{{$t('driverattentionindicatorsignaldevice')}}
+            {{$t('driverattentionindicatorsignaldevice')}}
           </span>
         </span>
         <span class='text-box-five' :title="$t('automaticDrivingDataRecordingSystem')">
-          &nbsp;&nbsp;{{$t('automaticDrivingDataRecordingSystem')}}
+          {{$t('automaticDrivingDataRecordingSystem')}}
         </span>
-        <span class='text-box-five' :title="$t('eventdatarecordingsystem')">
-          &nbsp;&nbsp;{{$t('eventdatarecordingsystem')}}
+        <span  class='text-box-five' :title="$t('eventdatarecordingsystem')">
+          {{$t('eventdatarecordingsystem')}}
         </span>
       </div>
       <div style='width: 300px'>
@@ -1067,6 +1067,7 @@ button{
   width: 100%;
   height: 200px;
   line-height: 200px;
+  padding: 10px;
 }
 .radio-text-two{
   display: inline-block;
@@ -1076,6 +1077,9 @@ button{
   width: 100%;
   height: 100px;
   line-height: 100px;
+  padding: 10px;
+  display: flex;
+  align-items: center;
 }
 .radio-text-three{
   display: inline-block;
@@ -1085,6 +1089,9 @@ button{
   width: 100%;
   height: 50px;
   line-height: 50px;
+  padding: 10px;
+  align-items: center;
+  display: flex;
 }
 .radio-text-four{
   display: inline-block;
@@ -1094,6 +1101,7 @@ button{
   width: 100%;
   height: 250px;
   line-height: 250px;
+  padding: 10px;
 }
 .radio-text-five{
   display: inline-block;
@@ -1103,6 +1111,7 @@ button{
   width: 100%;
   height: 150px;
   line-height: 150px;
+  padding: 10px;
 }
 .text-box{
   display: inline-block;
@@ -1131,6 +1140,7 @@ button{
   display: flex;
   justify-content: left;
   align-items: center;
+  padding: 10px;
 }
 .text-text-two{
   /*display: inline-block;*/
@@ -1144,6 +1154,7 @@ button{
   display: flex;
   justify-content: left;
   align-items: center;
+  padding: 10px;
 }
 .text-text-three{
   /*display: inline-block;*/
@@ -1156,6 +1167,7 @@ button{
   display: flex;
   justify-content: left;
   align-items: center;
+  padding: 10px;
 }
 .text-text-five{
   /*display: inline-block;*/
@@ -1168,6 +1180,7 @@ button{
   display: flex;
   justify-content: left;
   align-items: center;
+  padding: 10px;
 }
 .text-box-three{
   display: inline-block;
@@ -1177,6 +1190,7 @@ button{
   width: 100%;
   height: 250px;
   line-height: 250px;
+  padding: 10px;
 }
 .text-box-four{
   display: inline-block;
@@ -1218,7 +1232,10 @@ button{
   border-right: none;
   width: 100%;
   height: 100px;
-  line-height: 100px;
+  line-height: 20px;
+  display: flex;
+  align-items: center;
+  padding: 10px;
 }
 span{
   /* overflow: hidden; /*超出部分隐藏*/

jero-web/src/views/otamanagement/vehicleregistration/index.vue

@@ -385,7 +385,7 @@ export default {
       localStorage.removeItem('otaIdT')
       this.$router.push({
         path: '/vehicleinformation',
-        query: {}
+        query: {  type:1}
       })
     },
     viewProcessClick(row) {