diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 9b28764d5..99c980b9c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -411,7 +411,7 @@ public class ParamsCollectManifestEOController extends JeroController referParams(ParamsCollectManifestVO paramsCollectManifestVO) { + public Result referParams(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO); if (isSuccess) { return Result.OK("引用参数成功!"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 22e9effbb..641e43f73 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -276,9 +277,10 @@ public class ParamsManifestEOController extends JeroController copy(ParamsManifestEO paramsManifestEO, - @RequestParam(name="sourceManifestId",required=true) String sourceManifestId) { - ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, sourceManifestId); + public Result copy(@RequestBody ParamsManifestVO paramsManifestVO) { + ParamsManifestEO paramsManifestEO = new ParamsManifestEO(); + BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO); + ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, paramsManifestVO.getSourceManifestId()); return Result.OK(manifestEO); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java index 260c49008..7754c385d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java @@ -3,9 +3,8 @@ package com.jero.modules.cert.collect.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 com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -64,16 +63,19 @@ public class ParamsConfigDataEO implements Serializable { /**文本类型数据*/ @Excel(name = "文本类型数据", width = 15) @ApiModelProperty(value = "文本类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String textData; /**下拉类型数据*/ @Excel(name = "下拉类型数据", width = 15) @ApiModelProperty(value = "下拉类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String pullData; /**附件类型数据*/ @Excel(name = "附件类型数据", width = 15) @ApiModelProperty(value = "附件类型数据") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String fileConnectId; /**参数配置id*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index ac65946b5..2d619154b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -101,4 +101,8 @@ public class ParamsManifestEO implements Serializable { @TableField(exist = false) private Boolean configFlag; // true-可添加配置;false-不可添加配置 + + @TableField(exist = false) + private String cut; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index ff32910b2..e625b5e2c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1232,7 +1232,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - throw new JeroBootException("标题已存在!"); + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在!"); + } } String paramsManifestId = UUID.randomUUID().toString().replace("-",""); @@ -153,7 +157,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsManifestEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - throw new JeroBootException("标题已存在!"); + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在!"); + } } } @@ -453,6 +461,18 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle()); + queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("Title already exists!"); + } else { + throw new JeroBootException("标题已存在!"); + } + } + // 查询所有模板参数项 List paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsTemplateId, paramsTemplatePublishVersion); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java index 689c4b438..1564daa81 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java @@ -69,4 +69,6 @@ public class ParamsCollectManifestVO { private String sourceConfigId; // 引用参数专用 @ApiModelProperty(value = "引用参数专用-到") private String targetConfigIds; // 引用参数专用 + + private String cut; // 引用参数专用 } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java index 1772bd5bf..187fe1d54 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java @@ -21,4 +21,5 @@ public class ParamsManifestVO { private String ids; private String cut; + private String sourceManifestId; } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b8afbfa7e..726752690 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -618,7 +618,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NiO number', + NiONumber: 'NIO number', ParameterName: 'Parameter name', ParameterDescription: 'Parameter description', Version: 'Version', @@ -723,7 +723,7 @@ module.exports = { Dropdownradio: 'Drop down radio', Dropdownmultipleselection: 'Drop down multiple selection', a: '+', - positiveInteger: 'positive integer', + positiveInteger: 'Positive integer', ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', @@ -731,8 +731,8 @@ module.exports = { theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', - chinese: 'chinese', - integerOrDecimal: 'integer Or Decimal', + chinese: 'Chinese', + integerOrDecimal: 'Integer Or Decimal', OneDecimalPlace: 'One Decimal Place', TwoDecimalplaces: 'Two Decimal places', Threedecimalplaces: 'Threedecimalplaces', @@ -978,7 +978,19 @@ module.exports = { contentTemplate:'Content template', moveUp:'Move up', moveDown:'Move down', + vehicleType:'Vehicle Type', + usage:'Usage', + implementationModel:'Implementation model', + primaryCoverageCn:'Primary coverage (Cn)', + primaryCoverageEn:'Primary coverage (En)', + workProgressCn:'NIO Work progress (Cn)', + workProgressEn:'NIO Work progress (En)', + link:'Link', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest update time', + Exporthistory: 'Exporthistory', + Exporttype: 'Export Type', + Exporttime: 'Export Time', + file: 'File' } \ 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 0c5eff3cb..324304fe9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -970,20 +970,32 @@ module.exports = { chapterContents: '章节目录', chineseTitle: '中文标题', englishTitle: '英文标题', - regulatoryContact:'法规联系人', - exportStatus:'导出状态', - monthlyTitleTemplate:'月报标题模板', - monthlyIntegrationAndExport:'月报整合导出', - addContent:'新增内容', - editContent:'编辑内容', - viewContent:'查看内容', - monthSelection:'月份选择', - fillInTheMonth:'填写月份', - contentTemplate:'内容模板', - bringInStandardInformation:'带入标准信息', - moveUp:'上移', - moveDown:'下移', + regulatoryContact: '法规联系人', + exportStatus: '导出状态', + monthlyTitleTemplate: '月报标题模板', + monthlyIntegrationAndExport: '月报整合导出', + addContent: '新增内容', + editContent: '编辑内容', + viewContent: '查看内容', + monthSelection: '月份选择', + fillInTheMonth: '填写月份', + contentTemplate: '内容模板', + bringInStandardInformation: '带入标准信息', + moveUp: '上移', + moveDown: '下移', + vehicleType: '适用车型', + usage: '用法', + implementationModel: '实施车型', + primaryCoverageCn: '主要内容(中文)', + primaryCoverageEn: '主要内容(英文)', + workProgressCn: 'NIO工作进展(中文)', + workProgressEn: 'NIO工作进展(英文)', + link: '链接', // 上报库 Enable: '启用', Latestupdatetime: '最新更新时间', + Exporthistory: '导出历史', + Exporttype: '导出类型', + Exporttime: '导出时间', + file: '文件' } \ No newline at end of file diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index b480abe6e..9c9b0a56b 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -190,36 +190,47 @@ export default { }, // 引用参数确定 handleSubmit() { - let _this = this + if(this.formInline.targetConfigIds instanceof Array){ + this.formInline.targetConfigIds = this.formInline.targetConfigIds.join(',') + } let param = {ids: this.selectedRowKeysArray, ...this.formInline } - axios({ - url: '/jero-boot/params/collectManifest/referParams', - method: 'post', - data: param, - transformRequest: [function (data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':_this.token + postAction('params/collectManifest/referParams', param).then((res) => { + if (res.success) { + this.$message.success(res.message) + this.$emit('areaVisibleAssignedbyflag', false) + this.$emit('GetgetTableList') + } else { + this.$message.warning(res.message) } }) - .then( (res) =>{ - console.log(res,'res') - if (res.data.success) { - _this.$message.success(res.data.message) - this.$emit('areaVisibleAssignedbyflag', false) - }else{ - _this.$message.warning(res.data.message) - } - }) - .catch( (error) =>{ - console.log(error); - }); + // axios({ + // url: '/jero-boot/params/collectManifest/referParams', + // method: 'post', + // data: param, + // transformRequest: [function (data) { + // let ret = '' + // for (let it in data) { + // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + // } + // return ret + // }], + // headers: { + // 'Content-Type': 'application/x-www-form-urlencoded', + // 'X-Access-Token':_this.token + // } + // }) + // .then( (res) =>{ + // console.log(res,'res') + // if (res.data.success) { + // _this.$message.success(res.data.message) + // this.$emit('areaVisibleAssignedbyflag', false) + // }else{ + // _this.$message.warning(res.data.message) + // } + // }) + // .catch( (error) =>{ + // console.log(error); + // }); } } } diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue new file mode 100644 index 000000000..2b0eb4638 --- /dev/null +++ b/jero-web/src/components/exporthistory/index.vue @@ -0,0 +1,361 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 690562df1..1fb8577ec 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -5,18 +5,96 @@
{{$t('fillInTheMonth')}} + :title="$t('title')">{{$t('title')}}
- +
-
- {{$t('bringInStandardInformation')}} +
+
+ {{$t('englishTitle')}} +
+ + + +
+ + + + +
+
+ {{$t('technicalField')}} +
+ + + +
+
+ +
+
+ {{$t('vehicleType')}} +
+ + + +
+
+
+ + +
+
+ {{$t('scopeOfApplication')}} +
+ + + +
+
+ +
+
+ {{$t('status')}} +
+ + +
@@ -25,47 +103,160 @@
{{$t('chapterContents')}} + :title="$t('usage')">{{$t('usage')}}
- - - - {{ item.name }} - - - +
- {{$t('contentTemplate')}} + {{$t('implementationModel')}}
- - - - {{ item.name }} - - - + + +
+
+ + + +
+
+ {{$t('releaseDate')}} +
+ + + +
+
+ +
+
+ {{$t('ImplementationDate')}} +
+ + + +
+
+
+ + +
+
+ {{$t('vehicleInProductionDate')}} +
+ + + +
+
+
+ + +
+
+ {{$t('primaryCoverageCn')}} +
+ + + +
+
+
+ + +
+
+ {{$t('primaryCoverageEn')}} +
+ + + +
+
+
+ + +
+
+ {{$t('workProgressCn')}} +
+ + + +
+
+
+ + +
+
+ {{$t('workProgressEn')}} +
+ + + +
+
+
+ + +
+
+ {{$t('regulatoryContact')}} +
+ + + +
+
+
+ + +
+
+ {{$t('link')}} +
+ +
@@ -76,46 +267,104 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 83c82ca50..bbd18a05a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -81,6 +81,7 @@
+
@@ -92,8 +93,13 @@