From 211e7d34abec523ce8e60980e7dc5f02c176ff4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 31 May 2023 15:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java        | 6 +++---
 .../otamanagement/upgradeactivity/components/gnxtwh.vue   | 8 ++++----
 .../components/upgradehavechanged.vue                     | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index 22cdf4d23..e583dc9c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -213,8 +213,8 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
     private OtaBaSjSjmbcl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception {
         OtaBaSjSjmbcl mbcl = new OtaBaSjSjmbcl();
         OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, "");
-        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpxh())) {
-            String cx = mbcx.getCpxh();
+        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpmc())) {
+            String mc = mbcx.getCpmc();
             Workbook wb = ImportFileUtil.readExcel(upFile);
             Sheet s = wb.getSheetAt(0);
 
@@ -227,7 +227,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
                 vinObj.setVin(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(1);
                 vinObj.setCx(ImportFileUtil.getCellValue(cell, wb));
-                if (!cx.equals(vinObj.getCx())) {
+                if (!mc.equals(vinObj.getCx())) {
                     continue;
                 }
                 cell = row.getCell(2);
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index c7c034892..09031d2a8 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -241,10 +241,10 @@ export default {
       })
     },
     addClick(index){
-      if(this.formInline.dataList.length + 1 > 10){
-        this.$message.warning(this.$t('nomorethan'))
-        return
-      }
+      // if(this.formInline.dataList.length + 1 > 10){
+      //   this.$message.warning(this.$t('nomorethan'))
+      //   return
+      // }
       this.formInline.dataList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 8583fb4b0..397cbf543 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -60,8 +60,8 @@
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
 <!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
           <a-radio-group v-model="record.sfcfsj">
-            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            <a-radio :value="'1'"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="'2'"> {{ $t('not') }} </a-radio>
           </a-radio-group>
       </span>
       <!--      操作列-->