From dcddac36a909fc4f9bb377d58edef9f93168177e Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Wed, 29 Mar 2023 11:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otamanagement/upgradeactivity/index.vue    |  5 +++--
 .../components/auxiliaryupgradehavechanged.vue | 18 ++++++++++++++----
 .../components/upgradehavechanged.vue          | 12 ++++++++++--
 .../components/usernotification.vue            | 10 ++++++++--
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index 6018ef0da..9fcf1bc8a 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -201,7 +201,8 @@ export default {
       //url传参严格按照当前命名
       url: {
         list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
-        deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch'
+        deleteBatch: '/ota/otaBaSjList/delete'
+      
       },
       visible: false,
       loading: false,
@@ -388,7 +389,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+          deleteAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index 7ba9967a4..68c4443a4 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -32,7 +32,7 @@
           <a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
       </span>
       <span slot="afterupgrade" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
       </span>
       <span slot="functionalchangedescription" slot-scope="text,record">
         <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
@@ -87,7 +87,9 @@ export default {
     return {
       dataSource: [
         {
-
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
         }
       ],
       fileList:'',
@@ -219,7 +221,11 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }] : res.result.list
           this.fileList = res.result.fj
         })
     },
@@ -276,7 +282,11 @@ export default {
       this.$emit('beupgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及',
+          sjsjkzq:'ADC ADAS主控制器'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 7359cc864..c18dd9d0d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -90,6 +90,8 @@ export default {
     return {
       dataSource: [
         {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
         }
       ],
       loading: false,
@@ -285,7 +287,10 @@ export default {
           otaId=''
         }
         getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
-          this.dataSource =res.result.list == null ?  [{}] : res.result.list
+          this.dataSource =res.result.list == null ?  [ {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }] : res.result.list
         })
     },
     save(){
@@ -317,7 +322,10 @@ export default {
       this.$emit('upgradedonlinedown')
     },
     addlineAtBot(){
-      let obj={}
+      let obj= {
+          sjqbgcs:'不涉及',
+          sjhbgcs:'不涉及'
+        }
         this.dataSource.push(obj)
       },
       deleteData(record){
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index d4f042877..10413d2a0 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -203,7 +203,10 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{},
+      formInline:{
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      },
       url: {
         exportData: '/ota/otaBaSjGgnrfs/exportData',
         importZipUrl: '/ota/otaBaSjGgnrfs/importData?otaId=' + localStorage.getItem('otaId'),//导入
@@ -255,7 +258,10 @@ export default {
         getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           if(res.code == 200){
           
-            this.formInline= res.result ==null ? {} :res.result 
+            this.formInline= res.result ==null ? {
+        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        sjbkygn:'除解闭锁均不可用'
+      } :res.result 
             this.formInline.id=res.result.id
             this.$forceUpdate()
           }