From 0de88063b90843a864b36647aeed8d4195f092c2 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 25 May 2022 20:10:59 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=88=B6=E7=BA=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysCategoryController.java | 5 ++--- .../jero/modules/system/service/ISysCategoryService.java | 2 +- .../modules/system/service/impl/SysCategoryServiceImpl.java | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 659e28fe9..177cc374b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -28,7 +28,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -100,8 +99,8 @@ public class SysCategoryController { @AutoLog(value = "标签内容-查询字典配置的父级名称") @ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称") @GetMapping(value = "/queryPid") - public Result> queryPid() { - List list = sysCategoryService.queryPid(); + public Result> queryPid(SysCategory sysCategory) { + List list = sysCategoryService.queryPid(sysCategory); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 793ced8fe..1cb646f44 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -90,5 +90,5 @@ public interface ISysCategoryService extends IService { void setEditOrderNum(SysCategory sysCategory); - List queryPid(); + List queryPid(SysCategory sysCategory); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index d060ca6d6..f66abd579 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -387,9 +387,11 @@ public class SysCategoryServiceImpl extends ServiceImpl queryPid() { + public List queryPid(SysCategory sysCategory) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pid",0); + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("pid",0) + .orderByDesc("sort_order"); List list = list(queryWrapper); return list; } From 1a645200cd539614ad3b6545cc64049e44de7f6e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 25 May 2022 20:40:35 +0800 Subject: [PATCH 02/33] =?UTF-8?q?bug=2052998-=E6=B7=BB=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitInfoController.java | 2 +- .../service/ISarFileSplitInfoService.java | 4 ++ .../impl/SarFileSplitInfoServiceImpl.java | 48 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index b31d4322b..34a4c5265 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -243,7 +243,7 @@ public class SarFileSplitInfoController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { - List> list = languageSwitchService.getHeader(flag, cut); + List> list = sarFileSplitInfoService.getHeader(flag, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index 012516850..a0cb23233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import java.util.List; +import java.util.Map; /** * @Description: 文档拆分表 @@ -65,4 +66,7 @@ public interface ISarFileSplitInfoService extends IService { boolean bindToDocumentLibrary(String id, String connectId, String fileName); void dataProcessing(String cut, List sarFileSplitInfoEOList); + + List> getHeader(String flag, String cut); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 9a4b4b717..b34083705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -10,6 +10,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -263,4 +265,50 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){ + map.put("urlClick","true"); + } + if("file_name".equals(onlCgformField.getDbFieldName()) + || "serial_number".equals(onlCgformField.getDbFieldName()) + || "title".equals(onlCgformField.getDbFieldName())){ + //跳转详情的标识 + map.put("click","true"); + } + //日期添加排序标识 + if ("create_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + + String dbFieldName = onlCgformField.getDbFieldName(); + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); + + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } + } From 3481927cb03de1aefc620c837db8e30a27238a70 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 09:26:22 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 8 ++++---- .../ProjectDetails/index.vue | 17 ++++++++++++++--- .../projectManagement/components/TaskList.vue | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 576123a9f..c2b7ae4a0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -73,7 +73,7 @@ module.exports = { lessOrEqual: 'Less Than Or Equal To', user: 'User', numericalValue: 'Numerical Value', - not: 'No', + not: 'No.', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Query', NoQueriesSaved: 'No Queries Were Saved', @@ -612,7 +612,7 @@ module.exports = { task: 'Task', TaskCutOffTime: 'Due Date', Transfer: 'Transfer', - CertificationDirectory: 'Certification directory', + CertificationDirectory: 'Certification Catalogue', TaskRequirements: 'Task requirements', CertificationProgress: 'Homo Progress', CurrentProjectStatusEvaluation: 'Current State', @@ -781,7 +781,7 @@ module.exports = { notEvaluated: 'Not evaluated', cannotExceed: 'Cannot exceed', Characters: 'Characters', - standardInformation: 'StandardInformation', + standardInformation: 'Standard Information', VirtualList: 'VirtualList', importTemplate: 'Import Template', verificationConfirmationDeadline: 'Verification compliance confirmation deadline', @@ -811,7 +811,7 @@ module.exports = { yellow: 'Yellow', resultReported: 'Result Reported', TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data', - number: 'No', + number: 'No.', Deadline: 'Deadline', toBeConfirmed: 'To be confirmed', designComplianceReview: 'Confirm design conformance', diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue index 15d6a4cec..58cbd9938 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue @@ -50,9 +50,9 @@
- + - +
@@ -92,6 +92,7 @@ title: this.$t('projectDetails'), textTitle: '认证参数收集', isDisplayNum: '', + areaOfResponsibility:{}, url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -144,7 +145,17 @@ this.isDisplayNum = res.result } }) - } + }, + TaskListChange(item){ + this.areaOfResponsibility = item + this.textTitle = '任务清单' + let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') + if (textColor && textColor.length > 0) { + textColor[0].classList.remove('Virtual-detail-left-text-color') + } + let text = document.getElementsByClassName('Virtual-detail-left-text') + text[2].classList.add('Virtual-detail-left-text-color') + }, } } diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 35d961293..9a11930df 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -415,7 +415,7 @@ font-size: 14px; margin-right: 16px; margin-top: 3px; - text-align: right; + text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; From 86c3443c61e6383f0234d486b29ba6aaae8d484e Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 26 May 2022 09:29:12 +0800 Subject: [PATCH 04/33] [update] 52708 --- .../documentManage/tags/dialog/DicList.vue | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 23b266d1f..16e005992 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -52,7 +52,7 @@ - + {{item.name}} @@ -131,6 +131,7 @@ editPId:'', tabletreeDataSource:[], flag:false, //提交表单标识 + parentDataPid: [] } }, watch: { @@ -249,23 +250,17 @@ this.parentVisible=true this.editPId='' // - // this.getAllTree() + this.getAllTree() } }, - // getAllTree() { - // postAction(`sys/category/queryPageList`,{ - // sysDictId:this.record.id, - // isTagDict:1 - // }).then(res=>{ - // console.log(res,'res,,,') - // // this.tabletreeDataSource=[...res.result.records] - // // this.total=res.result.total - // // let data = this.toTree(this.tabletreeDataSource) - // // this.tabletreeData=data - // // this.parentData=this.getParents - // // this.dataFlag=true - // }) - // }, + getAllTree() { + getAction(`sys/category/queryPid`,{ + sysDictId:this.record.id, + isTagDict:1 + }).then(res=>{ + this.parentDataPid = res.result + }) + }, //保存 hideModal(){ this.$refs.ruleForm.validate(valid => { From 2784f90f9bae0c6d00577b74ca0cc4c091058867 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 09:34:53 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/TaskListModel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index c8a11adfd..d081ac93b 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -74,7 +74,7 @@ - + {{ $t('blue') }} @@ -127,7 +127,7 @@ - + {{ $t('blue') }} From 25b3241625bace07124357c8f5e9b961d3c1408f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 09:50:38 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationDirectoryAdd.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue index 00c162004..ea180a2a0 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue @@ -20,7 +20,7 @@ @@ -33,7 +33,7 @@ @@ -80,7 +80,7 @@ @@ -97,7 +97,7 @@ + v-model.trim="formInline.explainInfo" :rows="4"/> From f225642c4abb6e363c68d42ec4860549b399713f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 26 May 2022 10:08:35 +0800 Subject: [PATCH 07/33] =?UTF-8?q?bug53112=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictItemController.java | 2 +- .../system/service/ISysDictItemService.java | 2 +- .../service/impl/SysDictItemServiceImpl.java | 14 +++++++++----- .../impl/DummyInventoryInfoEOServiceImpl.java | 13 +++++++------ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 0a360f37e..4f2230b87 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,7 +84,7 @@ public class SysDictItemController { @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result add(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); - sysDictItemService.setAddOrdderNum(sysDictItem); + sysDictItemService.setAddOrderNum(sysDictItem); //查询同名数据 List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId()); if(CollectionUtils.isNotEmpty(exitDictItemList)){ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 0d59ef710..f0a161cce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -31,7 +31,7 @@ public interface ISysDictItemService extends IService { */ public void updateDictDelFlag(int delFlag,String id); - void setAddOrdderNum(SysDictItem sysDictItem); + void setAddOrderNum(SysDictItem sysDictItem); void setEditOrderNum(SysDictItem sysDictItem); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 394f168f3..1a8878f04 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -57,23 +57,25 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) .eq("dict_id",sysDictItem.getDictId()) - .orderByAsc("order_num"); - queryWrapper.eq("order_num", inputOrderNum); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); + queryWrapper.eq("sort_order", inputOrderNum); Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 //设置排序 QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("order_num", inputOrderNum) + orderNumQueryWrapper.ge("sort_order", inputOrderNum) .eq("dict_id",sysDictItem.getDictId()) .eq("del_flag", CommonConstant.DEL_FLAG_0) - .orderByAsc("order_num"); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); List geOrderNumList = list(orderNumQueryWrapper); //判断相邻的序号,去掉不邻的 @@ -101,6 +103,7 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) .eq("dict_id",sysDictItem.getDictId()) + .eq("is_tag_dict",sysDictItem.getIsTagDict()) .orderByAsc("sort_order"); Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); @@ -112,6 +115,7 @@ public class SysDictItemServiceImpl extends ServiceImpl geOrderNumList = list(orderNumQueryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7d98957bb..5afc87589 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -148,7 +148,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了标准\""+serialNumber+"\""; + String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId()); } } @@ -167,7 +167,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); //查询数据库里原来的数据 @@ -234,7 +234,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准"; + String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; dummyLogEOService.updateLog(contentLog, projectId); } @@ -287,7 +287,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了\""+serialNumber+"\""; + String contentLog = username+"复制了“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, projectId); } } @@ -303,7 +303,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Thu, 26 May 2022 10:11:09 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentTools/searchCenter/index.vue | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index c309e26c2..3363b6a2e 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -11,24 +11,30 @@ {{item.db_field_txt}} - + > - + > + {{$t('query')}} + + {{$t('query')}} + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue new file mode 100644 index 000000000..31222304b --- /dev/null +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file From 14f7fee8155fe11fb3e8e7e6fdb8626a7b4bc0a0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 May 2022 14:57:03 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA(=E8=8B=B1=E6=96=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/entity/DummyInventoryInfoEOEn.java | 12 +-- .../impl/DummyInventoryInfoEOServiceImpl.java | 86 ++++++++++++++----- 2 files changed, 70 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index 7b4fb596f..d8ddb7dd4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -186,13 +186,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "design-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "design-Initiator", width = 15) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "design-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "design-Assignee", width = 15) @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; @@ -213,13 +213,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "Prehomo-Initiator", width = 15) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "Prehomo-Assignee", width = 15) @ApiModelProperty(value = "prehomo确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; @@ -240,13 +240,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "verify-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "verify-Initiator", width = 15) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "verify-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "verify-Assignee", width = 15) @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index e25515084..12c628f4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1539,7 +1539,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl fileInfos = getOssFiles(dataList); - //数据转换(文件名称,技术领域,对应标准) + //数据转换(文件名称,技术领域,对应标准,发起人,责任人) dataTransition(dataList, fileInfos,dummyInventoryInfoEO); OutputStream os = null; @@ -1714,6 +1714,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList, List fileInfos,DummyInventoryInfoEO dummyInventoryInfoEO) { //技术领域 List sysCategoryList = sysCategoryService.list(); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + List sysDictItemInitiator = dictItemList.stream().filter(e -> "fa1_qi3_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + List sysDictItemDuty = dictItemList.stream().filter(e -> "ze2_ren4_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + //文档库数据 List correspondingStandardIdList = new ArrayList<>(); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { @@ -1722,33 +1727,49 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardIdList); -// List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(lambdaQueryWrapper); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { - String correspondingStandard = inventoryInfoEO.getCorrespondingStandard(); String technologyTerritory = inventoryInfoEO.getTechnologyTerritory(); String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate(); String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate(); String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate(); - //对应标准 -// if(StringUtils.isNotBlank(correspondingStandard)){ -// StringBuilder sb = new StringBuilder(); -// for (String s : correspondingStandard.split(",")) { -// List collect = bussDocumentLibraryEOList.stream() -// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); -// if(collect.size() != 0){ -// sb.append(collect.get(0).getSerialNumber() + ","); -// }else{ -// sb.append(s + ","); -// } -// } -// if(StringUtils.isNotBlank(sb)){ -// String substring = sb.substring(0, sb.length() - 1); -// inventoryInfoEO.setCorrespondingStandard(substring); -// } -// } + //技术的发起人,责任人 + String designInitiator = inventoryInfoEO.getDesignInitiator(); + String designInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, designInitiator); + if(StringUtils.isNotBlank(designInitiatorPerson)){ + inventoryInfoEO.setDesignInitiator(designInitiatorPerson); + } + String designDuty = inventoryInfoEO.getDesignDuty(); + String designDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, designDuty); + if(StringUtils.isNotBlank(designDutyPerson)){ + inventoryInfoEO.setDesignDuty(designDutyPerson); + } + + //pre的发起人,责任人 + String prehomoInitiator = inventoryInfoEO.getPrehomoInitiator(); + String prehomoInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, prehomoInitiator); + if(StringUtils.isNotBlank(prehomoInitiatorPerson)){ + inventoryInfoEO.setPrehomoInitiator(prehomoInitiatorPerson); + } + String prehomoDuty = inventoryInfoEO.getPrehomoDuty(); + String prehomoDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, prehomoDuty); + if(StringUtils.isNotBlank(prehomoDutyPerson)){ + inventoryInfoEO.setPrehomoDuty(prehomoDutyPerson); + } + + //验证的发起人,责任人 + String verifyInitiator = inventoryInfoEO.getVerifyInitiator(); + String verifyInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, verifyInitiator); + if(StringUtils.isNotBlank(verifyInitiatorPerson)){ + inventoryInfoEO.setVerifyInitiator(verifyInitiatorPerson); + } + String verifyDuty = inventoryInfoEO.getVerifyDuty(); + String verifyDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, verifyDuty); + if(StringUtils.isNotBlank(verifyDutyPerson)){ + inventoryInfoEO.setVerifyDuty(verifyDutyPerson); + } + + //技术领域 if(StringUtils.isNotBlank(technologyTerritory)){ StringBuilder sb = new StringBuilder(); @@ -1787,6 +1808,27 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl sysDictItemList, String designInitiator) { + if(StringUtils.isNotBlank(designInitiator)){ + StringBuilder sb = new StringBuilder(); + for (String s : designInitiator.split(",")) { + List itemList = sysDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); + if(itemList.size() != 0){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + sb.append(itemList.get(0).getItemText()+","); + }else{ + sb.append(itemList.get(0).getEnName()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + } + } + return null; + } + /** * 模板名称转换 * @param fileInfos From c0dd7d66fe95128a5ca55694c8d9f9d7875f98db Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 26 May 2022 15:24:29 +0800 Subject: [PATCH 26/33] [update] 52757 --- .../documentManage/tags/tabs/TagContent.vue | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index a86adc5ed..b2fe37c53 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -52,7 +52,9 @@ - + + + Date: Thu, 26 May 2022 15:40:20 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryBaseEOServiceImpl.java | 2 +- .../home/service/impl/HomeFunctionModuleEOServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index cd25c8aac..19c77f628 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -174,7 +174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl ids = records.stream().map(DummyInventoryBaseEO::getId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids); + wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids).in(DummyReadEO::getCreateBy,sysUser.getUsername()); List dummyReadEOS = iDummyReadEOService.list(wrapper); List dummyReadIdList = dummyReadEOS.stream().map(DummyReadEO::getDummyInventoryBaseId).collect(Collectors.toList()); for (DummyInventoryBaseEO record : pageList.getRecords()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index ee0d28743..21533edcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -112,7 +112,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOList.size() == 0){ + if(homeFunctionModuleEOS.size() == 0){ if(CutEnum.EN.getValue().equals(cut)){ for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); From ba47b0e8808682f6396cf71222d27d55359303f4 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 26 May 2022 15:42:24 +0800 Subject: [PATCH 28/33] [update] 52753 --- .../documentManage/tags/dialog/DicList.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 16e005992..d0ea4621d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -57,6 +57,9 @@ + + + @@ -105,6 +108,9 @@ { required: true, message: this.$t('enterName'), trigger: 'blur' }, { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], + orderNum: [ + { required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, + ], // itemValue:[ // { required: true, message: this.$t('enterDataValue'), trigger: 'blur' }, // { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' }, @@ -195,7 +201,16 @@ }) } }, - + //正则替换小数点 + 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 + } + }, //将数据拼成树形结构 toTree(config) { config.forEach(function(item) { From a2f72851dee6a147bcf86c44e0932f121700de88 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 15:52:35 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF-=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=B4-=E7=82=B9=E5=87=BB=E6=97=B6=E9=97=B4=E8=BD=B4?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=97=A0=E6=B3=95=E5=85=A8=E5=B1=8F=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskPlanList.vue | 365 +++++++++++++++++- .../components/projectStatusAndProgress.vue | 198 +++++++++- .../projectStatusBoard/index.vue | 17 +- 3 files changed, 571 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue index d0a509823..605349b17 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -1,13 +1,372 @@ - \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue index 31222304b..743e8bed5 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue @@ -3,23 +3,213 @@
- {{this.title}} + {{this.$t('projectStatusAndProgress')}}
-
+
+ + + {{this.$t('projectStatus')}}
+ {{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}} + + + {{this.$t('CertificationProgress')}}
+ {{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}} + + + {{this.$t('listConfirmationStatus')}}
+ {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + + + {{this.$t('taskAffirmStatus')}}
+ {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + + + {{this.$t('designComplianceReview')}}
+ {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + + + {{this.$t('preHomeConfirmation')}}
+ {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + + + {{this.$t('verificationComplianceReview')}}
+ {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + +
- \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index b2a372396..bf4bae62e 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -70,6 +70,9 @@ :data-source="dataSource" :columns="columns" > + + {{text}} + {{this.$t('projectStatus')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}} @@ -374,9 +377,7 @@ myChart.resize() } myChart.on('mouseover', 'yAxis.category', function(e) { - console.log(e) let axisTip = document.querySelector('.axis-tip') - console.log(axisTip) axisTip.innerText = e.value axisTip.style.left = 100 + 'px' axisTip.style.top = (e.event.event.y) - 180 + 'px' @@ -387,6 +388,12 @@ axisTip.innerText = '' axisTip.style.display = 'none' }) + myChart.on('click', (params) => { + let newUrl = this.$router.resolve({ + path: '/TaskPlanList' + }) + window.open(newUrl.href, '_blank') + }) }, searchQuery() { this.getList() @@ -406,6 +413,12 @@ this.dataSource = [] } }) + }, + projectNameClick() { + let newUrl = this.$router.resolve({ + path: '/projectStatusAndProgress' + }) + window.open(newUrl.href, '_blank') } } } From 1875b0a4b6294aace3211fab75fc4e0604fa91d4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 16:00:03 +0800 Subject: [PATCH 30/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF-=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=B4-=E7=82=B9=E5=87=BB=E6=97=B6=E9=97=B4=E8=BD=B4?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=97=A0=E6=B3=95=E5=85=A8=E5=B1=8F=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectStatusBoard/index.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index bf4bae62e..b67d8d3d5 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -65,14 +65,12 @@ ref="table" size="middle" :loading="loading" + :customRow="projectNameClick" :pagination="false" :scroll="{x: true,y:500}" :data-source="dataSource" :columns="columns" > - - {{text}} - {{this.$t('projectStatus')}}
{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+')'}} @@ -415,10 +413,16 @@ }) }, projectNameClick() { - let newUrl = this.$router.resolve({ - path: '/projectStatusAndProgress' - }) - window.open(newUrl.href, '_blank') + return { + on: { + click: () => { + let newUrl = this.$router.resolve({ + path: '/projectStatusAndProgress' + }) + window.open(newUrl.href, '_blank') + } + } + } } } } From fe3207b63f0919daf132608985116bb37e46175f Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 26 May 2022 16:28:14 +0800 Subject: [PATCH 31/33] [update] 52753 --- jero-web/src/views/documentManage/tags/dialog/DicList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index d0ea4621d..952560c1e 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -57,8 +57,8 @@ - - + + @@ -108,7 +108,7 @@ { required: true, message: this.$t('enterName'), trigger: 'blur' }, { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' }, ], - orderNum: [ + sortOrder: [ { required: true, message: this.$t('PleaseEnterDisplayOrder'),trigger: 'blur'}, ], // itemValue:[ From 4a3b80c904d829980fdee5be1f3b34a52ae42a4e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 26 May 2022 16:40:35 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index a10e5b221..cd71f83c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1473,7 +1473,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl inputList = new ArrayList<>(); - inputList.add(projectLawsInventoryEO); + ProjectLawsInventoryEO projectLawsInventoryEONew = new ProjectLawsInventoryEO(); + BeanUtils.copyProperties(projectLawsInventoryEO,projectLawsInventoryEONew); + inputList.add(projectLawsInventoryEONew); translateData(inputList); ProjectLawsInventoryEO inputInfoEO = inputList.get(0); From cbcba93bbbd1e509848aed0867040aac13026b74 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 26 May 2022 17:01:04 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 + .../ProjectDetails/index.vue | 37 +++- .../components/resultReportedUpload.vue | 207 ++++++++++++++++++ 4 files changed, 237 insertions(+), 9 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/resultReportedUpload.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 78034b7da..6448d8ce7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -893,4 +893,5 @@ module.exports = { ExportReport:'Export Report', basicInformation:'Basic Information', replyFromProjectContact:'Reply from project contact person', + pleaseUpload:'Please Upload', } \ 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 aed7ce7f6..f2a138480 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -898,4 +898,5 @@ module.exports = { ExportReport:'导出报告', basicInformation:'基础信息', replyFromProjectContact:'工程接口人回复', + pleaseUpload:'请上传', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 53d7f9d4c..9bd5fe9a8 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -51,7 +51,8 @@
- +
@@ -89,29 +90,47 @@ data() { return { title: this.$t('projectDetails'), - isDisplayNum:'', + isDisplayNum: '', textTitle: '项目详情', url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId' }, - areaOfResponsibility:{}, + areaOfResponsibility: {} } }, mounted() { - this.textColor() + this.textColor(0) this.getTaskId() + if (this.$route.query.type) { + if (this.$route.query.type == '101') { + this.textColor(0) + this.textTitle = '详情详情' + } else if (this.$route.query.type == '102') { + this.textColor(1) + this.textTitle = '法规清单' + } else if (this.$route.query.type == '103') { + this.textColor(2) + this.textTitle = '任务清单' + } else if (this.$route.query.type == '104') { + this.textColor(3) + this.textTitle = '未符合项' + } else if (this.$route.query.type == '105') { + this.textColor(4) + this.textTitle = '认证参数收集' + } + } }, methods: { - textColor() { + textColor(num) { let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') if (textColor && textColor.length > 0) { textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') if (text && text.length > 0) { - text[0].classList.add('Virtual-detail-left-text-color') + text[num].classList.add('Virtual-detail-left-text-color') } }, textClick(num, name) { @@ -138,11 +157,11 @@ } getAction(this.url.queryUserPremissionByProjectLibraryId, query).then((res) => { if (res.success) { - this.isDisplayNum = res.result + this.isDisplayNum = res.result } }) }, - TaskListChange(item){ + TaskListChange(item) { this.areaOfResponsibility = item this.textTitle = '任务清单' let textColor = document.getElementsByClassName('Virtual-detail-left-text-color') @@ -151,7 +170,7 @@ } let text = document.getElementsByClassName('Virtual-detail-left-text') text[2].classList.add('Virtual-detail-left-text-color') - }, + } } } diff --git a/jero-web/src/views/projectManagement/components/resultReportedUpload.vue b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue new file mode 100644 index 000000000..c8d67f6ed --- /dev/null +++ b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file