diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 24788b2a5..040333ca3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -127,7 +127,11 @@ public class SysDictServiceImpl extends ServiceImpl impl @Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code+':'+#key+#cut") public String queryDictTextByKeyEn(String code, String key,String cut) { log.debug("无缓存dictText的时候调用这里！"); - return sysDictMapper.queryDictTextByKeyEn(code, key); + if (CutEnum.CN.getValue().equals(cut)) { + return sysDictMapper.queryDictTextByKey(code, key); + }else{ + return sysDictMapper.queryDictTextByKeyEn(code, key); + } } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index aabf9ba83..004f10ccd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -12,6 +12,8 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -26,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,6 +46,8 @@ import java.util.Map; public class OtaBaCxListController extends JeroController { @Autowired private IOtaBaCxListService otaBaCxListService; + @Autowired + private ISysDictService sysDictService; /** * 分页列表查询 @@ -94,7 +99,23 @@ public class OtaBaCxListController extends JeroController pageList = otaBaCxListService.page(page, queryWrapper); - return Result.OK(pageList); + for (OtaBaCxList pa : pageList.getRecords()) { + pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut"))); + } + Map resMap = new HashMap<>(); + resMap.put("list", pageList); + //有审批周期的数据 + int days = 0; + int spzqSum = 0; + List list = otaBaCxListService.list(queryWrapper); + for (OtaBaCxList cx : list) { + if (StringUtils.isNotEmpty(cx.getSpzq())) { + days++; + spzqSum += Integer.parseInt(cx.getSpzq()); + } + } + resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days)); + return Result.OK(resMap); } /** @@ -219,9 +240,10 @@ public class OtaBaCxListController extends JeroController { @Autowired private IOtaBaSjListService otaBaSjListService; + @Autowired + private ISysDictService sysDictService; /** * 分页列表查询 @@ -90,8 +96,24 @@ public class OtaBaSjListController extends JeroController pageList = otaBaSjListService.page(page, queryWrapper); - this.otaBaSjListService.disposeData(pageList.getRecords(),otaBaSjList); - return Result.OK(pageList); + for (OtaBaSjList pa : pageList.getRecords()) { + pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut"))); + } + this.otaBaSjListService.disposeData(pageList.getRecords(), otaBaSjList); + Map resMap = new HashMap<>(); + resMap.put("list", pageList); + //有审批周期的数据 + int days = 0; + int spzqSum = 0; + List list = otaBaSjListService.list(queryWrapper); + for (OtaBaSjList sj : list) { + if (StringUtils.isNotEmpty(sj.getSpzq())) { + days++; + spzqSum += Integer.parseInt(sj.getSpzq()); + } + } + resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days)); + return Result.OK(resMap); } /** @@ -215,9 +237,10 @@ public class OtaBaSjListController extends JeroController { /** * 备案维护 */ - void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut); void exportTemplate(HttpServletResponse response, HttpServletRequest request); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index ebbd83ddd..0d586026b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -66,7 +66,7 @@ public interface IOtaBaSjListService extends IService { /** * 备案维护 */ - void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut); void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 808090940..8cdc31add 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -63,17 +63,17 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (djbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } @@ -87,11 +87,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && djbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } @@ -241,26 +241,25 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl 500) { throw new JeroBootException("产品登记编号字数超过500"); } - jbxx.setDjbh(cpbh); - - row = s.getRow(4); - cell = row.getCell(1); - String ggpc = ImportFileUtil.getCellValue(cell, wb); - if (StringUtils.isNotEmpty(ggpc)) { + if (StringUtils.isNotEmpty(cpbh)) { List xxList = this.list(); for (OtaBaCxJbxx xx : xxList) { - if (ggpc.equals(xx.getGgpc())) { - throw new JeroBootException("公告批次重复"); + if (cpbh.equals(xx.getDjbh())) { + throw new JeroBootException("产品登记编号重复"); } } } - jbxx.setGgpc(ggpc); + jbxx.setDjbh(cpbh); + row = s.getRow(1); cell = row.getCell(1); jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb)); row = s.getRow(3); cell = row.getCell(1); jbxx.setCplb(ImportFileUtil.getCellValueDict(cell, wb, "product_category", sysDictService, cut)); + row = s.getRow(4); + cell = row.getCell(1); + jbxx.setGgpc(ImportFileUtil.getCellValue(cell, wb)); row = s.getRow(5); cell = row.getCell(1); jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 29b06bca5..0b3e47927 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -152,15 +153,33 @@ public class OtaBaCxListServiceImpl extends ServiceImpl> E page(E page) { + return super.page(page); + } /** * 保存 @@ -150,15 +156,33 @@ public class OtaBaSjListServiceImpl extends ServiceImpl(); - Map vrow = null; - for (int i = 0; i < vinList.size(); i++) { - vrow = new LinkedHashMap(); - vrow.put("1", vinList.get(i).getVin()); - exportData.add(vrow); - } +// LinkedHashMap map = new LinkedHashMap(); +// map.put("1", "VIN"); +// List exportData = new ArrayList(); +// Map vrow = null; +// for (int i = 0; i < vinList.size(); i++) { +// vrow = new LinkedHashMap(); +// vrow.put("1", vinList.get(i).getVin()); +// exportData.add(vrow); +// } +// String fileName = "VIN码.csv"; +// File file = CSVUtil.createCSVFile(exportData, map, uploadPath + System.currentTimeMillis(), fileName); +// String filePath = uploadPath + "/" + file.getName(); + String fileName = "VIN码.csv"; - File file = CSVUtil.createCSVFile(exportData, map, uploadPath + System.currentTimeMillis(), fileName); - String filePath = uploadPath + "/" + file.getName(); - OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "/ota", "", CutEnum.CN.getValue()); + File csvFileDir = new File(uploadPath + System.currentTimeMillis()); + csvFileDir.mkdirs(); + File csvFile = new File(csvFileDir.getAbsolutePath() + "/" + fileName); + try (BufferedWriter writer = new BufferedWriter(new FileWriter(csvFile))) { + // 写入数据 + for (VinObj data : vinList) { + String row = data.getVin(); + writer.write(row); + writer.newLine(); + } + } catch (IOException e) { + System.err.println("生成CSV文件失败：" + e.getMessage()); + } + + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(csvFile), "/ota", "", CutEnum.CN.getValue()); mbcl.setCsv(ossFile.getId()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 0f425e829..faa958233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -19,6 +19,7 @@ import com.jero.modules.ota.utils.ComparisonUtil; import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.project.util.WordUtil; import com.jero.modules.split.common.FileUnZip; +import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -193,6 +194,17 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl { + if (null == arg0.getXtmc()) { + arg0.setXtmc(""); + } + if (null == arg1.getXtmc()) { + arg1.setXtmc(""); + } + return arg0.getXtmc().compareTo(arg1.getXtmc()); + }); + } JSONObject json = new JSONObject(); json.put("list", res); return json; @@ -257,13 +269,15 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl oldYjbbList = otaBaSjSjxtbh.stream().map(OtaBaSjSjxtbh::getYjbb).distinct().collect(Collectors.toList()); List oldTempFileNameList = new ArrayList<>(); oldYjbbList.forEach(sjSjxtbh -> { - oldTempFileNameList.add(sjSjxtbh.replaceAll("见","") + ".docx"); + if (StringUtils.isNotEmpty(sjSjxtbh)) { + oldTempFileNameList.add(sjSjxtbh.replaceAll("见", "") + ".docx"); + } }); int tempFileIndex = 1; String tempFilePath = uploadPath + "tempFile" + "/" + otaId; File tempFile = new File(tempFilePath); - if(!tempFile.exists()){ + if (!tempFile.exists()) { tempFile.mkdirs(); } List tempFileNames = new ArrayList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index e36ef98e9..5a7b00d80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -389,27 +389,28 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl0){ if(!allList.contains(dutyPerson)){ - - if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineeringInterfacePerson() != null){ - String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); - relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - }else { - relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); - } - }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerLawSet() != null){ - String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); - relatedPersonnel.setEngineerLawSet(engineerLawSet); - }else { - relatedPersonnel.setEngineerLawSet(dutyPerson); - } - }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ - if(relatedPersonnel.getEngineerAttSet() !=null){ - String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); - relatedPersonnel.setEngineerAttSet(engineerAttSet); - }else { - relatedPersonnel.setEngineerAttSet(dutyPerson); + if (StringUtils.isNotEmpty(roleCode)) { + if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineeringInterfacePerson() != null){ + String engineeringInterfacePerson = dutyPerson+","+relatedPersonnel.getEngineeringInterfacePerson(); + relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); + }else { + relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); + } + }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineerLawSet() != null){ + String engineerLawSet = dutyPerson+","+relatedPersonnel.getEngineerLawSet(); + relatedPersonnel.setEngineerLawSet(engineerLawSet); + }else { + relatedPersonnel.setEngineerLawSet(dutyPerson); + } + }else if(roleCode.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + if(relatedPersonnel.getEngineerAttSet() !=null){ + String engineerAttSet = dutyPerson+","+relatedPersonnel.getEngineerAttSet(); + relatedPersonnel.setEngineerAttSet(engineerAttSet); + }else { + relatedPersonnel.setEngineerAttSet(dutyPerson); + } } } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ba40aa1e6..94256c6a6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1271,7 +1271,7 @@ module.exports = { turnOnAutoMatch:'Turn On Auto Match', Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', - punctuationmark:'You can only enter English punctuation marks except the # sign and commas', + punctuationmark:'You can only enter English punctuation marks except the # sign', created: 'Time of Creation', updated:'Last Updated', OpenOne:'Open', @@ -1840,4 +1840,12 @@ module.exports = { toResubmit:'To Resubmit', selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data', submissionProcess:'Submission Process', + localapproval1:'Local Approval1', + localapproval2:'Local Approval2', + averageapprovalperiod:'Average approval period', + day:'day', + passreturntime:'Pass/return time', + approvalcycle:'Approval cycle(day)', + transittime:'Transit Time', + returntime:'Return time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f4d27845b..5fabf20f7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1376,7 +1376,7 @@ module.exports = { regulatoryTechnicalAssessment: '法规技术评估', OpenOne: '公开', Privacy: '私密', - punctuationmark: '只能输入除#号和逗号外的英文标点符号', + punctuationmark: '只能输入除#号外的英文标点符号', created: '创建时间', updated: '更新时间', optionDropDownBox: '下拉选择', @@ -1941,4 +1941,12 @@ module.exports = { toResubmit:'重新提交', selectDesignConformanceAsConformance:'请选择设计符合性确认流程状态为符合或验证符合性确认流程状态为符合的数据', submissionProcess:'提交流程', + localapproval1:'地方批准1', + localapproval2:'地方批准2', + averageapprovalperiod:'平均审批周期', + day:'天', + passreturntime:'通过/退回时间', + approvalcycle:'审批周期(天)', + transittime:'通过时间', + returntime:'退回时间', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index d02319143..c3f94629e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -30,11 +30,11 @@
- * + * {{$t('filingtime')}}
- +
+ +
+
+ * + + {{$t('transittime')}} +
+ + + +
+ + +
+
+ * + + {{$t('returntime')}} +
+ + + +
+
@@ -77,9 +115,13 @@ export default { return { visible: false, confirmLoading: false, + transittime:false, + returntime:false, + propflag: false, formInline: { bazt:undefined, batjsj:'', + tgthsj:'', bz:'', }, rules: { @@ -99,7 +141,14 @@ export default { ], bz: [ { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' } - ] + ], + tgthsj: [ + { + required: true, + message: this.$t('cannotEmpty'), + trigger: 'change' + } + ], // listConfirmation: [ // { // required: true, @@ -161,16 +210,43 @@ export default { this.ids = row.join(',') this.formInline = { bazt:undefined, + tgthsj:'', batjsj:'', bz:'', } + this.propflag = true + this.transittime = false + this.returntime = false }else{ this.formInline.bazt = row.bazt ? row.bazt : undefined this.formInline.batjsj = row.batjsj + this.formInline.tgthsj = row.tgthsj this.formInline.bz = row.bz this.ids = row.id + if (this.formInline.bazt == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (this.formInline.bazt == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(this.formInline.bazt == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(this.formInline.bazt == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } } this.visible = true + this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) @@ -197,7 +273,29 @@ export default { } }) }, - selectchange(value){ + selectchange(value) { + console.log(value) + if (value == 1) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if (value == 2) { + this.propflag = true + this.transittime = false + this.returntime = false + } else if(value == 4){ + this.propflag = false + this.transittime = true + this.returntime = false + } else if(value == 5){ + this.propflag = false + this.returntime = true + this.transittime = false + }else{ + this.propflag = false + this.transittime = false + this.returntime = false + } this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField('bazt') diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 48692641d..b0737e69a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -91,36 +91,36 @@
{{$t('createanupgradeactivityrecord')}}
{{$t('citeforrecord')}}
{{$t('datamaintenance')}}
-
{{$t('templateDownload')}}
{{$t('gnxtwh')}} @@ -159,6 +159,9 @@ @click="deleteData(record)">{{$t('delete')}} +
+ {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}} +
{ if (res.success) { - if (res.result.current > 1 && res.result.records.length == 0) { + if (res.result.list.current > 1 && res.result.list.records.length == 0) { this.pageNo = 1 this.getList() return } - this.dataSource = res.result.records || [] - this.total = res.result.total + this.dataSource = res.result.list.records || [] + this.number = res.result.pjspzq + this.total = res.result.list.total this.loading = false } else { this.loading = false diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 09c93952f..e76dd38c4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 4ed59496c..1a5f21f17 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 397cbf543..a8f3d442e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 1bd0f1aab..a64bc49e4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
@@ -136,11 +136,29 @@ {{$t('upgradeactivityprovidesuserconfirmationoptions')}} - - - {{ $t('yes') }} - {{ $t('not') }} - + +
+ + {{ $t('yes') }} + {{ $t('not') }} + +
+
+ +
+
+ +
@@ -200,6 +218,8 @@ export default { importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, flag:false, + flagqr:false, + flagqrqt:false, loading: false, disable:false, columns: [ @@ -329,6 +349,7 @@ export default { scopedSlots: { customRender: 'operation' } } ], + qrheight:'50px', form:{ sjmd:'', } @@ -397,6 +418,25 @@ this.$forceUpdate() }else{ this.flag = false } + if(this.form.yhqr == '1'){ + this.flagqr = true + this.qrheight = '100px' + }else{ + this.flagqr = false + this.qrheight = '50px' + } + if(this.form.yhqr == '1' && this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){ + this.qrheight = '150px' + this.flagqrqt = true + }else if(this.form.yhqr == '1' && this.form.flagqr != '344a3320beba45afb3718c59b7a7144a'){ + this.flagqr = true + this.flagqrqt = false + this.qrheight = '100px' + }else { + this.flagqrqt = false + this.flagqr = false + this.qrheight = '50px' + } }) }, save(){ @@ -426,19 +466,35 @@ this.$forceUpdate() changeQuery(val) { if(val.indexOf('将车辆置于安全状态') != -1 || val.indexOf('Put the vehicle in a safe position') != -1){ this.flag = true - // let long = localStorage.getItem('language') - // let cut = '' - // if (long && long == 'zh-cn') { this.form.aqjzWbk = '车辆保持在功能受限制状态，此状态下车辆无法行驶，保证其处于安全状态' - // } else if (long && long == 'en-us') { - // this.form.aqjzWbk = 'The vehicle remains in a functionally restricted state, in which the vehicle cannot be driven to ensure that it is in a safe state' - // } - // this.getData() }else{ this.flag = false this.form.aqjzWbk = '' } }, + qrchange(val){ + if(val.target.value == '1'){ + this.qrheight = '100px' + this.flagqr = true + if(this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){ + this.qrheight = '150px' + this.flagqrqt = true + } + }else{ + this.qrheight = '50px' + this.flagqr = false + this.flagqrqt = false + } + }, + handleInput(val){ + if(val == '344a3320beba45afb3718c59b7a7144a'){ + this.qrheight = '150px' + this.flagqrqt = true + }else { + this.qrheight = '100px' + this.flagqrqt = false + } + }, } } @@ -475,6 +531,15 @@ this.$forceUpdate() margin-left: 40px; top: 4px; } +.box-input-qr { + //display: inline-block; + width: calc(100% - 80px); + position: absolute; + top: 16px; + height: 38px; + margin-left: 40px; + //top: 4px; +} .box-input2 { //display: inline-block; width: calc(100% - 80px); @@ -483,6 +548,14 @@ this.$forceUpdate() margin-left: 40px; top: 50px; } +.box-input-qr2 { + //display: inline-block; + width: calc(100% - 80px); + position: absolute; + height: 38px; + margin-left: 40px; + top: 95px; +} ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title { white-space: pre-wrap!important; } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index c2a5a9896..b9f9b4c49 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -2,11 +2,11 @@
-
+
-
+
{{ $t('templateDownload') }}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 6bbe680d2..93a6ea5bd 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 905b33b69..4fcb6718c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -1,10 +1,10 @@