WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA问题

Browse Source
This commit is contained in:
高嵩
2023-05-31 15:07:32 +08:00
parent e37b4d5dd2
commit 211e7d34ab
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+3 -3
View File
@@ -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);
jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+4 -4
View File
@@ -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 }
},
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+2 -2
View File
@@ -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>
<!-- 操作列-->