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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
zyx.net
2023-03-28 11:58:49 +08:00
parent bc62a79e3e 3317d397ba
commit be02e0e09f
19 changed files with 395 additions and 121 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/OtaBaCxJbxxController.java
-1
View File
@@ -156,7 +156,6 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT);
otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaCxJbxx);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
+13
View File
@@ -6,6 +6,7 @@ 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.OtaBaCxJbxx;
import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,18 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
return Result.OK(otaBaSjSjmbcl);
}
/**
* 通过OtaId查询
*/
@AutoLog(value = "升级备案-升级目标车辆-通过otaId查询")
@ApiOperation(value = "升级备案-升级目标车辆-通过otaId查询", notes = "升级备案-升级目标车辆-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaSjSjmbcl);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
+15 -2
View File
@@ -6,6 +6,7 @@ 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.OtaBaSjSjmbcl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -81,8 +82,8 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
@ApiOperation(value="升级备案-升级目标车型-添加", notes="升级备案-升级目标车型-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) {
otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
return Result.OK("添加成功！");
OtaBaSjSjmbcx cx = otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
return Result.OK(cx);
}
/**
@@ -144,6 +145,18 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
return Result.OK(otaBaSjSjmbcx);
}
/**
* 通过OtaId查询
*/
@AutoLog(value = "升级备案-升级目标车型-通过otaId查询")
@ApiOperation(value = "升级备案-升级目标车型-通过otaId查询", notes = "升级备案-升级目标车型-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaSjSjmbcx otaBaSjSjmbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaSjSjmbcx);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
+7
View File
@@ -115,4 +115,11 @@ public class OtaBaSjList implements Serializable {
@ApiModelProperty(value = "备注")
private java.lang.String bz;
public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) {
this.cpdjbh = otaBaSjSjmbcx.getBabh();
this.ggpc = otaBaSjSjmbcx.getBapc();
this.cpsb = otaBaSjSjmbcx.getCpsb();
this.cpmc = otaBaSjSjmbcx.getCpmc();
this.cpxh = otaBaSjSjmbcx.getCpxh();
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java
+5
View File
@@ -90,4 +90,9 @@ public class OtaBaSjSjmbcl implements Serializable {
@ApiModelProperty(value = "VIN码清单")
private java.lang.String vinList;
/**csv附件*/
@Excel(name = "csv附件", width = 15)
@ApiModelProperty(value = "csv附件")
private java.lang.String csv;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java
+9 -1
View File
@@ -8,7 +8,15 @@ public enum OtaModuleEnum {
CX_KSJDXTMCYCS("可升级的系统名称与参数", "1","1"),
CX_KZXSJDJSFZGNMCYCS("可在线升级的驾驶辅助功能名称与参数", "1","1"),
CX_JSFZXTJCBACS("驾驶辅助系统基础备案参数", "1","1"),
CX_QT("其他", "1","1");
CX_QT("其他", "1","1"),
SJ_SJMBCX("升级目标车型", "1","1"),
SJ_SJMBCL("本次升级的目标车辆", "1","1"),
SJ_SJYXPG("升级影响评估", "1","1"),
SJ_SJXTMCBH("本次升级的系统名称与参数变化", "1","1"),
SJ_SJJSMCBH("本次升级的驾驶辅助功能名称与参数变化", "1","1"),
SJ_YHGZNRFS("用户告知内容及方式", "1","1"),
SJ_QT("其他升级任务信息", "1","1");
String name;
String nameEN;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java
+2
View File
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbclService extends IService<OtaBaSjSjmbcl> {
* @return
*/
List<OtaBaSjSjmbcl> queryList();
OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java
+3 -1
View File
@@ -18,7 +18,7 @@ public interface IOtaBaSjSjmbcxService extends IService<OtaBaSjSjmbcx> {
* @param otaBaSjSjmbcx
* @return
*/
void add(OtaBaSjSjmbcx otaBaSjSjmbcx);
OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx);
/**
* 更新
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbcxService extends IService<OtaBaSjSjmbcx> {
* @return
*/
List<OtaBaSjSjmbcx> queryList();
OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+3 -3
View File
@@ -64,7 +64,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
*/
public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) {
//对比填写记录用的
OtaBaCxJbxx OtaBaCxJbxxOld = new OtaBaCxJbxx();
OtaBaCxJbxx otaBaCxJbxxOld = new OtaBaCxJbxx();
Date now = new Date();
OtaBaCxList otaBaCxList;
if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) {
@@ -76,7 +76,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
otaBaCxJbxx.setOtaId(otaBaCxList.getId());
otaBaCxJbxx.setCreateTime(now);
} else {
OtaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId());
otaBaCxList.updateData(otaBaCxJbxx);
otaBaCxListService.editById(otaBaCxList);
@@ -84,7 +84,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
otaBaCxJbxx.setUpdateTime(now);
saveOrUpdate(otaBaCxJbxx);
ComparisonUtil cu = new ComparisonUtil();
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, OtaBaCxJbxxOld, otaBaCxJbxx, sysDictService);
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, otaBaCxJbxxOld, otaBaCxJbxx, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
return otaBaCxJbxx;
}
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) {
try {
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) {
e.printStackTrace();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+96 -47
View File
@@ -1,89 +1,138 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
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.OtaBaSjSjmbclMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjListService;
import com.jero.modules.ota.service.IOtaBaSjLsjlService;
import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
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 java.util.List;
import java.util.Date;
import java.util.UUID;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升级备案-升级目标车辆
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Service
public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, OtaBaSjSjmbcl> implements IOtaBaSjSjmbclService {
/**
* 保存
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
@Autowired
private ISysDictService sysDictService;
@Autowired
private IOtaBaCxTxjlService otaBaCxTxjlService;
/**
* 保存
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
public void add(OtaBaSjSjmbcl otaBaSjSjmbcl) {
Date now = new Date();
otaBaSjSjmbcl.setCreateTime(now);
otaBaSjSjmbcl.setUpdateTime(now);
save(otaBaSjSjmbcl);
if (null != otaBaSjSjmbcl) {
OtaBaSjSjmbcl otaBaSjSjmbclOld = this.getByOtaId(otaBaSjSjmbcl.getOtaId());
if (null != otaBaSjSjmbclOld) {
otaBaSjSjmbcl.setId(otaBaSjSjmbclOld.getId());
} else {
otaBaSjSjmbcl.setCreateTime(now);
}
otaBaSjSjmbcl.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcl);
ComparisonUtil cu = new ComparisonUtil();
if (ObjectUtils.isEmpty(otaBaSjSjmbclOld)) {
otaBaSjSjmbclOld = new OtaBaSjSjmbcl();
}
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcl.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaSjSjmbclOld, otaBaSjSjmbcl, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
}
}
/**
* 更新
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
/**
* 更新
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
public void editById(OtaBaSjSjmbcl otaBaSjSjmbcl) {
Date now = new Date();
Date now = new Date();
otaBaSjSjmbcl.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcl);
saveOrUpdate(otaBaSjSjmbcl);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjSjmbcl queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjSjmbcl> queryList() {
return list();
}
@Override
public OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT) {
//判断是否保存过，否则查询模版数据回显
OtaBaSjSjmbcl res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjmbcl getByOtaId(String otaId) {
LambdaQueryWrapper<OtaBaSjSjmbcl> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+104 -47
View File
@@ -1,89 +1,146 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
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.OtaBaSjSjmbcxMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjListService;
import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
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 java.util.List;
import java.util.Date;
import java.util.UUID;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升级备案-升级目标车型
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Service
public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, OtaBaSjSjmbcx> implements IOtaBaSjSjmbcxService {
/**
* 保存
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public void add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
@Autowired
private IOtaBaSjListService otaBaSjListService;
@Autowired
private ISysDictService sysDictService;
@Autowired
private IOtaBaCxTxjlService otaBaCxTxjlService;
/**
* 保存
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
//对比填写记录用的
OtaBaSjSjmbcx otaBaSjSjmbcxOld = new OtaBaSjSjmbcx();
Date now = new Date();
otaBaSjSjmbcx.setCreateTime(now);
OtaBaSjList otaBaSjList;
if (StringUtils.isEmpty(otaBaSjSjmbcx.getOtaId())) {
//在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新
otaBaSjList = new OtaBaSjList();
otaBaSjList.setId(UUID.randomUUID().toString().replace("-", ""));
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjListService.add(otaBaSjList);
otaBaSjSjmbcx.setOtaId(otaBaSjList.getId());
otaBaSjSjmbcx.setCreateTime(now);
} else {
otaBaSjSjmbcxOld = this.getByOtaId(otaBaSjSjmbcx.getOtaId());
otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId());
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjListService.editById(otaBaSjList);
}
otaBaSjSjmbcx.setUpdateTime(now);
save(otaBaSjSjmbcx);
saveOrUpdate(otaBaSjSjmbcx);
ComparisonUtil cu = new ComparisonUtil();
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
return otaBaSjSjmbcx;
}
/**
* 更新
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
/**
* 更新
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public void editById(OtaBaSjSjmbcx otaBaSjSjmbcx) {
Date now = new Date();
Date now = new Date();
otaBaSjSjmbcx.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcx);
saveOrUpdate(otaBaSjSjmbcx);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjSjmbcx queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjSjmbcx> queryList() {
return list();
}
@Override
public OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT) {
//判断是否保存过，否则查询模版数据回显
OtaBaSjSjmbcx res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjmbcx getByOtaId(String otaId) {
LambdaQueryWrapper<OtaBaSjSjmbcx> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
}
jero-web/src/components/CollectionType/index.vue
+1 -1
View File
@@ -1106,7 +1106,7 @@
}
.selectWid {
min-width: 150px;
/*min-width: 150px;*/
width: 100%;
}
jero-web/src/components/CollectionTypeDisabled/index.vue
+1 -1
View File
@@ -980,7 +980,7 @@
}
.selectWid {
min-width: 150px;
/*min-width: 150px;*/
width: 100%;
}
jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
+9 -6
View File
@@ -227,7 +227,8 @@ export default {
},
url:{
addModel:''
}
},
record:{}
}
},
mounted() {
@@ -235,10 +236,12 @@ export default {
},
methods: {
...mapGetters(['userInfo']),
addModel(flag) {
if(flag=='1')
this.disabled=true
this.showButton=true
addModel(record,flag) {
if(flag=='1'){
this.disabled=true
this.showButton=true
}
this.record=record
this.visible = true
this.formInline = {}
this.formInline.dataList = [{}]
@@ -274,7 +277,7 @@ export default {
// }
// })
this.visible = false
this.$emit('addModelList')
this.$emit('addModelList',this.record)
}
})
},
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+6 -6
View File
@@ -143,9 +143,9 @@
@click="maintenanceClick(record)">{{$t('maintenance')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '0')" v-if="!onShow">{{$t('endUpgrade')}}</a>
@click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '1')" v-if="onShow">{{$t('upgradecompletion')}}</a>
@click="endUpgrade(record , '1')" v-if="record.onShow">{{$t('upgradecompletion')}}</a>
<a class="text-operation"
@click="handleExport(record)">{{$t('export')}}</a>
<a class="text-operation"
@@ -310,7 +310,6 @@ export default {
],
userInfoQuery: {},
administrators: false,
onShow:false
}
},
mounted() {
@@ -445,7 +444,7 @@ export default {
},
// 结束升级
endUpgrade(record,flag){
this.$refs.upgradecompletionRef.addModel(flag)
this.$refs.upgradecompletionRef.addModel(record,flag)
},
// 查看
detailclick(){
@@ -468,8 +467,9 @@ export default {
handleModule(){
downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
},
addModelList(){
this.onShow=true
addModelList(record){
record.onShow=true
this.$forceUpdate()
}
}
}
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+1
View File
@@ -198,6 +198,7 @@ import ImportFile from '@/components/ImportFileData/index'
getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
this.form=res.result ==null?{}:res.result
}
})
},
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+2 -1
View File
@@ -320,7 +320,8 @@ import { message } from 'ant-design-vue'
this.form.cpmc=res.result.cpmc
this.form.cpxh=res.result.cpxh
this.form.txzd=res.result.txzd
this.form.cdotasj=res.result.cdotasj
this.form.txzd=res.result.txzd
this.form.id=res.result.id
if(this.$route.query.type == 1 && res.result.cxmb == null){
this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
}else {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+113 -3
View File
@@ -40,6 +40,11 @@
<span slot="approvalResult" slot-scope="text,result">
{{approvalResult[text]}}
</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 class="viewFile"
@click="viewFileClick(result.approvalFile)"
@@ -78,6 +83,17 @@
return {
loading: false,
dataSource: [],
statusClass: {
'Accepted': 'AcceptedClass',
'Rejected': 'RejectedClass',
'Transfer': 'TransferClass',
'Returned': 'ReturnedClass',
'Adopt': 'AdoptClass',
'Compliance': 'ComplianceClass',
'Non-Compliance': 'NonComplianceClass',
'To be tracked': 'trackedClass',
'NA': 'NAClass'
},
regulatoryCertificationTaskPlanList: [
{
status: '1',
@@ -131,6 +147,7 @@
align: 'left',
width: 160,
ellipsis: true,
scopedSlots: { customRender: 'resultofhandling' }
},
{
title: this.$t('feedback'),
@@ -164,7 +181,7 @@
this.dataSource = res.result || []
if (this.dataSource.length > 0) {
let taskData = this.dataSource[this.dataSource.length - 1]
if (this.queryProject.TaskKey == 'fqlc'){
if (this.queryProject.TaskKey == 'fqlc') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '2'
@@ -200,7 +217,7 @@
})
}
if (this.queryProject.TaskKey == 'fggcssh') {
if (taskData.operatorResult == 'Adopt'){
if (taskData.operatorResult == 'Adopt') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
@@ -214,7 +231,7 @@
val.status = '1'
}
})
}else{
} else {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
@@ -248,6 +265,7 @@
<style scoped lang="less">
@import '~@assets/less/common.less';
.box {
padding: 0 0 24px 0;
box-sizing: border-box;
@@ -331,6 +349,7 @@
}
}
}
.process-content-content:first-child {
padding: 0 10px 0 0;
}
@@ -338,6 +357,7 @@
.process-content-content:last-child {
padding: 0 0 0 10px;
}
.process-content-right-xian {
height: 2px;
width: calc(100% - 27px);
@@ -346,4 +366,94 @@
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>