From a7ee02e97aee5a5335ed4093f70e42b4a8622e23 Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Sat, 25 Mar 2023 16:22:31 +0800
Subject: [PATCH] =?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/basicInformation.vue           | 40 ++++++++++------
 .../components/beupgradedonline.vue           | 12 ++---
 .../vehicleinformation/components/other.vue   |  9 ++--
 .../components/recordparameters.vue           | 10 ++--
 .../components/safetyPrecautions.vue          | 19 +++++---
 .../components/upgradeRequirements.vue        | 25 ++++++----
 .../components/upgradedonline.vue             | 12 ++---
 .../vehicleinformation/index.vue              | 46 +++++++++----------
 .../vehicleregistration/index.vue             |  1 +
 jero-web/vue.config.js                        |  2 +-
 10 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index 07eb0ce76..f5281255b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -226,7 +226,7 @@
     name: 'basicInformation',
     components:{
     },
-    props:['otaId'],
+    // props:['otaId'],
     data() {
       return {
         confirmLoading: false,
@@ -261,30 +261,42 @@
          })
       },
       getData(){
-        // if(this.otaId && this.otaId !=''){
-          console.log('otaId',this.otaId);
-          getAction('/ota/otaBaCxJbxx/queryByOtaId',this.otaId).then(res=>{
+       
+        if(localStorage.getItem('otaId') == null){
+           return 
+        }else{
+          getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
          if(res.code == 200){
-          
+            this.form=res.result
+            if(res.result.dllx1 == null ){
+              res.result.dllx1 = undefined
+            }
+            if(res.result.dllx2 == null){
+              res.result.dllx2 = undefined
+            }
+            this.changeSelect()
          }
         })
-        // }
     
+        }
+         
       },
       next(){
-        this.save()
-        this.$emit('basicInformationForm',this.otaId)
+         this.save()
+         setTimeout(()=>{
+          this.$emit('basicInformationForm')
+         },300)
+        
       },
