From 2d31a061dff58af868acd6e6639789aa9f1c6bea Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Sat, 25 Mar 2023 19:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/basicInformation.vue                   | 11 ++++++-----
 .../components/safetyPrecautions.vue                  |  2 +-
 .../views/otamanagement/vehicleregistration/index.vue |  9 ++++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index d8798f0aa..5351e4d84 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -271,13 +271,15 @@
       },
       getData(){
         let otaIdT=localStorage.getItem('otaIdT')
+       console.log('!!!',otaIdT);
         if(otaIdT==null){
           otaIdT=''
         }
-        if(localStorage.getItem('otaId') == null){
-           return 
-        }else{
-          getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+          getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
          if(res.code == 200){
             this.form=res.result
             if(res.result.dllx1 == null ){
@@ -290,7 +292,6 @@
          }
         })
     
-        }
          
       },
       next(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 5a29207a6..d1962af2b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -222,7 +222,7 @@ import ImportFile from '@/components/ImportFileData/index'
           pageSize: this.pageSize,
           ...queryParam
         }
-        this.loading = true
+        // this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index 5bb053bb7..309ac2b59 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -363,13 +363,16 @@ export default {
         if ( this.selectedRowKeys.length > 1){
         this.$message.warning(this.$t('OnlyOneSelected'))
       }else{
-        localStorage.removeItem('otaIdt')
+        localStorage.removeItem('otaIdT')
         localStorage.removeItem('otaId')
-        localStorage.setItem('otaIdt',this.selectedRowKeys[0])
-        this.$router.push({
+        localStorage.setItem('otaIdT',this.selectedRowKeys[0])
+        if(localStorage.getItem('otaIdT')!=null){
+          this.$router.push({
         path: '/vehicleinformation',
         query: {}
       })
+        }
+        
       } 
       }