From d3283652b1e5c1374f7e01af5607198e4e4a352b Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 5 May 2022 10:55:03 +0800 Subject: [PATCH 01/21] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/parameterlist/index.vue | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index f7aa102f5..7c44a8e66 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -55,9 +55,9 @@
-
+
- {{$t('Version')}} + {{$t('releaseVersion')}}
@@ -199,17 +199,43 @@ export default { paramsTemplateId: this.$route.query.id, ...this.queryParam, ids: this.selectedRowKeys.join(','), - // exportName: '参数项列表.xlsx' } let _xx = JSON.stringify(_tt) - let _yy = { - - } - downloadFile('params/paramsInfo/exportParamsInfoZip', '参数项列表.zip', { paramsInfoVO : _xx }, this.Deselect) + let _yy = { paramsInfoVO : _xx, exportName: '参数项列表' } + downloadFile('params/paramsInfo/exportParamsInfoZip', '参数项列表.zip', { paramsInfoVO : _xx, exportName: '参数项列表' } , this.Deselect) + }, + // 发布版本 + releaseVersion() { + let _this = this + axios({ + url: `/jero-boot/params/paramsInfo/publish?paramsTemplateId=${this.$route.query.id}`, + method: 'get', + 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) =>{ + if (res.data.success) { + _this.$message.success(res.data.result) + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); }, //下载模板 handleModule() { - downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xls', {}) + downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xlsx', {}) }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus @@ -221,10 +247,6 @@ export default { //添加 handleAdd() { this.$refs.addModelRef.addModel() - }, - // 复制 - handlecody(){ - }, //批量删除 handleDel() { From a7e3767d4fa922196ee6f11b27d801eb500f8c9b Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 5 May 2022 11:40:02 +0800 Subject: [PATCH 02/21] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/manage.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js index 8e3d35147..74e813452 100644 --- a/jero-web/src/api/manage.js +++ b/jero-web/src/api/manage.js @@ -113,21 +113,6 @@ export function downFile(url,parameter){ }) } -/** - * 下载文件 用于excel导出 -- post - * @param url - * @param parameter - * @returns {*} - */ -export function downFilePost(url,parameter){ - return axios({ - url: url, - data: parameter, - method:'post' , - responseType: 'blob' - }) -} - /** * 下载文件 * @param url 文件路径 From 58948e85496a03955698fe47352de8c4b2143585 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 5 May 2022 11:53:08 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E5=AF=BC=E5=85=A5-=E9=99=84=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsInfoEOController.java | 4 +- .../CertCategoryParamsInfoEOMapper.java | 4 +- .../xml/CertCategoryParamsInfoEOMapper.xml | 10 ++-- .../ICertCategoryParamsInfoEOService.java | 7 +-- .../CertCategoryParamsInfoEOServiceImpl.java | 15 +++-- .../service/impl/ParamsInfoEOServiceImpl.java | 57 +++++++++++-------- 6 files changed, 56 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index da5ea5114..cfffca2e5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.template.controller; import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -233,7 +234,8 @@ public class ParamsInfoEOController extends JeroController selectListByNioNumber(@Param("nioNumber") String nioNumber); + List selectListByNioNumberAndTemplateId(@Param("nioNumber") String nioNumber, @Param("paramsTemplateId") String paramsTemplateId); List selectListByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); - int deleteByNioNumberList(@Param("list") List nioNumberList); + int deleteByNioNumberListAndTemplateId(@Param("list") List nioNumberList, @Param("paramsTemplateId") String paramsTemplateId); int deleteByParamsTemplateIds(@Param("paramsTemplateIds") String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml index 6c71449cc..7f36a2bb6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/CertCategoryParamsInfoEOMapper.xml @@ -16,10 +16,11 @@ - select * from cert_category_params_info - where nio_number in + where params_template_id = #{paramsTemplateId} + and nio_number in #{item} @@ -34,9 +35,10 @@ - + delete from cert_category_params_info - where nio_number in + where params_template_id = #{paramsTemplateId} + and nio_number in #{nioNumber} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java index 93d2eed83..c0818af0d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoEOService.java @@ -1,8 +1,7 @@ package com.jero.modules.cert.template.service; -import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.baomidou.mybatisplus.extension.service.IService; -import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import java.util.List; @@ -61,11 +60,11 @@ public interface ICertCategoryParamsInfoEOService extends IService queryList(); - List selectListByNioNumber(String nioNumber); + List selectListByNioNumber(String nioNumber, String paramsTemplateId); List selectListByParamsTemplateIds(String paramsTemplateIds); - int deleteByNioNumberList(List nioNumberList); + int deleteByNioNumberList(List nioNumberList, String paramsTemplateId); int deleteByParamsTemplateIds(String paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java index 0ca3caeda..38c84bfd6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.mapper.CertCategoryParamsInfoEOMapper; import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -18,6 +19,8 @@ import java.util.List; @Service public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl implements ICertCategoryParamsInfoEOService { + @Autowired + private CertCategoryParamsInfoEOMapper certCategoryParamsInfoEOMapper; /** * 保存 * @@ -89,22 +92,22 @@ public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl selectListByNioNumber(String nioNumber) { - return baseMapper.selectListByNioNumber(nioNumber); + public List selectListByNioNumber(String nioNumber, String paramsTemplateId) { + return certCategoryParamsInfoEOMapper.selectListByNioNumberAndTemplateId(nioNumber, paramsTemplateId); } @Override public List selectListByParamsTemplateIds(String paramsTemplateIds) { - return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + return certCategoryParamsInfoEOMapper.selectListByParamsTemplateIds(paramsTemplateIds); } @Override - public int deleteByNioNumberList(List nioNumberList) { - return baseMapper.deleteByNioNumberList(nioNumberList); + public int deleteByNioNumberList(List nioNumberList, String paramsTemplateId) { + return certCategoryParamsInfoEOMapper.deleteByNioNumberListAndTemplateId(nioNumberList, paramsTemplateId); } @Override public int deleteByParamsTemplateIds(String paramsTemplateIds) { - return baseMapper.deleteByParamsTemplateIds(paramsTemplateIds); + return certCategoryParamsInfoEOMapper.deleteByParamsTemplateIds(paramsTemplateIds); } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 7869fc4b8..4849119a2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -69,6 +69,8 @@ import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ParamsInfoEOServiceImpl extends ServiceImpl implements IParamsInfoEOService { + @Autowired + private ParamsInfoEOMapper paramsInfoEOMapper; @Autowired private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService; @@ -160,7 +162,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryParamsInfoEOList = paramsInfoEO.getCertCategoryParamsInfoEOList(); @@ -195,7 +197,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { + String paramsTemplateId = paramsInfoEOList.get(0).getParamsTemplateId(); List nioNumberList = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); // 关联删除认证类别参数项 - certCategoryParamsInfoEOService.deleteByNioNumberList(nioNumberList); + certCategoryParamsInfoEOService.deleteByNioNumberList(nioNumberList, paramsTemplateId); // TODO 关联删除附件模板文件信息和文件 } @@ -231,7 +235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(paramsInfoEO.getNioNumber()); + List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(paramsInfoEO.getNioNumber(), paramsInfoEO.getParamsTemplateId()); paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); return paramsInfoEO; } @@ -345,20 +349,21 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = baseMapper.selectListWithCert(paramsInfoVO); // 中文数据导出 + List paramsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); // 中文数据导出 getTreeDictItemText(paramsInfoEOList, cut); List> sheetsList = new ArrayList<>(); - sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath); + sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); } else if (CutEnum.EN.getValue().equals(cut)) { // 查询导出数据 - List paramsInfoEnExportList = baseMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出 + List paramsInfoEnExportList = paramsInfoEOMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出 getTreeDictItemTextForEnExport(paramsInfoEnExportList); List> sheetsList = new ArrayList<>(); - sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath); + sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath, paramsTemplateId); workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF); } @@ -391,7 +396,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath) throws IOException { + private List> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEOList)) { throw new JeroBootException("没有可导出的数据"); @@ -411,7 +416,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nioNumber = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); - List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ",")); + List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ","),paramsTemplateId); List certCategoryNameList = new ArrayList<>(); Map certCategoryMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) { @@ -478,7 +483,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath) throws IOException { + private List> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEnExportList)) { throw new JeroBootException("没有可导出的数据"); @@ -498,7 +503,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nioNumber = paramsInfoEnExportList.stream().map(ParamsInfoEnExport::getNioNumber).collect(Collectors.toList()); - List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ",")); + List certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(StringUtils.join(nioNumber, ","),paramsTemplateId); List certCategoryNameList = new ArrayList<>(); Map certCategoryMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) { @@ -798,17 +803,21 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl updateFileList = new ArrayList<>(); - for (int i=0; i updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + importDto.setFileTemplateConnectId(connectId); } - ossFileService.updateBatchById(updateFileList); - importDto.setFileTemplateConnectId(connectId); + ParamsInfoEO target = new ParamsInfoEO(); BeanUtils.copyProperties(importDto, target); target.setId(UUID.randomUUID().toString().replace("-","")); @@ -1314,11 +1323,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl selectListByParamsTemplateIds(String paramsTemplateIds) { - return baseMapper.selectListByParamsTemplateIds(paramsTemplateIds); + return paramsInfoEOMapper.selectListByParamsTemplateIds(paramsTemplateIds); } } From c0e05cba0ad668028348eaf435e8107bf5410b90 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 5 May 2022 14:05:18 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E8=AF=84=E8=AE=BA--=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectCommentEOServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java index 01c9d965d..896dbd2ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectCommentEO; import com.jero.modules.project.entity.ProjectReplyEO; +import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.mapper.ProjectCommentEOMapper; import com.jero.modules.project.service.IProjectCommentEOService; import com.jero.modules.project.service.IProjectReplyEOService; @@ -30,6 +31,8 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl getInfoList(ProjectCommentEO projectCommentEOTemp) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //评论的内容 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()).in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); + + //验证当前用户在该项目中是什么角色 + int isProjectRole = projectLawsInventoryEOService.checkUserRole(projectCommentEOTemp.getProjectLibraryId(), sysUser.getId(), ""); + if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ + //studio工程师(某一条项目中所有的评论和回复) + //其他角色(只能看自己评论,自己回复和studio工程师回复的) + wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()); + } + //评论的内容 + wrapper.in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); wrapper.orderByDesc(ProjectCommentEO::getCreateTime); List projectCommentEOS = this.list(wrapper); List projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList()); From 921e4c5963a1b199f7d12daf6c8a005fa4b8de13 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 14:31:34 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/ProjectDetails.vue | 77 ++-------- .../certificationProgressEchart.vue | 104 +++++++++++++ .../components/commentList.vue | 23 +-- .../currentStatusOfTheProjectEcharts.vue | 145 ++++++++++++++++++ .../components/deliverableStatusEchart.vue | 113 ++++++++++++++ 7 files changed, 393 insertions(+), 71 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/certificationProgressEchart.vue create mode 100644 jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue create mode 100644 jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 37f1834d0..bea14f54d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -743,4 +743,5 @@ module.exports = { replyToComments:'Reply to comments', noComment:'No comment', theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received', + notEvaluated:'Not evaluated', } \ 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 0bad590e8..6d00c2a16 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -748,4 +748,5 @@ module.exports = { replyToComments:'回复评论', noComment:'暂无评论', theReceived:'所有数据的清单确认状态和任务确认状态都为接受才可以定版', + notEvaluated:'未评估', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index e18c04b93..a64ab86c5 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -102,25 +102,15 @@
- - -
-
-
-
-
- -
-
+ + + - - Tab 2 + + - - Tab 3 - - - Tab 4 + + @@ -135,17 +125,24 @@ import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import addModel from './addModel' import settingList from './settingList' + import currentStatusOfTheProjectEcharts from './currentStatusOfTheProjectEcharts' + import deliverableStatusEchart from './deliverableStatusEchart' + import certificationProgressEchart from './certificationProgressEchart' export default { name: 'ProjectDetails', components: { listOfRelevantPersonnel, addModel, - settingList + settingList, + currentStatusOfTheProjectEcharts, + deliverableStatusEchart, + certificationProgressEchart }, data() { return { queryForm: {}, + activeKey: this.$t('CurrentStatusOfTheProject'), url: { queryById: 'project/projectLibraryBase/queryById', add: 'project/projectLibraryBase/add', @@ -161,7 +158,6 @@ mounted() { this.getForm() this.getSetting() - this.mainEcharts() }, methods: { getForm() { @@ -185,26 +181,6 @@ settingListForm() { this.getSetting() }, - mainEcharts() { - var myChart = echarts.init(document.getElementById('main')) - myChart.setOption({ - title: { - text: 'ECharts 入门示例' - }, - tooltip: {}, - xAxis: { - data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子'] - }, - yAxis: {}, - series: [ - { - name: '销量', - type: 'bar', - data: [5, 20, 36, 10, 10, 20] - } - ] - }) - }, ListOfRelevantPersonnelClick() { this.$refs.listOfRelevantPersonnelRef.getData() }, @@ -329,29 +305,6 @@ } } - .box-content { - width: 100%; - display: flex; - justify-content: space-between; - - .box-content-left { - width: calc(50% - 12px); - height: 300px; - border: 2px #eff1f3 solid; - - #main { - width: 100%; - height: 100%; - } - } - - .box-content-right { - width: calc(50% - 12px); - height: 300px; - border: 2px #eff1f3 solid; - } - } - @media screen and (min-width: 600px) and (max-width: 1600px) { .process-content-right-top { diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue new file mode 100644 index 000000000..2c57f37e6 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index 08b73d8d9..c2dee2045 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -9,6 +9,9 @@ @close="handleCancel" :visible="visible">
+ + {{$t('query')}} {{$t('publishComment')}}
@@ -29,8 +32,8 @@
-
-
+
+
@@ -41,7 +44,7 @@
{{val.content}}
-
+
@@ -99,6 +102,7 @@ visible: false, dataList: [], formInline: {}, + commentText:'', loading: false, title: this.$t('comment'), confirmLoading: false, @@ -143,6 +147,9 @@ this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) + }, + submitQuery(){ + }, getList() { this.loading = true @@ -336,12 +343,6 @@ line-height: 48px; } - .box-input { - display: inline-block; - height: 38px; - width: 100%; - } - .itemModel { width: calc(100% - 64px); display: inline-block; @@ -361,4 +362,8 @@ text-align: center; margin-top: 40px; } + .box-input{ + width: calc(100% - 168px); + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue new file mode 100644 index 000000000..e237b605a --- /dev/null +++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue @@ -0,0 +1,145 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue new file mode 100644 index 000000000..a81056a91 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue @@ -0,0 +1,113 @@ + + + + + \ No newline at end of file From 298e699d7c426d8091ce8611e5a3e1990eef8f50 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 5 May 2022 14:59:38 +0800 Subject: [PATCH 06/21] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../parameterlist/components/addModel.vue | 70 ++++++++++++------- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bea14f54d..1fe0d26f7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered', templateName: 'template Name', pleaseSelectData: 'please Select Data', templateCopy: 'template Copy', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 6d00c2a16..42eaf3398 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -712,6 +712,7 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + onlyThree: '只能输入字母，数字，横杠（-）三种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index a51b72e89..48cec5a17 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -18,7 +18,7 @@ {{$t('NiONumber')}}
- + {{$t('Required')}}
- + {{$t('yes')}} @@ -49,7 +49,7 @@ {{$t('ParameterName')}}
- + {{$t('parameterBatch')}}
- + {{$t('areaOfResponsibility')}} - + {{$t('ParameterDescription')}} - + {{$t('certificationCategory')}} - + {{$t('controlAlternatives')}} - + {{$t('standard')}} - + {{$t('ParameterName')}} - + {{$t('ParameterDescription')}} - + Date: Thu, 5 May 2022 15:17:36 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../src/components/libraryAddForm/index.vue | 2 +- .../components/virtualListDetails.vue | 12 +++--- .../views/documentTools/virtualList/index.vue | 42 +++++++++++++++---- .../projectManagement/components/addModel.vue | 18 ++++---- 6 files changed, 56 insertions(+), 22 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1fe0d26f7..0ee398229 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -745,4 +745,6 @@ module.exports = { noComment:'No comment', theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received', notEvaluated:'Not evaluated', + cannotExceed:'cannot exceed', + Characters:'Characters', } \ 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 42eaf3398..387019e1f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -750,4 +750,6 @@ module.exports = { noComment:'暂无评论', theReceived:'所有数据的清单确认状态和任务确认状态都为接受才可以定版', notEvaluated:'未评估', + cannotExceed:'不能超出', + Characters:'个字符', } \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 8aa995b6e..a799a8c5c 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -429,7 +429,7 @@ || res.field_show_type === '11') { rule.push({ max: res.db_length, - message: res.db_field_txt + '不能超出' + res.db_length + '个字符', + message: res.db_field_txt + this.$t('cannotExceed') + res.db_length + this.$t('Characters'), trigger: 'blur' }) } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 6af68867a..ca8874ad5 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -290,6 +290,12 @@ fixed: 'left', scopedSlots: { customRender: 'titleName' } }, + { + title: this.$t('zoneOfApplication'), + align: 'center', + ellipsis: true, + dataIndex: 'region_dictText' + }, { title: this.$t('scopeOfApplication'), align: 'center', @@ -308,12 +314,6 @@ ellipsis: true, dataIndex: 'correspondingStandardName' }, - { - title: this.$t('zoneOfApplication'), - align: 'center', - ellipsis: true, - dataIndex: 'region_dictText' - }, { title: this.$t('implementationCategory'), align: 'center', diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 5f50148c6..958acdffc 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -99,7 +99,7 @@ @@ -107,12 +107,13 @@
+ * {{$t('instructionForUse')}}
- + + v-model.trim="formInline.useExplain" :rows="4"/>
@@ -139,11 +140,30 @@ selectedRowKeys: [], formInline: {}, rules: { - name: [{ - required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), - trigger: 'blur' - }] + name: [ + { + required: true, + message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + useExplain: [ + { + required: true, + message: this.$t('instructionForUse') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 500, + message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ] }, visible: false, dataSource: [], @@ -200,6 +220,9 @@ this.title = '新增' this.formInline = {} this.visible = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, //批量删除 handleDel() { @@ -229,6 +252,9 @@ this.title = '编辑' this.formInline = JSON.parse(JSON.stringify(item)) this.visible = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, //撤回 withdraw(val) { diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index b6b65f655..2c828ffe6 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -218,34 +218,34 @@ message: this.$t('pleaseEnterTheCorrectWebAddress') } ], - projectNameId:[ + projectNameId: [ { required: true, message: this.$t('entryName') + this.$t('cannotEmpty'), trigger: 'change' } ], - targetMarket:[ + targetMarket: [ { required: true, message: this.$t('targetMarket') + this.$t('cannotEmpty'), trigger: 'change' } ], - projectStatus:[ + projectStatus: [ { required: true, message: this.$t('projectStatus') + this.$t('cannotEmpty'), trigger: 'change' } ], - studioEngineerName:[ + studioEngineerName: [ { required: true, message: this.$t('StudioEngineer') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, disabled: false, projectNameList: [], @@ -269,12 +269,16 @@ this.visible = true this.title = '新增' this.formInline = {} + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, editModel(value) { this.visible = true this.title = '编辑' this.$nextTick(() => { this.formInline = value + this.$refs.ruleForm.clearValidate() }) }, handleCancel() { @@ -323,9 +327,9 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - projectNameChange(value){ + projectNameChange(value) { console.log(value) - }, + } } } From d435364585821bea85587293ba7e93447c070be9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 15:23:51 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 387019e1f..42c8141c4 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -55,7 +55,7 @@ module.exports = { close: '关闭', no: '没有任何', click: '点击', - add: '新增', + add: '添加', FilterMatching: '过滤条件匹配', AllMatching: '（所有条件都要求匹配）', AnyOneMatches: '（条件中的任意一个匹配）', From e77a370f2413536c6729d8a0dfffb0779ed19e01 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 5 May 2022 15:38:02 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AE=9A=E7=89=88=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectVersionInfoEOController.java | 171 +++++++++++++ .../project/entity/ProjectVersionInfoEO.java | 239 ++++++++++++++++++ .../mapper/ProjectVersionInfoEOMapper.java | 17 ++ .../mapper/xml/ProjectVersionInfoEOMapper.xml | 45 ++++ .../service/IProjectVersionInfoEOService.java | 67 +++++ .../ProjectHistoryVersionsEOServiceImpl.java | 32 ++- .../impl/ProjectVersionInfoEOServiceImpl.java | 101 ++++++++ 7 files changed, 671 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectVersionInfoEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectVersionInfoEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectVersionInfoEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectVersionInfoEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectVersionInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectVersionInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectVersionInfoEOController.java new file mode 100644 index 000000000..dbb8a496b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectVersionInfoEOController.java @@ -0,0 +1,171 @@ +package com.jero.modules.project.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.project.entity.ProjectVersionInfoEO; +import com.jero.modules.project.service.IProjectVersionInfoEOService; +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: 2022-05-05 + * @Version: V1.0 + */ +@Api(tags="法规清单定板详情表") +@RestController +@RequestMapping("/project/projectVersionInfoEO") +@Slf4j +public class ProjectVersionInfoEOController extends JeroController { + @Autowired + private IProjectVersionInfoEOService projectVersionInfoEOService; + + /** + * 分页列表查询 + * + * @param projectVersionInfoEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "法规清单定板详情表-分页列表查询") + @ApiOperation(value="法规清单定板详情表-分页列表查询", notes="法规清单定板详情表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectVersionInfoEO projectVersionInfoEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectVersionInfoEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectVersionInfoEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "法规清单定板详情表-列表查询") + @ApiOperation(value="法规清单定板详情表-列表查询", notes="法规清单定板详情表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectVersionInfoEO projectVersionInfoEO, + HttpServletRequest req) { + List list = projectVersionInfoEOService.queryInfoList(projectVersionInfoEO,req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectVersionInfoEO + * @return + */ + @AutoLog(value = "法规清单定板详情表-添加") + @ApiOperation(value="法规清单定板详情表-添加", notes="法规清单定板详情表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectVersionInfoEO projectVersionInfoEO) { + projectVersionInfoEOService.add(projectVersionInfoEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectVersionInfoEO + * @return + */ + @AutoLog(value = "法规清单定板详情表-编辑") + @ApiOperation(value="法规清单定板详情表-编辑", notes="法规清单定板详情表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectVersionInfoEO projectVersionInfoEO) { + projectVersionInfoEOService.editById(projectVersionInfoEO); + 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) { + projectVersionInfoEOService.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.projectVersionInfoEOService.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) { + ProjectVersionInfoEO projectVersionInfoEO = projectVersionInfoEOService.queryById(id); + if(projectVersionInfoEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectVersionInfoEO); + } + + /** + * 导出excel + * + * @param request + * @param projectVersionInfoEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectVersionInfoEO projectVersionInfoEO) { + return super.exportXls(request, projectVersionInfoEO, ProjectVersionInfoEO.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, ProjectVersionInfoEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java new file mode 100644 index 000000000..92ff8e36e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java @@ -0,0 +1,239 @@ +package com.jero.modules.project.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: 2022-05-05 + * @Version: V1.0 + */ +@Data +@TableName("project_version_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_version_info对象", description="法规清单定板详情表") +public class ProjectVersionInfoEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.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 java.lang.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 java.lang.String sysOrgCode; + + /**法规清单版本id*/ + @Excel(name = "法规清单版本id", width = 15) + @ApiModelProperty(value = "法规清单版本id") + private java.lang.String historyVersionsId; + + /**项目库id*/ + @Excel(name = "项目库id", width = 15) + @ApiModelProperty(value = "项目库id") + private java.lang.String projectLibraryId; + + /**编号*/ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private java.lang.String serialNumber; + + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + + /**子标题*/ + @Excel(name = "子标题", width = 15) + @ApiModelProperty(value = "子标题") + private java.lang.String subtitle; + + /**对应标准*/ + @Excel(name = "对应标准", width = 15) + @ApiModelProperty(value = "对应标准") + private java.lang.String correspondingStandard; + + /**实施类别*/ + @Excel(name = "实施类别", width = 15) + @ApiModelProperty(value = "实施类别") + private java.lang.String implementType; + + /**新车型实施日期*/ + @Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "新车型实施日期") + private java.util.Date xin1Che1Xing2Shi2Shi1Ri4Qi1; + + /**在产车实施日期*/ + @Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "在产车实施日期") + private java.util.Date implementTime; + + /**认证类型*/ + @Excel(name = "认证类型", width = 15) + @ApiModelProperty(value = "认证类型") + private java.lang.String attestationType; + + /**认证级别*/ + @Excel(name = "认证级别", width = 15) + @ApiModelProperty(value = "认证级别") + private java.lang.String attestationRank; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 15) + @ApiModelProperty(value = "WVTA ID") + private java.lang.String wvtaId; + + /**责任领域*/ + @Excel(name = "责任领域", width = 15) + @ApiModelProperty(value = "责任领域") + private java.lang.String dutyTerritory; + + /**法规工程师*/ + @Excel(name = "法规工程师", width = 15) + @ApiModelProperty(value = "法规工程师") + private java.lang.String regulationOwnerId; + + /**认证工程师*/ + @Excel(name = "认证工程师", width = 15) + @ApiModelProperty(value = "认证工程师") + private java.lang.String homologationEngineerId; + + /**工程接口人*/ + @Excel(name = "工程接口人", width = 15) + @ApiModelProperty(value = "工程接口人") + private java.lang.String engineeringInterfacePerson; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + + /**设计符合性确认-交付物类型*/ + @Excel(name = "设计符合性确认-交付物类型", width = 15) + @ApiModelProperty(value = "设计符合性确认-交付物类型") + private java.lang.String designDeliverableType; + + /**设计符合性确认-交付物模板*/ + @Excel(name = "设计符合性确认-交付物模板", width = 15) + @ApiModelProperty(value = "设计符合性确认-交付物模板") + private java.lang.String designDeliverableTemplate; + + /**设计符合性确认-发起人*/ + @Excel(name = "设计符合性确认-发起人", width = 15) + @ApiModelProperty(value = "设计符合性确认-发起人") + private java.lang.String designInitiator; + + /**设计符合性确认-责任人*/ + @Excel(name = "设计符合性确认-责任人", width = 15) + @ApiModelProperty(value = "设计符合性确认-责任人") + private java.lang.String designDuty; + + /**设计符合性确认-截止时间*/ + @Excel(name = "设计符合性确认-截止时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "设计符合性确认-截止时间") + private java.util.Date designDueDate; + + /**prehomo确认-交付物类型*/ + @Excel(name = "prehomo确认-交付物类型", width = 15) + @ApiModelProperty(value = "prehomo确认-交付物类型") + private java.lang.String prehomoDeliverableType; + + /**prehomo确认-交付物模板*/ + @Excel(name = "prehomo确认-交付物模板", width = 15) + @ApiModelProperty(value = "prehomo确认-交付物模板") + private java.lang.String prehomoDeliverableTemplate; + + /**prehomo确认-发起人*/ + @Excel(name = "prehomo确认-发起人", width = 15) + @ApiModelProperty(value = "prehomo确认-发起人") + private java.lang.String prehomoInitiator; + + /**prehomo确认-责任人*/ + @Excel(name = "prehomo确认-责任人", width = 15) + @ApiModelProperty(value = "prehomo确认-责任人") + private java.lang.String prehomoDuty; + + /**prehomo确认-截止时间*/ + @Excel(name = "prehomo确认-截止时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "prehomo确认-截止时间") + private java.util.Date prehomoDueDate; + + /**验证符合性确认-交付物类型*/ + @Excel(name = "验证符合性确认-交付物类型", width = 15) + @ApiModelProperty(value = "验证符合性确认-交付物类型") + private java.lang.String verifyDeliverableType; + + /**验证符合性确认-交付物模板*/ + @Excel(name = "验证符合性确认-交付物模板", width = 15) + @ApiModelProperty(value = "验证符合性确认-交付物模板") + private java.lang.String verifyDeliverableTemplate; + + /**验证符合性确认-发起人*/ + @Excel(name = "验证符合性确认-发起人", width = 15) + @ApiModelProperty(value = "验证符合性确认-发起人") + private java.lang.String verifyInitiator; + + /**验证符合性确认-责任人*/ + @Excel(name = "验证符合性确认-责任人", width = 15) + @ApiModelProperty(value = "验证符合性确认-责任人") + private java.lang.String verifyDuty; + + /**验证符合性确认-截止时间*/ + @Excel(name = "验证符合性确认-截止时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "验证符合性确认-截止时间") + private java.util.Date verifyDueDate; + + /**任务发布状态*/ + @Excel(name = "任务发布状态", width = 15) + @ApiModelProperty(value = "任务发布状态") + private java.lang.String taskReleaseStatus; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectVersionInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectVersionInfoEOMapper.java new file mode 100644 index 000000000..dc62733db --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectVersionInfoEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectVersionInfoEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 法规清单定板详情表 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface ProjectVersionInfoEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectVersionInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectVersionInfoEOMapper.xml new file mode 100644 index 000000000..2dd2368a0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectVersionInfoEOMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectVersionInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectVersionInfoEOService.java new file mode 100644 index 000000000..09c218886 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectVersionInfoEOService.java @@ -0,0 +1,67 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectVersionInfoEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 法规清单定板详情表 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +public interface IProjectVersionInfoEOService extends IService { + + /** + * 保存 + * + * @param projectVersionInfoEO + * @return + */ + void add(ProjectVersionInfoEO projectVersionInfoEO); + + /** + * 更新 + * + * @param projectVersionInfoEO + * @return + */ + void editById(ProjectVersionInfoEO projectVersionInfoEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectVersionInfoEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + + List queryInfoList(ProjectVersionInfoEO projectVersionInfoEO, + HttpServletRequest req); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java index deeb25fca..47f03e13f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java @@ -1,9 +1,18 @@ package com.jero.modules.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.project.entity.ProjectHistoryVersionsEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectVersionInfoEO; import com.jero.modules.project.mapper.ProjectHistoryVersionsEOMapper; import com.jero.modules.project.service.IProjectHistoryVersionsEOService; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectVersionInfoEOService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -17,6 +26,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl implements IProjectHistoryVersionsEOService { + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + @Autowired + private IProjectVersionInfoEOService iProjectVersionInfoEOService; /** * 保存 * @@ -29,7 +42,24 @@ public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLawsInventoryEO::getProjectLibraryId,projectHistoryVersionsEO.getProjectLibraryId()); + List projectLawsInventoryEOS = projectLawsInventoryEOService.list(wrapper); + List projectVersionInfoEOS = new ArrayList<>(); + if(projectLawsInventoryEOS.size() != 0){ + for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) { + ProjectVersionInfoEO projectVersionInfoEO = new ProjectVersionInfoEO(); + projectVersionInfoEO.setHistoryVersionsId(projectHistoryVersionsEO.getId()); + BeanUtils.copyProperties(projectLawsInventoryEO, projectVersionInfoEO); + projectVersionInfoEOS.add(projectVersionInfoEO); + } + } + if(projectVersionInfoEOS.size() != 0){ + iProjectVersionInfoEOService.saveBatch(projectVersionInfoEOS); + } + } /** * 更新 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectVersionInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectVersionInfoEOServiceImpl.java new file mode 100644 index 000000000..a3566144b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectVersionInfoEOServiceImpl.java @@ -0,0 +1,101 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectVersionInfoEO; +import com.jero.modules.project.mapper.ProjectVersionInfoEOMapper; +import com.jero.modules.project.service.IProjectVersionInfoEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description: 法规清单定板详情表 + * @Author: jero-boot + * @Date: 2022-05-05 + * @Version: V1.0 + */ +@Service +public class ProjectVersionInfoEOServiceImpl extends ServiceImpl implements IProjectVersionInfoEOService { + + /** + * 保存 + * + * @param projectVersionInfoEO + * @return + */ + @Override + public void add(ProjectVersionInfoEO projectVersionInfoEO) { + Date now = new Date(); + projectVersionInfoEO.setCreateTime(now); + projectVersionInfoEO.setUpdateTime(now); + save(projectVersionInfoEO); + } + + /** + * 更新 + * + * @param projectVersionInfoEO + * @return + */ + @Override + public void editById(ProjectVersionInfoEO projectVersionInfoEO) { + Date now = new Date(); + projectVersionInfoEO.setUpdateTime(now); + saveOrUpdate(projectVersionInfoEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectVersionInfoEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public List queryInfoList(ProjectVersionInfoEO projectVersionInfoEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectVersionInfoEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + List projectVersionInfoEOS = this.list(queryWrapper); + return projectVersionInfoEOS; + } +} From bd39c3076e7f5f5fd845cdc168bbe10e874a69c0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 16:16:21 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/commentList.vue | 6 +- .../components/historicalVersionList.vue | 42 +- .../historicalVersion/index.vue | 673 ++++++++++++++++++ 5 files changed, 705 insertions(+), 22 deletions(-) create mode 100644 jero-web/src/views/projectManagement/historicalVersion/index.vue diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index b2be44bb8..8dc37c162 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,7 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/ProjectDetails' || this.$route.path == '/handshakeProcess' || + this.$route.path == '/historicalVersion' || this.$route.path == '/processDetails') { return false } else { diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index cbe8e896f..b63bf562a 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -342,6 +342,11 @@ export const constantRouterMap = [ name: 'handshakeProcess', component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/handshakeProcess/index') }, + { + path: '/historicalVersion', + name: 'historicalVersion', + component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/historicalVersion/index') + }, { path: '/processDetails', name: 'processDetails', diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index c2dee2045..65b9546e9 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -10,7 +10,7 @@ :visible="visible">
+ v-model="commentContent"> {{$t('query')}} {{$t('publishComment')}}
@@ -102,7 +102,7 @@ visible: false, dataList: [], formInline: {}, - commentText:'', + commentContent:'', loading: false, title: this.$t('comment'), confirmLoading: false, @@ -153,7 +153,7 @@ }, getList() { this.loading = true - getAction(this.url.list, { projectLibraryId: this.$route.query.id }).then((res) => { + getAction(this.url.list, { projectLibraryId: this.$route.query.id,commentContent:this.commentContent }).then((res) => { if (res.success) { this.loading = false this.dataList = res.result || [] diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue index 4066ed627..f545a7c82 100644 --- a/jero-web/src/views/projectManagement/components/historicalVersionList.vue +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -24,31 +24,31 @@ diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue new file mode 100644 index 000000000..01f51a70e --- /dev/null +++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue @@ -0,0 +1,673 @@ + + + + + + \ No newline at end of file From ba709306e6ea19fbd2bfd5d5b53a643812a47613 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 5 May 2022 16:25:47 +0800 Subject: [PATCH 11/21] =?UTF-8?q?[add]=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 4 +- .../parameterlist/components/addModel.vue | 26 +++++++------ .../ProjectDetails/index.vue | 4 +- .../components/TaskParameterCollection.vue | 38 +++++++++---------- 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0ee398229..1ee1c249a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + collectionCompletionTime: 'collection Completion Time', + parameterTemplateName: 'parameter Template Name', onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered', templateName: 'template Name', pleaseSelectData: 'please Select Data', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 42c8141c4..965a20fe0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -686,7 +686,7 @@ module.exports = { projectDetails:'项目详情', listOfRegulations:'法规清单', taskList:'任务清单', - TaskParameterCollection:'任务参数收集', + TaskParameterCollection:'认证参数收集', nonConformance:'未符合项', deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间', prehomoConfirmationDeadline:'PreHomo确认截止时间', @@ -712,6 +712,8 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + collectionCompletionTime: '收集完成时间', + parameterTemplateName: '参数模板名称', onlyThree: '只能输入字母，数字，横杠（-）三种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 48cec5a17..486d48376 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -202,7 +202,7 @@ + @click="clickButtonToUpload('fileTemplateConnectId')"> {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' || formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}} @@ -376,20 +376,17 @@ export default { this.formInline = { ...this.formInline } }, clickButtonToUpload(item) { - // this.$refs.uploadFile.perentHandleFunc() - // this.$refs.uploadFile.state = item.flag this.$refs.uploadFile.visible = true - // this.uploadName = item.db_field_name - // getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => { - // if (res.success) { - // this.$refs.uploadFile.perentHandleFunc(res.result) - // } else { - // this.$refs.uploadFile.perentHandleFunc() - // } - // }) + getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) }, Onchangelabel(val) { - + console.log(val,'val,,,,') // this.formInline.certCategoryParamsInfoEOList = [] val.forEach((item) => { this.contentList.push({ @@ -436,6 +433,11 @@ export default { this.$nextTick(() => { this.formInline = value }) + // if(value.certCategoryParamsInfoEOList.length > 0 ) { + // this.contentList = value.certCategoryParamsInfoEOList + // } + console.log(this.contentList,'this.contentList') + console.log(value.certCategoryParamsInfoEOList,'lllll') }, handleCancel() { this.visible = false diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index e1cdaba08..f51b28255 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -39,7 +39,7 @@ {{$t('taskList')}} -
+
{{$t('TaskParameterCollection')}}
@@ -52,7 +52,7 @@ - +
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 3c61dbeb6..c983bda63 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -4,10 +4,10 @@
-
- {{$t('certificationType')}} +
+ {{$t('title')}}
-
@@ -70,19 +70,9 @@ return{ columns:[ { - title: this.$t('NiONumber'), + title: this.$t('title'), align: 'center', - dataIndex: 'NiONumber', - }, - { - title: this.$t('ParameterName'), - align: 'center', - dataIndex: 'ParameterName', - }, - { - title: this.$t('ParameterDescription'), - align: 'center', - dataIndex: 'ParameterDescription', + dataIndex: 'title', }, { title: this.$t('status'), @@ -90,20 +80,30 @@ dataIndex: 'status', }, { - title: this.$t('Operator'), + title: this.$t('parameterTemplateName'), align: 'center', - dataIndex: 'Operator', + dataIndex: 'ParameterDescription', }, { - title: this.$t('operationTime'), + title: this.$t('collectionCompletionTime'), align: 'center', - dataIndex: 'operationTime', + dataIndex: 'status', }, { title: this.$t('Version'), align: 'center', dataIndex: 'Version', }, + { + title: this.$t('creator'), + align: 'center', + dataIndex: 'Version', + }, + { + title: this.$t('createTime'), + align: 'center', + dataIndex: 'Version', + }, { title: this.$t('operation'), align: 'center', From d85d5953881d294727d3b0e33d3f62d71d6c1df6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 16:31:16 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 6 ++++++ .../components/virtualListDetails.vue | 1 + .../components/listOfRegulations.vue | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 6a8cdc022..009755729 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -44,6 +44,10 @@ paramsTemplateId: { type: String, default: '' + }, + projectLibraryId: { + type: String, + default: '' } }, data() { @@ -60,6 +64,8 @@ return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId } else if (this.paramsTemplateId) { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '¶msTemplateId=' + this.paramsTemplateId + } else if (this.projectLibraryId) { + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId } return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index ca8874ad5..e703343cd 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -575,6 +575,7 @@ let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { ...this.queryParam, + ...this.queryParamQuery, ids: selectedRowKeys.join(','), dummyInventoryBaseId: this.$route.query.id } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 335341baf..b8538103f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -67,7 +67,8 @@ \ No newline at end of file From db078cd7bfe93ffd2d542da69f34899ab63fb21d Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 5 May 2022 17:57:25 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E7=BC=96=E8=BE=91-=E8=AE=A4=E8=AF=81=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E9=A1=B5=E7=AD=BE=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/service/impl/ParamsInfoEOServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 4849119a2..784f30a38 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -236,6 +236,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByNioNumber(paramsInfoEO.getNioNumber(), paramsInfoEO.getParamsTemplateId()); + + // 认证类别 数据字典 map + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + Map certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c->c.getItemValue(), c->c.getItemText())); + + for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) { + certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + } paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); return paramsInfoEO; } From e7024b87c1af729f39982f0f93becbaaf29ffff1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 18:06:46 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/virtualListDetails.vue | 6 +- .../projectManagement/components/TaskList.vue | 188 +++++++++++------- .../components/listOfRegulations.vue | 4 +- 5 files changed, 123 insertions(+), 81 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 167f675b5..b9dba09d0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -752,4 +752,7 @@ module.exports = { notEvaluated:'Not evaluated', cannotExceed:'cannot exceed', Characters:'Characters', + standardInformation:'standardInformation', + VirtualList:'VirtualList', + importTemplate:'import template', } \ 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 dda63194b..0f3b73146 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -580,6 +580,7 @@ module.exports = { selectDisplayList: '请选择是否列表展示', documentSplitDisplay: '文档拆分模块展示', VirtualListName: '虚拟清单名称', + VirtualList:'虚拟清单', listStatus: '清单状态', creater: '创建人', withdraw: '撤回', @@ -757,4 +758,6 @@ module.exports = { notEvaluated:'未评估', cannotExceed:'不能超出', Characters:'个字符', + standardInformation:'标准信息', + importTemplate:'导入模板', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index e703343cd..78812a1f0 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -138,7 +138,7 @@ {{$t('deleteLib')}} - {{text && text.length > 20 ? text.slice(0,19)+'...':text}} + {{text && text.length > 10 ? text.slice(0,9)+'...':text}} {{record.designDeliverableType_dictText}}
@@ -568,7 +568,7 @@ }, //模板下载 handleModule() { - downloadFile(this.url.exportTemplate, '模板下载.xls', {}) + downloadFile(this.url.exportTemplate, this.$t('VirtualList')+this.$t('importTemplate')+'.xls', {}) }, //导出 handleExport() { @@ -579,7 +579,7 @@ ids: selectedRowKeys.join(','), dummyInventoryBaseId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.name + '虚拟清单.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList')+'.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 6fe7f565c..786344d66 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -43,14 +43,57 @@
+
+
+ GB-7258-2017
+ 及东盟火车大师傅但是 +
+ +
+
+
+ 1212sdfdsf
+ 责任领土 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
+
+ + 实验通过 + +
+
+
+
+
+
@@ -59,9 +102,10 @@ \ No newline at end of file +import { putAction,postAction,getAction,deleteAction } from '@/api/manage' +export default { + name: 'diolagArea', + components:{ + + }, + data(){ + return{ + title:this.$t('add'), + queryParams:{ + pageNo:1, + pageSize:10 + }, + total:0, + selectedRowKeys: [], + loading: false, + ipagination:true, + editId:'', + columns: [ + { + title: this.$t('zoneOfApplication'), + dataIndex: 'showArea', + key: 'showArea', + align: "center", + ellipsis: true, + }, + { + title: this.$t('parameterTemplate'), + align: "center", + dataIndex: 'enName', + ellipsis: true, + } + ], + newVisible:false, + labelCol: { + xs: { span: 24 }, + sm: { span: 7 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 14 }, + }, + form: { + isModel:'1', + showArea:'', + enName:'', + sort:'' + }, + rules: { + isModel:[ + { required: true, message: this.$t('PleaseSelectModule'), trigger: 'change' }, + + ], + enName:[ + { max: 100, message: this.$t('CannotExceed100characters'), trigger: 'blur' }, + + ], + showArea:[ + { required: true, message: this.$t('enterDisplayArea'), trigger: 'blur' }, + { min:1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' }, + ], + sort:[ + { required: true, message: this.$t('enterSortingNumber'), trigger: 'change' }, + ] + }, + areaTable:[], + flag:false, //表单提交标识 + spinLoading:false, + } + }, + props:{ + // areaTable:Array + }, + mounted() { + this.loadData() + }, + methods:{ + loadData(){ + this.loading=true + let params={ + ...this.queryParams + } + postAction(`tag/onlCgformArea/page`,params).then(res=>{ + if(res.success){ + this.areaTable=[...res.result.records] + this.total=res.result.total + } + }).finally(()=>{ + this.loading=false + }) + }, + onSelectChange(selectedRowKeys) { + // console.log('selectedRowKeys changed: ', selectedRowKeys); + this.selectedRowKeys = selectedRowKeys; + }, + handleTableChange(){ + + }, + showModal() { + this.title=this.$t('add') + this.newVisible = true; + this.form={ + + } + }, + //新增 + hideModal() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.flag=true + this.spinLoading=true + //编辑 + if(this.form.id){ + putAction(`tag/onlCgformArea/edit`,this.form).then((res)=>{ + if(res.success){ + this.$message.success(this.$t('OperationSuccessful')); + this.loadData() + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }else{ + this.$message.warning(res.message) + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + } + }).finally(()=>{ + this.flag=false + this.spinLoading=false + this.newVisible = false; + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }) + }else{ + //新增 + postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{ + if(res.success){ + this.$message.success( this.$t('OperationSuccessful')); + this.loadData() + this.form={ + isModel:'', + showArea:'', + enName:'', + sort:'' + } + }else{ + // this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) + + } + } + ).finally(()=>{ + this.flag=false + this.spinLoading=false + this.newVisible = false; + }) + } + + } else { + // console.log('error submit!!'); + return false; + } + }); + + }, + cancelModel(){ + this.newVisible=false + this.$refs.ruleForm.resetFields(); + }, + //删除按钮 + deleteArea(val){ + this.$confirm({ + title: this.$t('confirmDeletion'), + content: '', + onOk: + async () => { + getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')); + if(this.areaTable.length==1&&this.queryParams.pageNo!=1){ + this.queryParams.pageNo=this.queryParams.pageNo-1 + } + this.loadData() + }else{ + // this.$message.warning(res.message) + if(res.message=='该展示区域有关联数据，无法删除！'){ + this.$message.warning(this.$t('noDelete')) + }else{ + this.$message.warning(this.$t('operationFailed')); + } + } + }) + } + }) + }, + //编辑按钮 + editArea(val){ + this.title=this.$t('edit') + this.newVisible = true; + let params={ + id:val + } + getAction(`tag/onlCgformArea/queryById`, params).then((res) => { + if(res.success){ + this.form={...res.result} + // this.$emit('updateOk',res.result) + + } + }) + }, + //点击页数 + onChangePage(page,pageSize){ + this.queryParams.pageNo = page + this.loadData() + }, + //一页显示条数 + SizeChange(page,pageSize){ + this.queryParams.pageSize = pageSize + this.queryParams.pageNo=1 + this.loadData() + }, + //正则替换小数点 + limitNumber(value) { + if (typeof value === 'string') { + return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0 + } else if (typeof value === 'number') { + return !isNaN(value) ? String(value).replace(/\./g, '') : 0 + } else { + return 0 + } + } + } +} + + + + \ No newline at end of file From 7377e8ec27dee1d8682b6c8b9c4cf00df36062c3 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 18:53:31 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskList.vue | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 786344d66..02e2c0a3a 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -51,38 +51,30 @@ :columns="columns" >
-
- GB-7258-2017
- 及东盟火车大师傅但是 -
- + GB-7258-2017
+ 及东盟火车大师傅但是
-
- 1212sdfdsf
- 责任领土 -
+ 1212sdfdsf
+ 责任领土
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 + 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪 +
+
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 -
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 -
+ 截止时间: 2022-06-01
+ 流程状态: 待审核
+ 待追踪
@@ -247,21 +239,31 @@ } .box-left { - float: left; position: relative; - left: 50% } - .content { - float: left; - position: relative; - left: -50%; - text-align: left; + .content-box { + position: absolute; + width: calc(100% + 32px); + height: calc(100% + 32px); + top: -16px; + left: -16px; + border: 1px seagreen solid; + } + + .content-box-jiao { + position: absolute; + right: 0; + width: 0; + height: 0; + border-right: 30px solid red; + border-bottom: 30px solid transparent } .box-content { margin-bottom: 8px; display: inline-block; + text-align: left; } .box-content-color {