-      save(){
-         
-         postAction('/ota/otaBaCxJbxx/add',{otaId:this.otaId,...this.form}).then( res => {
-          if(res.code == 200){
-            this.otaId = res.result.otaId
+      async save(){
+           postAction('/ota/otaBaCxJbxx/add',{otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
+           if(res.code == 200){
+            localStorage.setItem('otaId', res.result.otaId)
           }
         })
       },
       changeSelect(target){
-        this.form.Vehicledynamictype2=undefined
+        this.form.dllx2=undefined
         if(target =='传统动力汽车'){
           this. projectNameList2=['汽油','柴油']
         }else if (target =='节能汽车'){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index 7bf389f5b..c5e684fe1 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -111,7 +111,6 @@
     components:{
       uploadFile
     },
-    props:['otaId'],
     data() {
       return {
         dataSource: [
@@ -311,25 +310,22 @@
         })
       },
       getData(){
-        if(this.otaId && this.otaId !=''){
-          getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',this.otaId).then(res=>{
+          getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
           console.log(res);
         })
-        }
-      
       },
       save(){
-        postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:this.otaId,list:this.dataSource}).then(res =>{
+        postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res =>{
           console.log(res);
         })
       },
       last(){
         this.save()
-        this.$emit('beupgradedonlineup',this.otaId)
+        this.$emit('beupgradedonlineup')
       },
       next(){
         this.save()
-        this.$emit('beupgradedonlinedown',this.otaId)
+        this.$emit('beupgradedonlinedown')
       },
       uploadSuccess(data) {
         let attIdList = []
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
index 144fc1b33..cb53b8e76 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
@@ -51,8 +51,7 @@ export default {
   },
   methods: {
     getData(){
-      if(this.otaId && this.otaId !=''){
-        getAction('/ota/otaBaCxQt/queryByOtaId',this.otaId).then(res=>{
+        getAction('/ota/otaBaCxQt/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
           console.log(res);
         })
       }
@@ -61,7 +60,7 @@ export default {
     save(){
       this.$refs.ruleForm.validate( valid =>{
         if (valid) {
-          postAction('/ota/otaBaCxQt/add',{otaId:this.otaId,...this.queryParam}).then(res=>{
+          postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
             console.log(res);
           })
         } else {
@@ -71,13 +70,13 @@ export default {
     },
     last(){
       this.save()
-      this.$emit('otherup',this.queryParam)
+      this.$emit('otherup')
     },
     submit(){
      this.save()
     },
   }
-}
+
 </script>
 
 <style lang="less" scoped>
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 623f865bd..c98afcd54 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -858,11 +858,9 @@ export default {
   },
   methods: {
     getData(){
-      if(this.otaId && this.otaId !=''){
-        getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',this.otaId).then(res=>{
+        getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
           console.log(res);
         })
-      }
         
       },
     click(value){
@@ -917,7 +915,7 @@ export default {
         arr.push(kval)
       })
       postAction('/ota/otaBaCxJsfzbacs/add',{
-        otaId:this.otaId,
+        otaId:localStorage.getItem('otaId'),
         bj:this.query,
         cs:arr,
         kzq:this.dataSourceList
@@ -928,11 +926,11 @@ export default {
     },
     last(){
       this.save()
-      this.$emit('recordparametersup',this.otaId)
+      this.$emit('recordparametersup')
     },
     next(){
       this.save()
-      this.$emit('recordparametersdown',this.otaId)
+      this.$emit('recordparametersdown')
     },
     // 合并单元格
     mergeCellsSlot(record, rowIndex) {
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index dee27a3fe..a4704fd62 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -167,11 +167,14 @@
     },
     methods: {
       getData(){
-        if(this.otaId && this.otaId !=''){
-          getAction('/ota/otaBaCxAqcs/queryByOtaId',this.otaId).then(res=>{
-          console.log(res);
+          getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
+         if(res.code == 200){
+         this.dataSource[0].info =res.result.bhjz
+        this.dataSource[1].info =res.result.fsxjz
+        this.dataSource[2].info= res.result.sjsbcs
+        this.dataSource[3].info=res.result.xxaqjz
+         }
         })
-        }
       
       },
       click(value){
@@ -225,7 +228,7 @@
       },
       save(){
         let obj={}
-        obj.otaId=this.otaId,
+        obj.otaId=localStorage.getItem('otaId'),
         obj.bhjz = this.dataSource[0].info
         obj.fsxjz= this.dataSource[1].info
         obj.sjsbcs = this.dataSource[2].info
@@ -235,10 +238,12 @@
         })
       },
       last(){
-        this.$emit('safetyPrecautionsup',this.otaId)
+        this.save()
+        this.$emit('safetyPrecautionsup')
       },
       next(){
-        this.$emit('safetyPrecautionsdown',this.otaId)
+        this.save()
+        this.$emit('safetyPrecautionsdown')
       },
     }
   }
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index be22f30a1..2d44134ab 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -41,7 +41,6 @@ export default {
   components: {
     uploadFile
   },
-  props:['otaId'],
   data() {
     return {
       dataSource: [
@@ -200,11 +199,20 @@ export default {
   methods: {
     
     getData(){
-      // if(this.otaId && this.otaId !=''){
-        getAction('/ota/otaBaCxZxsjyq/queryByOtaId',this.otaId).then(res=>{
-          console.log(res);
+      console.log(localStorage.getItem('otaId'));
+        getAction('/ota/otaBaCxZxsjyq/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
+          this.dataSource[0].relevantverification =res.result.bhsjb
+          this.dataSource[1].relevantverification=res.result.bhclbb
+          this.dataSource[2].relevantverification=res.result.clgxnl
+          this.dataSource[3].relevantverification=res.result.clsjtj
+          this.dataSource[4].relevantverification=res.result.clsjdl
+          this.dataSource[5].relevantverification=res.result.sjbhaq
+          this.dataSource[6].relevantverification=res.result.sjantj
+          this.dataSource[7].relevantverification=res.result.sjsbaq
+          this.dataSource[8].relevantverification=res.result.sjgg
+          this.dataSource[9].relevantverification=res.result.sjzt
+          this.$forceUpdate()
         })
-      // }
        
       },
     click(value) {
@@ -252,8 +260,7 @@ export default {
     },
     save() {
       let obj = {}
-      obj.otaId=this.otaId
-      console.log(this.otaId);
+      obj.otaId=localStorage.getItem('otaId')
       obj.bhsjb = this.dataSource[0].relevantverification
       obj.bhclbb = this.dataSource[1].relevantverification
       obj.clgxnl = this.dataSource[2].relevantverification
@@ -270,11 +277,11 @@ export default {
     },
     last() {
       this.save()
-      this.$emit('upgradeRequirementsup',this.otaId)
+      this.$emit('upgradeRequirementsup')
     },
     next() {
       this.save()
-      this.$emit('upgradeRequirementsdown',this.otaId)
+      this.$emit('upgradeRequirementsdown')
     }
   }
 }
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 842596e52..71ce6386a 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -82,7 +82,7 @@
     <div>
       <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
       <p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p> 
-      <p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内1</p>
+      <p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内</p>
       
     </div>
     <div class="bootom-button">
@@ -272,11 +272,9 @@
     },
     methods: {
       getData(){
-        if(this.otaId && this.otaId !=''){
-          getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',this.otaId).then(res=>{
+          getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaId:localStorage.getItem('otaId')}).then(res=>{
           console.log(res);
         })
-        }
       },
       getList() {
         // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -308,11 +306,11 @@
       },
       last(){
         this.save()
-        this.$emit('upgradedonlineup',this.otaId)
+        this.$emit('upgradedonlineup')
       },
       next(){
         this.save()
-        this.$emit('upgradedonlinedown',this.otaId)
+        this.$emit('upgradedonlinedown')
       },
       uploadSuccess(data) {
         // let attIdList = []
@@ -346,7 +344,7 @@
         this.dataSource.splice(this.dataSource.indexOf(record),1)
       },
       save(){
-        postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:this.otaId,list:this.dataSource}).then(res => {
+        postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res => {
             console.log(res);
         })
       }
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
index 65155b832..a84d411ff 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue
@@ -15,25 +15,25 @@
     </div>
     <a-tabs class="tabs" v-model="tabActive" @change="callback">
       <a-tab-pane disabled :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
-        <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef" :otaId="this.otaId"/>
+        <basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('onlineupgraderequirements')"  :tab="$t('onlineupgraderequirements')">
-        <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef" :otaId="this.otaId"/>
+        <upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('safetymeasure')"  :tab="$t('safetymeasure')">
-        <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef" :otaId="this.otaId"/>
+        <safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('upgradedonline')"  :tab="$t('upgradedonline')">
-        <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef" :otaId="this.otaId"/>
+        <upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('beupgradedonline')"  :tab="$t('beupgradedonline')">
-        <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef" :otaId="this.otaId"/>
+        <beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('recordparameters')" :tab="$t('recordparameters')">
-        <recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef" :otaId="this.otaId"/>
+        <recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('other')" :tab="$t('other')">
-        <other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef" :otaId="this.otaId"/>
+        <other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef" />
       </a-tab-pane>
       <a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
         <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
@@ -215,46 +215,46 @@ export default {
     historicalrecordClick(){
       this.tabActive = this.$t('historicalrecord')
     },
-    basicInformationForm(data){
+    basicInformationForm(){
       this.tabActive = this.$t('onlineupgraderequirements')
-      this.otaId = data
+    
     },
-    upgradeRequirementsup(data){
+    upgradeRequirementsup(){
       this.tabActive = this.$t('basicinformationofvehicletype')
-      this.otaId = data
+    
     },
     upgradeRequirementsdown(){
       this.tabActive = this.$t('safetymeasure')
     },
-    safetyPrecautionsup(data){
+    safetyPrecautionsup(){
       this.tabActive = this.$t('onlineupgraderequirements')
-      this.otaId = data
+    
     },
     safetyPrecautionsdown(){
       this.tabActive = this.$t('upgradedonline')
     },
-    upgradedonlineup(data){
+    upgradedonlineup(){
       this.tabActive = this.$t('safetymeasure')
-      this.otaId = data
+    
     },
-    upgradedonlinedown(data){
+    upgradedonlinedown(){
       this.tabActive = this.$t('beupgradedonline')
-      this.otaId = data
+    
     },
-    beupgradedonlineup(data){
+    beupgradedonlineup(){
       this.tabActive = this.$t('upgradedonline')
-      this.otaId = data
+    
     },
-    beupgradedonlinedown(data){
+    beupgradedonlinedown(){
       this.tabActive = this.$t('recordparameters')
-      this.otaId = data
+    
     },
     recordparametersup(){
       this.tabActive = this.$t('beupgradedonline')
     },
-    recordparametersdown(data){
+    recordparametersdown(){
       this.tabActive = this.$t('other')
-      this.otaId = data
+    
     },
     otherup(){
       this.tabActive = this.$t('recordparameters')
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index a7fdfc5fd..4b3933936 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -360,6 +360,7 @@ export default {
     },
     // 创建车型
     createvehicleandfunctionrecords() {
+      localStorage.removeItem('otaId')
       this.$router.push({
         path: '/vehicleinformation',
         query: {}
diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js
index 2ddbd184f..6f2ba936b 100644
--- a/jero-web/vue.config.js
+++ b/jero-web/vue.config.js
@@ -93,7 +93,7 @@ module.exports = {
          }
        }, */
       '/jero-boot': {
-        target: 'http://localhost:8080', //请求本地 jero-boot后台项目
+        target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
         // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
         // target: 'http://10.0.1.25:8080',
         // target: 'http://10.0.1.5:8080',