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

Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

Browse Source
This commit is contained in:
yuekuo
2023-03-28 14:36:18 +08:00
parent 42a278d4aa c690af58ed
commit a8e52370d9
28 changed files with 353 additions and 545 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/controller/OtaBaSjSjyxpgController.java
+19
View File
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaCxAqcs;
import com.jero.modules.ota.entity.OtaBaSjSjyxpg; import com.jero.modules.ota.entity.OtaBaSjSjyxpg;
import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,24 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
return Result.OK(otaBaSjSjyxpg); return Result.OK(otaBaSjSjyxpg);
} }
/**
* 通过otaId查询
*
* @param otaId
* @return
*/
@AutoLog(value = "升级备案-升级影响评估-通过otaId查询")
@ApiOperation(value = "升级备案-升级影响评估-通过otaId查询", notes = "升级备案-升级影响评估-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
OtaBaSjSjyxpg otaBaSjSjyxpg = otaBaSjSjyxpgService.queryByOtaId(otaId, otaIdT);
if (otaBaSjSjyxpg == null) {
return Result.error("未找到对应数据");
}
return Result.OK(otaBaSjSjyxpg);
}
/** /**
* 导出excel * 导出excel
* *
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java
-170
View File
@@ -1,170 +0,0 @@
package com.jero.modules.ota.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.jero.modules.ota.service.IOtaBaSjTxjlService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Api(tags="车型升级-填写记录表")
@RestController
@RequestMapping("/ota/otaBaSjTxjl")
@Slf4j
public class OtaBaSjTxjlController extends JeroController<OtaBaSjTxjl, IOtaBaSjTxjlService> {
@Autowired
private IOtaBaSjTxjlService otaBaSjTxjlService;
/**
* 分页列表查询
*
* @param otaBaSjTxjl
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "车型升级-填写记录表-分页列表查询")
@ApiOperation(value="车型升级-填写记录表-分页列表查询", notes="车型升级-填写记录表-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(OtaBaSjTxjl otaBaSjTxjl,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<OtaBaSjTxjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjTxjl, req.getParameterMap());
Page<OtaBaSjTxjl> page = new Page<OtaBaSjTxjl>(pageNo, pageSize);
IPage<OtaBaSjTxjl> pageList = otaBaSjTxjlService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "车型升级-填写记录表-列表查询")
@ApiOperation(value="车型升级-填写记录表-列表查询", notes="车型升级-填写记录表-列表查询")
@GetMapping(value = "/list")
public Result<List<OtaBaSjTxjl>> queryList() {
List<OtaBaSjTxjl> list = otaBaSjTxjlService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param otaBaSjTxjl
* @return
*/
@AutoLog(value = "车型升级-填写记录表-添加")
@ApiOperation(value="车型升级-填写记录表-添加", notes="车型升级-填写记录表-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) {
otaBaSjTxjlService.add(otaBaSjTxjl);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param otaBaSjTxjl
* @return
*/
@AutoLog(value = "车型升级-填写记录表-编辑")
@ApiOperation(value="车型升级-填写记录表-编辑", notes="车型升级-填写记录表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) {
otaBaSjTxjlService.editById(otaBaSjTxjl);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "车型升级-填写记录表-通过id删除")
@ApiOperation(value="车型升级-填写记录表-通过id删除", notes="车型升级-填写记录表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
otaBaSjTxjlService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "车型升级-填写记录表-批量删除")
@ApiOperation(value="车型升级-填写记录表-批量删除", notes="车型升级-填写记录表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.otaBaSjTxjlService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "车型升级-填写记录表-通过id查询")
@ApiOperation(value="车型升级-填写记录表-通过id查询", notes="车型升级-填写记录表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
OtaBaSjTxjl otaBaSjTxjl = otaBaSjTxjlService.queryById(id);
if(otaBaSjTxjl==null) {
return Result.error("未找到对应数据");
}
return Result.OK(otaBaSjTxjl);
}
/**
* 导出excel
*
* @param request
* @param otaBaSjTxjl
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjTxjl otaBaSjTxjl) {
return super.exportXls(request, otaBaSjTxjl, OtaBaSjTxjl.class, "车型升级-填写记录表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, OtaBaSjTxjl.class);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java
+4
View File
@@ -69,6 +69,7 @@ public class OtaBaSjSjyxpg implements Serializable {
/**升级目的*/ /**升级目的*/
@Excel(name = "升级目的", width = 15) @Excel(name = "升级目的", width = 15)
@ApiModelProperty(value = "升级目的") @ApiModelProperty(value = "升级目的")
@Dict(dicCode = "uipgrade_purpose")
private java.lang.String sjmd; private java.lang.String sjmd;
/**是否变更对应车型的《公告》技术参数*/ /**是否变更对应车型的《公告》技术参数*/
@@ -99,11 +100,13 @@ public class OtaBaSjSjyxpg implements Serializable {
/**如何执行升级*/ /**如何执行升级*/
@Excel(name = "如何执行升级", width = 15) @Excel(name = "如何执行升级", width = 15)
@ApiModelProperty(value = "如何执行升级") @ApiModelProperty(value = "如何执行升级")
@Dict(dicCode = "conditions_upgrades")
private java.lang.String zxsj; private java.lang.String zxsj;
/**升级失败或中断后，车辆采取的安全机制*/ /**升级失败或中断后，车辆采取的安全机制*/
@Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15) @Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15)
@ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制") @ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制")
@Dict(dicCode = "upgrade_failed")
private java.lang.String aqjz; private java.lang.String aqjz;
/**升级活动是否影响车辆安全*/ /**升级活动是否影响车辆安全*/
@@ -119,6 +122,7 @@ public class OtaBaSjSjyxpg implements Serializable {
/**升级包测试*/ /**升级包测试*/
@Excel(name = "升级包测试", width = 15) @Excel(name = "升级包测试", width = 15)
@ApiModelProperty(value = "升级包测试") @ApiModelProperty(value = "升级包测试")
@Dict(dicCode = "package_test")
private java.lang.String sjbcs; private java.lang.String sjbcs;
/**是杏已验证确认在线升级活动的安全性和可靠性*/ /**是杏已验证确认在线升级活动的安全性和可靠性*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java
-79
View File
@@ -1,79 +0,0 @@
package com.jero.modules.ota.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Data
@TableName("ota_ba_sj_txjl")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="ota_ba_sj_txjl对象", description="车型升级-填写记录表")
public class OtaBaSjTxjl implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**ota_id*/
@Excel(name = "ota_id", width = 15)
@ApiModelProperty(value = "ota_id")
private String otaId;
/**模块*/
@Excel(name = "模块", width = 15)
@ApiModelProperty(value = "模块")
private String module;
/**填写内容*/
@Excel(name = "填写内容", width = 15)
@ApiModelProperty(value = "填写内容")
private String content;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+4 -4
View File
@@ -156,17 +156,17 @@ public enum OtaTitleEnum {
SCRQKS("scrqks", "生产日期开始", "0"), SCRQKS("scrqks", "生产日期开始", "0"),
SCRQJS("scrqjs", "生产日期结束", "0"), SCRQJS("scrqjs", "生产日期结束", "0"),
VIN_LIST("vinList", "VIN码清单", "0"), VIN_LIST("vinList", "VIN码清单", "0"),
SJMD("sjmd", "升级目的", "0"), SJMD("sjmd", "升级目的", "uipgrade_purpose"),
SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"), SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"),
JSXNBH("jsxnbh", "是否涉及性能变化", "0"), JSXNBH("jsxnbh", "是否涉及性能变化", "0"),
FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"), FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"),
ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"), ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"),
JRXXG("jrxxg", "兼容性评估相关", "0"), JRXXG("jrxxg", "兼容性评估相关", "0"),
ZXSJ("zxsj", "如何执行升级", "0"), ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"),
AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "0"), AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"),
SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"), SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"),
YHQR("yhqr", "升级活动是否提供用户确认选项", "0"), YHQR("yhqr", "升级活动是否提供用户确认选项", "0"),
SJBCS("sjbcs", "升级包测试", "0"), SJBCS("sjbcs", "升级包测试", "package_test"),
AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"), AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"),
BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"), BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"),
CLFJ("clfj", "提供证明材料", "0"), CLFJ("clfj", "提供证明材料", "0"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java
-17
View File
@@ -1,17 +0,0 @@
package com.jero.modules.ota.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
public interface OtaBaSjTxjlMapper extends BaseMapper<OtaBaSjTxjl> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.ota.mapper.OtaBaSjTxjlMapper">
<resultMap id="OtaBaSjTxjlResultMap" type="com.jero.modules.ota.entity.OtaBaSjTxjl">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="ota_id" property="otaId" />
<result column="module" property="module" />
<result column="content" property="content" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java
+2
View File
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjyxpgService extends IService<OtaBaSjSjyxpg> {
* @return * @return
*/ */
List<OtaBaSjSjyxpg> queryList(); List<OtaBaSjSjyxpg> queryList();
OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java
-61
View File
@@ -1,61 +0,0 @@
package com.jero.modules.ota.service;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
public interface IOtaBaSjTxjlService extends IService<OtaBaSjTxjl> {
/**
* 保存
*
* @param otaBaSjTxjl
* @return
*/
void add(OtaBaSjTxjl otaBaSjTxjl);
/**
* 更新
*
* @param otaBaSjTxjl
* @return
*/
void editById(OtaBaSjTxjl otaBaSjTxjl);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
OtaBaSjTxjl queryById(String id);
/**
* 列表查询
*
* @return
*/
List<OtaBaSjTxjl> queryList();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+5 -1
View File
@@ -131,7 +131,11 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
if (null != bjObj) { if (null != bjObj) {
try { try {
field.setAccessible(true); field.setAccessible(true);
field.set(otaBaCxJsfzbacs, bjObj.toString()); if (bjObj instanceof Integer) {
field.set(otaBaCxJsfzbacs, (Integer) bjObj);
} else {
field.set(otaBaCxJsfzbacs, bjObj.toString());
}
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+93 -47
View File
@@ -1,89 +1,135 @@
package com.jero.modules.ota.service.impl; package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjyxpg; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.enums.OtaModuleEnum;
import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper; import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjSjyxpgService; import com.jero.modules.ota.service.IOtaBaSjSjyxpgService;
import com.jero.modules.ota.utils.ComparisonUtil;
import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 升级备案-升级影响评估 * @Description: 升级备案-升级影响评估
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-17 * @Date: 2023-03-17
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, OtaBaSjSjyxpg> implements IOtaBaSjSjyxpgService { public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, OtaBaSjSjyxpg> implements IOtaBaSjSjyxpgService {
/**
* 保存 @Autowired
* private ISysDictService sysDictService;
* @param otaBaSjSjyxpg
* @return @Autowired
*/ private IOtaBaCxTxjlService otaBaCxTxjlService;
@Override
/**
* 保存
*
* @param otaBaSjSjyxpg
* @return
*/
@Override
public void add(OtaBaSjSjyxpg otaBaSjSjyxpg) { public void add(OtaBaSjSjyxpg otaBaSjSjyxpg) {
Date now = new Date(); Date now = new Date();
otaBaSjSjyxpg.setCreateTime(now); if (null != otaBaSjSjyxpg) {
otaBaSjSjyxpg.setUpdateTime(now); OtaBaSjSjyxpg otaBaSjSjyxpgOld = this.getByOtaId(otaBaSjSjyxpg.getOtaId());
save(otaBaSjSjyxpg); if (null != otaBaSjSjyxpgOld) {
otaBaSjSjyxpg.setId(otaBaSjSjyxpgOld.getId());
} else {
otaBaSjSjyxpg.setCreateTime(now);
}
otaBaSjSjyxpg.setUpdateTime(now);
saveOrUpdate(otaBaSjSjyxpg);
ComparisonUtil cu = new ComparisonUtil();
if (ObjectUtils.isEmpty(otaBaSjSjyxpgOld)) {
otaBaSjSjyxpgOld = new OtaBaSjSjyxpg();
}
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
}
} }
/** /**
* 更新 * 更新
* *
* @param otaBaSjSjyxpg * @param otaBaSjSjyxpg
* @return * @return
*/ */
@Override @Override
public void editById(OtaBaSjSjyxpg otaBaSjSjyxpg) { public void editById(OtaBaSjSjyxpg otaBaSjSjyxpg) {
Date now = new Date(); Date now = new Date();
otaBaSjSjyxpg.setUpdateTime(now); otaBaSjSjyxpg.setUpdateTime(now);
saveOrUpdate(otaBaSjSjyxpg); saveOrUpdate(otaBaSjSjyxpg);
} }
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
removeById(id); removeById(id);
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
removeByIds(ids); removeByIds(ids);
} }
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public OtaBaSjSjyxpg queryById(String id) { public OtaBaSjSjyxpg queryById(String id) {
return getById(id); return getById(id);
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<OtaBaSjSjyxpg> queryList() { public List<OtaBaSjSjyxpg> queryList() {
return list(); return list();
} }
@Override
public OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT) {
OtaBaSjSjyxpg res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjyxpg getByOtaId(String otaId) {
LambdaQueryWrapper<OtaBaSjSjyxpg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java
-89
View File
@@ -1,89 +0,0 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.jero.modules.ota.mapper.OtaBaSjTxjlMapper;
import com.jero.modules.ota.service.IOtaBaSjTxjlService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Service
public class OtaBaSjTxjlServiceImpl extends ServiceImpl<OtaBaSjTxjlMapper, OtaBaSjTxjl> implements IOtaBaSjTxjlService {
/**
* 保存
*
* @param otaBaSjTxjl
* @return
*/
@Override
public void add(OtaBaSjTxjl otaBaSjTxjl) {
Date now = new Date();
otaBaSjTxjl.setCreateTime(now);
otaBaSjTxjl.setUpdateTime(now);
save(otaBaSjTxjl);
}
/**
* 更新
*
* @param otaBaSjTxjl
* @return
*/
@Override
public void editById(OtaBaSjTxjl otaBaSjTxjl) {
Date now = new Date();
otaBaSjTxjl.setUpdateTime(now);
saveOrUpdate(otaBaSjTxjl);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjTxjl queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjTxjl> queryList() {
return list();
}
}
jero-web/src/common/lang/en-us.js
+1
View File
@@ -894,6 +894,7 @@ module.exports = {
designComplianceReview: 'Design Compliance Confirmation', designComplianceReview: 'Design Compliance Confirmation',
preHomeConfirmation: 'Pre-Homo Confirmation', preHomeConfirmation: 'Pre-Homo Confirmation',
verificationComplianceReview: 'Validation Compliance Confirmation', verificationComplianceReview: 'Validation Compliance Confirmation',
verificationComplianceExamine:'Verification compliance examine',
Deployment: 'Deploy', Deployment: 'Deploy',
pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -910,6 +910,7 @@ module.exports = {
designComplianceReview: '设计符合性确认', designComplianceReview: '设计符合性确认',
preHomeConfirmation: 'Pre-Homo确认', preHomeConfirmation: 'Pre-Homo确认',
verificationComplianceReview: '验证符合性确认', verificationComplianceReview: '验证符合性确认',
verificationComplianceExamine:'验证符合性审查',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据', pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据',
jero-web/src/components/CollectionType/index.vue
+1 -1
View File
@@ -1106,7 +1106,7 @@
} }
.selectWid { .selectWid {
min-width: 150px; /*min-width: 150px;*/
width: 100%; width: 100%;
} }
jero-web/src/components/CollectionTypeDisabled/index.vue
+1 -1
View File
@@ -980,7 +980,7 @@
} }
.selectWid { .selectWid {
min-width: 150px; /*min-width: 150px;*/
width: 100%; width: 100%;
} }
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -8,7 +8,7 @@
rowKey="id" rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 330px)'}" :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}"
:data-source="dataSource" :data-source="dataSource"
:loading="loading" :loading="loading"
@change="tableOnChange" @change="tableOnChange"
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+10 -11
View File
@@ -23,25 +23,25 @@
style="margin-bottom: 20px" style="margin-bottom: 20px"
> >
<span slot="functionname" slot-scope="text,record"> <span slot="functionname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="record.gnmc" v-model="record.gnmc" :max-length="50"></a-input>
</span> </span>
<span slot="upgradedestinationype" slot-scope="text,record"> <span slot="upgradedestinationype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjmdlx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="record.sjmdlx" v-model="record.sjmdlx" :max-length="50"></a-input>
</span> </span>
<span slot="preupgrade" slot-scope="text,record"> <span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input> <a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span> </span>
<span slot="afterupgrade" slot-scope="text,record"> <span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$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>
<span slot="functionalchangedescription" slot-scope="text,record"> <span slot="functionalchangedescription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
</span> </span>
<span slot="variationofapplicableconditions" slot-scope="text,record"> <span slot="variationofapplicableconditions" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sytjbg" :title='record.sytjbg' :max-length="500"></a-input>
</span> </span>
<span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record"> <span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsjkzq" :title='record.sjsjkzq' :max-length="500"></a-input>
</span> </span>
@@ -99,7 +99,6 @@ export default {
align: 'left', align: 'left',
dataIndex: 'functionname', dataIndex: 'functionname',
ellipsis: true, ellipsis: true,
width: 170,
scopedSlots: { customRender: 'functionname' }, scopedSlots: { customRender: 'functionname' },
}, },
{ {
@@ -140,7 +139,7 @@ export default {
align: 'left', align: 'left',
dataIndex: 'functionalchangedescription', dataIndex: 'functionalchangedescription',
ellipsis: true, ellipsis: true,
width: 170, width: 230,
scopedSlots: { customRender: 'functionalchangedescription' }, scopedSlots: { customRender: 'functionalchangedescription' },
}, },
{ {
@@ -148,7 +147,7 @@ export default {
align: 'left', align: 'left',
dataIndex: 'variationofapplicableconditions', dataIndex: 'variationofapplicableconditions',
ellipsis: true, ellipsis: true,
width: 170, width: 230,
scopedSlots: { customRender: 'variationofapplicableconditions' }, scopedSlots: { customRender: 'variationofapplicableconditions' },
}, },
{ {
@@ -156,7 +155,7 @@ export default {
align: 'left', align: 'left',
dataIndex: 'upgradetheelectroniccontrollerinvolved', dataIndex: 'upgradetheelectroniccontrollerinvolved',
ellipsis: true, ellipsis: true,
width: 170, width: 230,
scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' }, scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
}, },
{ {
jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+1
View File
@@ -13,6 +13,7 @@
<a-input <a-input
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model.trim="queryParam.rwmc" v-model.trim="queryParam.rwmc"
:title='queryParam.rwmc'
:max-length="500"></a-input> :max-length="500"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+1
View File
@@ -22,6 +22,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
v-model="formInline.zsl" v-model="formInline.zsl"
:title='formInline.zsl'
:placeholder="$t('PleaseSelect')"></a-input> :placeholder="$t('PleaseSelect')"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+12 -12
View File
@@ -23,42 +23,42 @@
style="margin-bottom: 20px" style="margin-bottom: 20px"
> >
<span slot="systemname" slot-scope="text,record"> <span slot="systemname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" :title='record.xtmc' :max-length="50"></a-input>
</span> </span>
<!-- 升级前--> <!-- 升级前-->
<span slot="preupgrade" slot-scope="text,record"> <span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input> <a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span> </span>
<!-- 升级后--> <!-- 升级后-->
<span slot="afterupgrade" slot-scope="text,record"> <span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$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>
<span slot="nameoftheupgradedelectroniccontroller" slot-scope="text,record"> <span slot="nameoftheupgradedelectroniccontroller" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" :title='record.sjkzqmc' :max-length="50"></a-input>
</span> </span>
<span slot="adaptivehardwareversion" slot-scope="text,record"> <span slot="adaptivehardwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb" :title='record.yjbb' :max-length="50"></a-input>
</span> </span>
<span slot="beforethesoftwareversionupgraded" slot-scope="text,record"> <span slot="beforethesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" :title='record.sjqrjbb' :max-length="50"></a-input>
</span> </span>
<span slot="afterthesoftwareversionupgraded" slot-scope="text,record"> <span slot="afterthesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb" :title='record.sjhrjbb' :max-length="50"></a-input>
</span> </span>
<span slot="beforetheOSversionupgraded" slot-scope="text,record"> <span slot="beforetheOSversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt" :title='record.sjqczxt' :max-length="50"></a-input>
</span> </span>
<span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record"> <span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt" :title='record.sjhczxt' :max-length="50"></a-input>
</span> </span>
<span slot="upgradepackageintegrityverificationdata" slot-scope="text,record"> <span slot="upgradepackageintegrityverificationdata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" :title='record.sjbyzsj' :max-length="500"></a-input>
</span> </span>
<span slot="upgradepackagesize" slot-scope="text,record"> <span slot="upgradepackagesize" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx" :title='record.sjbdx' :max-length="50"></a-input>
</span> </span>
<span slot="differentialupgradeornot" slot-scope="text,record"> <span slot="differentialupgradeornot" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+5 -5
View File
@@ -41,7 +41,7 @@
</div> </div>
<div class="title-text-add-input"> <div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> --> <!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.babh" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input> <a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
</div> </div>
</div> </div>
</a-col> </a-col>
@@ -52,7 +52,7 @@
</div> </div>
<div class="title-text-add-input"> <div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> --> <!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.qymc" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input> <a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
</div> </div>
</div> </div>
</a-col> </a-col>
@@ -77,7 +77,7 @@
<span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span> <span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpsb"></a-input> <a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb' v-model="form.cpsb"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -88,7 +88,7 @@
<span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span> <span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpmc"></a-input> <a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc' v-model="form.cpmc"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -99,7 +99,7 @@
<span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span> <span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpxh"></a-input> <a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh' v-model="form.cpxh"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+6
View File
@@ -23,6 +23,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500" :max-length="500"
:title='formInline.sjmd'
v-model='formInline.sjmd' v-model='formInline.sjmd'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -37,6 +38,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500" :max-length="500"
:title='formInline.gxbh'
v-model='formInline.gxbh' v-model='formInline.gxbh'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -51,6 +53,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50" :max-length="50"
:title='formInline.sjsj'
v-model='formInline.sjsj' v-model='formInline.sjsj'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -65,6 +68,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50" :max-length="50"
:title='formInline.sjky'
v-model='formInline.sjky' v-model='formInline.sjky'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -79,6 +83,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50" :max-length="50"
:title='formInline.sjbkygn'
v-model='formInline.sjbkygn' v-model='formInline.sjbkygn'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -93,6 +98,7 @@
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500" :max-length="500"
:title='formInline.zdxx'
v-model='formInline.zdxx' v-model='formInline.zdxx'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+6
View File
@@ -39,6 +39,7 @@
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
:title='form.qymc'
v-model="form.qymc"> v-model="form.qymc">
</a-input> </a-input>
</a-form-model-item> </a-form-model-item>
@@ -55,6 +56,7 @@
<a-input <a-input
:max-length="50" :max-length="50"
:disabled="disabled" :disabled="disabled"
:title='form.djbh'
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model.trim="form.djbh"> v-model.trim="form.djbh">
@@ -88,6 +90,7 @@
<a-input <a-input
:max-length="500" :max-length="500"
:disabled="disabled" :disabled="disabled"
:title='form.ggpc'
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="form.ggpc"> v-model="form.ggpc">
@@ -104,6 +107,7 @@
<a-input <a-input
:max-length="50" :max-length="50"
:disabled="disabled" :disabled="disabled"
:title='form.cpsb'
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="form.cpsb"> v-model="form.cpsb">
@@ -120,6 +124,7 @@
<a-input <a-input
:max-length="50" :max-length="50"
:disabled="disabled" :disabled="disabled"
:title='form.cpmc'
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="form.cpmc"> v-model="form.cpmc">
@@ -137,6 +142,7 @@
<a-input <a-input
:max-length="50" :max-length="50"
:disabled="disabled" :disabled="disabled"
:title='form.cpxh'
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model="form.cpxh"> v-model="form.cpxh">
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+8 -8
View File
@@ -14,7 +14,7 @@
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}" :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}"
rowKey="id" rowKey="id"
bordered bordered
:data-source="dataSource" :data-source="dataSource"
@@ -59,26 +59,26 @@
<a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input> <a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
</span> </span>
<span slot="functiondeelectronicscription" slot-scope="text,record"> <span slot="functiondeelectronicscription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record"> <span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"> </a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqscqy' v-model="record.kzqscqy" :max-length="50"> </a-input>
</span> </span>
<span slot="electroniccontrollertypeone" slot-scope="text,record"> <span slot="electroniccontrollertypeone" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqxh' v-model="record.kzqxh" :max-length="50"></a-input>
</span> </span>
<span slot="hardwareversioninformation" slot-scope="text,record"> <span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.yjbbxx' v-model="record.yjbbxx" :max-length="50"></a-input>
</span> </span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record"> <span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.rjkfqy' v-model="record.rjkfqy" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemversion" slot-scope="text,record"> <span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.czxtbbh' v-model="record.czxtbbh" :max-length="50"></a-input>
</span> </span>
<span slot="inflammatorydata" slot-scope="text,record"> <span slot="inflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csyzsj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.csyzsj' v-model="record.csyzsj" :max-length="500"></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+7 -7
View File
@@ -218,7 +218,7 @@
<div style='width: 700px'> <div style='width: 700px'>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span> <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
<span v-for='(item,index) in dataSource' class='content-text'> <span v-for='(item,index) in dataSource' class='content-text'>
<a-input v-model="item.val" class="item-input" :placeholder="item.fillincontent" :max-length="50"/> <a-input v-model="item.val" class="item-input" :title='item.val' :placeholder="item.fillincontent" :max-length="50"/>
</span><br> </span><br>
</div> </div>
</div> </div>
@@ -244,22 +244,22 @@
</a-radio-group> </a-radio-group>
</span> </span>
<span slot="controllername" slot-scope="text,record"> <span slot="controllername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :title='record.kzqmc' :max-length="50"></a-input>
</span> </span>
<span slot="hardwarespecificationmodel" slot-scope="text,record"> <span slot="hardwarespecificationmodel" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :title='record.yjggxh' :max-length="50"></a-input>
</span> </span>
<span slot="hardwaremanufacturer" slot-scope="text,record"> <span slot="hardwaremanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :title='record.yjscqy' :max-length="50"></a-input>
</span> </span>
<span slot="softwareversion" slot-scope="text,record"> <span slot="softwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :title='record.rjbb' :max-length="50"></a-input>
</span> </span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record"> <span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :title='record.rjkfqy' :max-length="50"></a-input>
</span> </span>
<span slot="layoutposition" slot-scope="text,record"> <span slot="layoutposition" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :title='record.bzwz' :max-length="50"></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+11 -11
View File
@@ -43,37 +43,37 @@
</a-button> </a-button>
</span> </span>
<span slot="electronicController" slot-scope="text,record"> <span slot="electronicController" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollername" slot-scope="text,record"> <span slot="electroniccontrollername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.aqwzxdj" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.aqwzxdj' v-model="record.aqwzxdj" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record"> <span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqscqy' v-model="record.kzqscqy" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollertype" slot-scope="text,record"> <span slot="electroniccontrollertype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqxh' v-model="record.kzqxh" :max-length="50"></a-input>
</span> </span>
<span slot="hardwareversioninformation" slot-scope="text,record"> <span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.yjbbxx' v-model="record.yjbbxx" :max-length="50"></a-input>
</span> </span>
<span slot="initialsoftwareversionnumber" slot-scope="text,record"> <span slot="initialsoftwareversionnumber" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbbh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.csrjbbh' v-model="record.csrjbbh" :max-length="50"></a-input>
</span> </span>
<span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record"> <span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbwzsj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.csrjbwzsj' v-model="record.csrjbwzsj" :max-length="500"></a-input>
</span> </span>
<span slot="environmentalprotection" slot-scope="text,record"> <span slot="environmentalprotection" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsfyx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.sjsfyx' v-model="record.sjsfyx" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemtype" slot-scope="text,record"> <span slot="operatingsystemtype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtlx" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.czxtlx' v-model="record.czxtlx" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemmanufacturer" slot-scope="text,record"> <span slot="operatingsystemmanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtscqy" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.czxtscqy' v-model="record.czxtscqy" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemversion" slot-scope="text,record"> <span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title='record.czxtbbh' v-model="record.czxtbbh" :max-length="50"></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record" > <span slot="operation" slot-scope="text,record" >
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+153 -4
View File
@@ -40,6 +40,11 @@
<span slot="approvalResult" slot-scope="text,result"> <span slot="approvalResult" slot-scope="text,result">
{{approvalResult[text]}} {{approvalResult[text]}}
</span> </span>
<span slot="resultofhandling" slot-scope="text,result">
<span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
{{result.operatorResultName}}
</span>
</span>
<span slot="approvalFile" slot-scope="text,result"> <span slot="approvalFile" slot-scope="text,result">
<span class="viewFile" <span class="viewFile"
@click="viewFileClick(result.approvalFile)" @click="viewFileClick(result.approvalFile)"
@@ -78,7 +83,40 @@
return { return {
loading: false, loading: false,
dataSource: [], dataSource: [],
regulatoryCertificationTaskPlanList: [ statusClass: {
'Accepted': 'AcceptedClass',
'Rejected': 'RejectedClass',
'Transfer': 'TransferClass',
'Returned': 'ReturnedClass',
'Adopt': 'AdoptClass',
'Compliance': 'ComplianceClass',
'Non-Compliance': 'NonComplianceClass',
'To be tracked': 'trackedClass',
'NA': 'NAClass'
},
verifyList: [
{
status: '1',
name: this.$t('initiatingProcess')
},
{
status: '1',
name: this.$t('Taskresponsibilityrecognition')
},
{
status: '1',
name: this.$t('verificationComplianceReview')
},
{
status: '2',
name: this.$t('verificationComplianceExamine')
},
{
status: '3',
name: this.$t('missionAccomplished')
}
],
designList: [
{ {
status: '1', status: '1',
name: this.$t('initiatingProcess') name: this.$t('initiatingProcess')
@@ -100,6 +138,7 @@
name: this.$t('missionAccomplished') name: this.$t('missionAccomplished')
} }
], ],
regulatoryCertificationTaskPlanList: [],
columns: [ columns: [
{ {
title: this.$t('Operator'), title: this.$t('Operator'),
@@ -131,6 +170,7 @@
align: 'left', align: 'left',
width: 160, width: 160,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'resultofhandling' }
}, },
{ {
title: this.$t('feedback'), title: this.$t('feedback'),
@@ -151,6 +191,7 @@
} }
}, },
mounted() { mounted() {
console.log(this.queryProject)
this.getList() this.getList()
}, },
methods: { methods: {
@@ -163,8 +204,13 @@
if (res.success) { if (res.success) {
this.dataSource = res.result || [] this.dataSource = res.result || []
if (this.dataSource.length > 0) { if (this.dataSource.length > 0) {
if (this.queryProject.flowType == 4) {
this.regulatoryCertificationTaskPlanList = this.verifyList
} else {
this.regulatoryCertificationTaskPlanList = this.designList
}
let taskData = this.dataSource[this.dataSource.length - 1] let taskData = this.dataSource[this.dataSource.length - 1]
if (this.queryProject.TaskKey == 'fqlc'){ if (this.queryProject.TaskKey == 'fqlc') {
this.regulatoryCertificationTaskPlanList.forEach(val => { this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) { if (val.name == this.$t('initiatingProcess')) {
val.status = '2' val.status = '2'
@@ -194,13 +240,15 @@
val.status = '1' val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) { } else if (val.name == this.$t('designComplianceReview')) {
val.status = '2' val.status = '2'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '2'
} else { } else {
val.status = '3' val.status = '3'
} }
}) })
} }
if (this.queryProject.TaskKey == 'fggcssh') { if (this.queryProject.TaskKey == 'fggcssh') {
if (taskData.operatorResult == 'Adopt'){ if (taskData.operatorResult == 'Adopt') {
this.regulatoryCertificationTaskPlanList.forEach(val => { this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) { if (val.name == this.$t('initiatingProcess')) {
val.status = '1' val.status = '1'
@@ -210,11 +258,15 @@
val.status = '1' val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) { } else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '1' val.status = '1'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('verificationComplianceExamine')) {
val.status = '1'
} else { } else {
val.status = '1' val.status = '1'
} }
}) })
}else{ } else {
this.regulatoryCertificationTaskPlanList.forEach(val => { this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) { if (val.name == this.$t('initiatingProcess')) {
val.status = '1' val.status = '1'
@@ -222,8 +274,12 @@
val.status = '1' val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) { } else if (val.name == this.$t('designComplianceReview')) {
val.status = '1' val.status = '1'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) { } else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '2' val.status = '2'
} else if (val.name == this.$t('verificationComplianceExamine')) {
val.status = '2'
} else { } else {
val.status = '3' val.status = '3'
} }
@@ -248,6 +304,7 @@
<style scoped lang="less"> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.box { .box {
padding: 0 0 24px 0; padding: 0 0 24px 0;
box-sizing: border-box; box-sizing: border-box;
@@ -331,6 +388,7 @@
} }
} }
} }
.process-content-content:first-child { .process-content-content:first-child {
padding: 0 10px 0 0; padding: 0 10px 0 0;
} }
@@ -338,6 +396,7 @@
.process-content-content:last-child { .process-content-content:last-child {
padding: 0 0 0 10px; padding: 0 0 0 10px;
} }
.process-content-right-xian { .process-content-right-xian {
height: 2px; height: 2px;
width: calc(100% - 27px); width: calc(100% - 27px);
@@ -346,4 +405,94 @@
top: 16px; top: 16px;
} }
} }
.AcceptedClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.RejectedClass {
background: #fdeaea;
color: #E83030;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.TransferClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.ReturnedClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.AdoptClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.ComplianceClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.NonComplianceClass {
background: #fdeaea;
color: #E83030;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.trackedClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.NAClass {
background: #f1f1f3;
color: #707486;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
</style> </style>