From 6fddd2f92c8bc2dbcc8838cacf599ff48ac52521 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Thu, 21 Jul 2022 09:14:01 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 7de7fda86..254824c4f 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -386,7 +386,7 @@ ALTER TABLE `laws_weilai`.`sys_user` DROP INDEX `uniq_sys_user_phone`, DROP INDEX `uniq_sys_user_email`; --- 参数项清单 修改字段长度 2022-07-17 +-- 参数项清单 修改字段长度 2022-07-17 2022-07-20 已同步生产环境 ALTER TABLE `laws_weilai`.`params_info` MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`, MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`; @@ -419,7 +419,7 @@ ALTER TABLE `laws_weilai`.`report_cert_category_params_info` MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`, MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`; --- 文档翻译表 +-- 文档翻译表 2022-07-20 已同步生产环境 CREATE TABLE `laws_weilai`.`doc_translation` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', From 603de44f9a3eddb61aa222a39d1293c07a5976b5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 22 Jul 2022 15:09:50 +0800 Subject: [PATCH 02/13] =?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 --- .../components/listEditModel.vue | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index eef2f448c..38f185c66 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -985,77 +985,77 @@ }, getProject(row, res, callback) { //设计符合性确认-发起人 - if (row.designInitiator == 1) { - this.designInitiatorList = res.result.lawEngineerList || [] - } else if (row.designInitiator == 2) { - this.designInitiatorList = res.result.certificationEngineerList || [] - } else if (row.designInitiator == 3) { - this.designInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.designInitiatorList = res.result.studioPersonList || [] - } else if (!row.designInitiator || row.designInitiator == '') { + // if (row.designInitiator == 1) { + // this.designInitiatorList = res.result.lawEngineerList || [] + // } else if (row.designInitiator == 2) { + // this.designInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.designInitiator == 3) { + // this.designInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.designInitiatorList = res.result.studioPersonList || [] + // } else if (!row.designInitiator || row.designInitiator == '') { this.designInitiatorList = res.result.allPersonList || [] - } + // } //设计符合性确认-责任人 - if (row.designDuty == 1) { - this.designDutyList = res.result.lawEngineerList || [] - } else if (row.designDuty == 2) { - this.designDutyList = res.result.certificationEngineerList || [] - } else if (row.designDuty == 3) { - this.designDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.designDutyList = res.result.studioPersonList || [] - } else if (!row.designDuty || row.designDuty == '') { + // if (row.designDuty == 1) { + // this.designDutyList = res.result.lawEngineerList || [] + // } else if (row.designDuty == 2) { + // this.designDutyList = res.result.certificationEngineerList || [] + // } else if (row.designDuty == 3) { + // this.designDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.designDutyList = res.result.studioPersonList || [] + // } else if (!row.designDuty || row.designDuty == '') { this.designDutyList = res.result.allPersonList || [] - } + // } //prehomo确认-发起人 - if (row.prehomoInitiator == 1) { - this.prehomoInitiatorList = res.result.lawEngineerList || [] - } else if (row.prehomoInitiator == 2) { - this.prehomoInitiatorList = res.result.certificationEngineerList || [] - } else if (row.prehomoInitiator == 3) { - this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.prehomoInitiatorList = res.result.studioPersonList || [] - } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { + // if (row.prehomoInitiator == 1) { + // this.prehomoInitiatorList = res.result.lawEngineerList || [] + // } else if (row.prehomoInitiator == 2) { + // this.prehomoInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.prehomoInitiator == 3) { + // this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.prehomoInitiatorList = res.result.studioPersonList || [] + // } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { this.prehomoInitiatorList = res.result.allPersonList || [] - } + // } //prehomo确认-责任人 - if (row.prehomoDuty == 1) { - this.prehomoDutyList = res.result.lawEngineerList || [] - } else if (row.prehomoDuty == 2) { - this.prehomoDutyList = res.result.certificationEngineerList || [] - } else if (row.prehomoDuty == 3) { - this.prehomoDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.prehomoDutyList = res.result.studioPersonList || [] - } else if (!row.prehomoDuty || row.prehomoDuty == '') { + // if (row.prehomoDuty == 1) { + // this.prehomoDutyList = res.result.lawEngineerList || [] + // } else if (row.prehomoDuty == 2) { + // this.prehomoDutyList = res.result.certificationEngineerList || [] + // } else if (row.prehomoDuty == 3) { + // this.prehomoDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.prehomoDutyList = res.result.studioPersonList || [] + // } else if (!row.prehomoDuty || row.prehomoDuty == '') { this.prehomoDutyList = res.result.allPersonList || [] - } + // } //验证符合性确认-发起人 - if (row.verifyInitiator == 1) { - this.verifyInitiatorList = res.result.lawEngineerList || [] - } else if (row.verifyInitiator == 2) { - this.verifyInitiatorList = res.result.certificationEngineerList || [] - } else if (row.verifyInitiator == 3) { - this.verifyInitiatorList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.verifyInitiatorList = res.result.studioPersonList || [] - } else if (!row.verifyInitiator || row.verifyInitiator == '') { + // if (row.verifyInitiator == 1) { + // this.verifyInitiatorList = res.result.lawEngineerList || [] + // } else if (row.verifyInitiator == 2) { + // this.verifyInitiatorList = res.result.certificationEngineerList || [] + // } else if (row.verifyInitiator == 3) { + // this.verifyInitiatorList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.verifyInitiatorList = res.result.studioPersonList || [] + // } else if (!row.verifyInitiator || row.verifyInitiator == '') { this.verifyInitiatorList = res.result.allPersonList || [] - } + // } //验证符合性确认-责任人 - if (row.verifyDuty == 1) { - this.verifyDutyList = res.result.lawEngineerList || [] - } else if (row.verifyDuty == 2) { - this.verifyDutyList = res.result.certificationEngineerList || [] - } else if (row.verifyDuty == 3) { - this.verifyDutyList = res.result.engineeringInterfacePersonList || [] - } else if (row.designInitiator == 0) { - this.verifyDutyList = res.result.studioPersonList || [] - } else if (!row.verifyDuty || row.verifyDuty == '') { + // if (row.verifyDuty == 1) { + // this.verifyDutyList = res.result.lawEngineerList || [] + // } else if (row.verifyDuty == 2) { + // this.verifyDutyList = res.result.certificationEngineerList || [] + // } else if (row.verifyDuty == 3) { + // this.verifyDutyList = res.result.engineeringInterfacePersonList || [] + // } else if (row.designInitiator == 0) { + // this.verifyDutyList = res.result.studioPersonList || [] + // } else if (!row.verifyDuty || row.verifyDuty == '') { this.verifyDutyList = res.result.allPersonList || [] - } + // } callback() }, getData(row, res) { From 4628439169b53d27c544c480c9d3bd86969044b0 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 22 Jul 2022 15:15:51 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E5=8D=95=E5=AF=BC=E5=85=A5=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=A4=A7=E5=B0=8F=E5=86=99=E9=94=99=E8=AF=AF=E7=9A=84?= =?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/modules/document/enums/SearchEnum.java | 2 -- .../impl/ProjectRelatedPersonnelServiceImpl.java | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 279e77bcd..3b1ea5267 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -12,8 +12,6 @@ public enum SearchEnum { FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); - - String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 66e03ed80..8f2136160 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -55,14 +55,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; +import java.util.*; import java.util.stream.Collectors; /** @@ -1047,7 +1040,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + lawEngineerId = lawEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(lawEngineerId).append(","); @@ -1081,7 +1074,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(engineeringInterfacePersonId).append(","); @@ -1130,7 +1123,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getUsername())) + certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase())) .map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); } midId.append(certificationEngineerId).append(","); From fa0a81eadf7d0f465019827764206177f7428b27 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Fri, 22 Jul 2022 15:34:53 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=BA=20=E2=80=9C?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E7=94=A8=E6=88=B7=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index e457b8b91..2783d1166 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -519,7 +519,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUserDepartMapper.insert(sysUserDepart); // 添加用户角色关系 - SysUserRole userRole = new SysUserRole(sysUser.getId(), "1534020318437208065"); // 新增用户默认角色均为工程师 + SysUserRole userRole = new SysUserRole(sysUser.getId(), "1550369502225551361"); // 新增用户默认角色均为一般用户 sysUserRoleMapper.insert(userRole); // 添加用户信息 From d0206ac2a741e031ca9bd16eae01883815415b43 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 22 Jul 2022 18:22:55 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BAexcel?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 35 ++- .../jero/modules/project/util/ExcelUtil.java | 268 ++++++++++++++++++ 2 files changed, 291 insertions(+), 12 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 54b443582..9bf90f6c1 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1,7 +1,5 @@ package com.jero.modules.cert.report.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; @@ -30,6 +28,7 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum; 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.project.util.ExcelUtil; import com.jero.modules.project.util.WordUtil; import com.jero.modules.split.common.ReadExcel; import com.jero.modules.system.entity.SysDictItem; @@ -37,7 +36,6 @@ import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.*; import org.aspectj.util.FileUtil; @@ -753,6 +751,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allParamsInfoList = queryForExportCustom(paramsReportDetailVO); - Map params = allParamsInfoList.get(0); + HashMap params = (HashMap) allParamsInfoList.get(0); String templateUrl = ""; ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.getById(paramsReportDetailVO.getExportTemplateId()); @@ -807,25 +806,37 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); + if (allRelevFileList != null && !allRelevFileList.isEmpty()) { + allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); + downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + } + // 拿取模板 String repFileName = fileName.replaceAll("/","_"); wordOS = new FileOutputStream(fileNowPath + File.separator + repFileName); if (CosBootUtil.doesObjectExist(templateUrl)) { InputStream wordTemplate = CosBootUtil.download(templateUrl); - com.qcloud.cos.utils.IOUtils.copy(wordTemplate, wordOS); +// com.qcloud.cos.utils.IOUtils.copy(wordTemplate, wordOS); + + ExcelUtil.variableReplace(wordTemplate, wordOS, params); + } // 替换占位符内容 - TemplateExportParams templateExportParams = new TemplateExportParams(); - templateExportParams.setTemplateUrl(fileNowPath + File.separator + repFileName); - Workbook workbook = ExcelExportUtil.exportExcel(templateExportParams, params); + // poi方式 +// TemplateExportParams templateExportParams = new TemplateExportParams(); +// templateExportParams.setTemplateUrl(fileNowPath + File.separator + repFileName); +// Workbook workbook = ExcelExportUtil.exportExcel(templateExportParams, params); - OutputStream word = new FileOutputStream(fileNowPath + File.separator + repFileName); - workbook.write(word); + +// OutputStream word = new FileOutputStream(fileNowPath + File.separator + repFileName); +// workbook.write(word); wordOS.flush(); wordOS.close(); - word.flush(); - word.close(); +// word.flush(); +// word.close(); // 打包导出压缩包 response.setHeader("Content-Disposition", diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java new file mode 100644 index 000000000..ca8984ee3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -0,0 +1,268 @@ +package com.jero.modules.project.util; + +import org.apache.commons.io.FileUtils; +import org.docx4j.XmlUtils; +import org.docx4j.dml.*; +import org.docx4j.dml.spreadsheetdrawing.*; +import org.docx4j.openpackaging.io.SaveToZipFile; +import org.docx4j.openpackaging.packages.SpreadsheetMLPackage; +import org.docx4j.openpackaging.parts.DrawingML.Drawing; +import org.docx4j.openpackaging.parts.PartName; +import org.docx4j.openpackaging.parts.SpreadsheetML.JaxbSmlPart; +import org.docx4j.openpackaging.parts.SpreadsheetML.WorksheetPart; +import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage; +import org.docx4j.relationships.Relationship; + +import javax.xml.bind.JAXBException; +import javax.xml.bind.util.JAXBResult; +import javax.xml.transform.Source; +import javax.xml.transform.Templates; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamSource; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; + +public class ExcelUtil { + + public static void main(String[] args) throws Exception { + String inputfilepath = "D:\\text\\072001自定义模板.xlsx"; + SpreadsheetMLPackage pkg = SpreadsheetMLPackage.load(new File(inputfilepath)); + WorksheetPart worksheet = pkg.getWorkbookPart().getWorksheet(0); + JAXBResult result = XmlUtils.prepareJAXBResult(worksheet.getJAXBContext()); + Map transformParameters = new HashMap<>(); + transformParameters.put("NIO 07200103", "dfasdfas"); + +// InputStream smlPart = pkg.getParts().get(new PartName("/xl/sharedStrings.xml")); // 获取所有sheet + + Source xsltSource = new StreamSource(new File("D:\\text\\sharedStrings.xml")); + TransformerFactory transFact = TransformerFactory.newInstance(); + Templates cachedXSLT = transFact.newTemplates(xsltSource); + + pkg.getWorkbookPart().transform(cachedXSLT,transformParameters,result); + +// variableReplace(); +// xlsx4JAddImage(); + } + + public static void xlsx4JAddImage() throws Exception { + + String inputfilepath = "D:\\text\\072001自定义模板.xlsx"; + String outputfilepath = "D:\\text\\mytest.xlsx"; + String imagefilePath = "D:\\text\\jpg2.jpg" ; + + SpreadsheetMLPackage pkg = SpreadsheetMLPackage.createPackage(); + WorksheetPart worksheet = pkg.createWorksheetPart(new PartName("/xl/worksheets/sheet1.xml"), "Sheet1", 1); + + + // Create Drawing part and add to sheet + Drawing drawingPart = new Drawing(); + Relationship drawingRel = worksheet.addTargetPart(drawingPart); + + // Add anchor XML to worksheet + org.xlsx4j.sml.CTDrawing drawing = org.xlsx4j.jaxb.Context.getsmlObjectFactory().createCTDrawing(); + worksheet.getJaxbElement().setDrawing(drawing); + drawing.setId( drawingRel.getId() ); + + // Create image part and add to Drawing part + BinaryPartAbstractImage imagePart + = BinaryPartAbstractImage.createImagePart(pkg, drawingPart, + FileUtils.readFileToByteArray(new File(imagefilePath) )); + String imageRelID = imagePart.getSourceRelationship().getId(); + + // Create and set drawing part content + // Take your pick .. + // .. build it using code + drawingPart.setJaxbElement( + buildDrawingPartContentUsingCode(imageRelID)); + // .. or build it from an XML string +// drawingPart.setJaxbElement( +// buildDrawingPartContentFromXmlString(imageRelID)); + + + // Save the xlsx + SaveToZipFile saver = new SaveToZipFile(pkg); + saver.save(outputfilepath); + System.out.println("\n\n done .. " + outputfilepath); + } + + public static void variableReplace(InputStream is, OutputStream os, HashMap mappings) throws Exception { + + SpreadsheetMLPackage opcPackagepkg = SpreadsheetMLPackage.load(is); + + // Be sure to get the part which actually contains your variables! + JaxbSmlPart smlPart = (JaxbSmlPart)opcPackagepkg.getParts().get(new PartName("/xl/sharedStrings.xml")); // 获取所有sheet + //JaxbSmlPart smlPart = (JaxbSmlPart)opcPackagepkg.getParts().get(new PartName("/xl/worksheets/sheet1.xml")); + smlPart.variableReplace(mappings); + + // Save it + opcPackagepkg.save(os); + } + + /** + * This code generated using http://webapp.docx4java.org/OnlineDemo/PartsList.html + * "Method 1" + */ + public static CTDrawing buildDrawingPartContentUsingCode(String imageRelID) { + + org.docx4j.dml.spreadsheetdrawing.ObjectFactory dmlspreadsheetdrawingObjectFactory = new org.docx4j.dml.spreadsheetdrawing.ObjectFactory(); + + CTDrawing drawing = dmlspreadsheetdrawingObjectFactory.createCTDrawing(); +// JAXBElement drawingWrapped = dmlspreadsheetdrawingObjectFactory.createWsDr(drawing); + // Create object for twoCellAnchor + CTTwoCellAnchor twocellanchor = dmlspreadsheetdrawingObjectFactory.createCTTwoCellAnchor(); + drawing.getEGAnchor().add( twocellanchor); + // Create object for clientData + CTAnchorClientData anchorclientdata = dmlspreadsheetdrawingObjectFactory.createCTAnchorClientData(); + twocellanchor.setClientData(anchorclientdata); + // Create object for pic + CTPicture picture = dmlspreadsheetdrawingObjectFactory.createCTPicture(); + twocellanchor.setPic(picture); + org.docx4j.dml.ObjectFactory dmlObjectFactory = new org.docx4j.dml.ObjectFactory(); + // Create object for blipFill + CTBlipFillProperties blipfillproperties = dmlObjectFactory.createCTBlipFillProperties(); + picture.setBlipFill(blipfillproperties); + // Create object for blip + CTBlip blip = dmlObjectFactory.createCTBlip(); + blipfillproperties.setBlip(blip); + blip.setCstate(org.docx4j.dml.STBlipCompression.NONE); + blip.setEmbed( imageRelID ); + // Create object for extLst + CTOfficeArtExtensionList officeartextensionlist = dmlObjectFactory.createCTOfficeArtExtensionList(); + blip.setExtLst(officeartextensionlist); + // Create object for ext + CTOfficeArtExtension officeartextension = dmlObjectFactory.createCTOfficeArtExtension(); + officeartextensionlist.getExt().add( officeartextension); + officeartextension.setUri( "{28A0092B-C50C-407E-A947-70E740481C1C}"); + blip.setLink( ""); + // Create object for stretch + CTStretchInfoProperties stretchinfoproperties = dmlObjectFactory.createCTStretchInfoProperties(); + blipfillproperties.setStretch(stretchinfoproperties); + // Create object for fillRect + CTRelativeRect relativerect = dmlObjectFactory.createCTRelativeRect(); + stretchinfoproperties.setFillRect(relativerect); + relativerect.setR( new Integer(0) ); + relativerect.setT( new Integer(0) ); + relativerect.setL( new Integer(0) ); + relativerect.setB( new Integer(0) ); + // Create object for spPr + CTShapeProperties shapeproperties = dmlObjectFactory.createCTShapeProperties(); + picture.setSpPr(shapeproperties); + // Create object for xfrm + CTTransform2D transform2d = dmlObjectFactory.createCTTransform2D(); + shapeproperties.setXfrm(transform2d); + transform2d.setRot( new Integer(0) ); + // Create object for off + CTPoint2D point2d = dmlObjectFactory.createCTPoint2D(); + transform2d.setOff(point2d); + point2d.setY( 0 ); + point2d.setX( 0 ); + // Create object for ext + CTPositiveSize2D positivesize2d = dmlObjectFactory.createCTPositiveSize2D(); + transform2d.setExt(positivesize2d); + positivesize2d.setCx( 714375 ); + positivesize2d.setCy( 714375 ); + // Create object for prstGeom + CTPresetGeometry2D presetgeometry2d = dmlObjectFactory.createCTPresetGeometry2D(); + shapeproperties.setPrstGeom(presetgeometry2d); + // Create object for avLst + CTGeomGuideList geomguidelist = dmlObjectFactory.createCTGeomGuideList(); + presetgeometry2d.setAvLst(geomguidelist); + presetgeometry2d.setPrst(org.docx4j.dml.STShapeType.RECT); + // Create object for nvPicPr + CTPictureNonVisual picturenonvisual = dmlspreadsheetdrawingObjectFactory.createCTPictureNonVisual(); + picture.setNvPicPr(picturenonvisual); + // Create object for cNvPr + CTNonVisualDrawingProps nonvisualdrawingprops = dmlObjectFactory.createCTNonVisualDrawingProps(); + picturenonvisual.setCNvPr(nonvisualdrawingprops); + nonvisualdrawingprops.setDescr( ""); + nonvisualdrawingprops.setName( "Picture 1"); + nonvisualdrawingprops.setId( 2 ); + // Create object for cNvPicPr + CTNonVisualPictureProperties nonvisualpictureproperties = dmlObjectFactory.createCTNonVisualPictureProperties(); + picturenonvisual.setCNvPicPr(nonvisualpictureproperties); + // Create object for picLocks + CTPictureLocking picturelocking = dmlObjectFactory.createCTPictureLocking(); + nonvisualpictureproperties.setPicLocks(picturelocking); + picture.setMacro( ""); + // Create object for to + CTMarker marker = dmlspreadsheetdrawingObjectFactory.createCTMarker(); + twocellanchor.setTo(marker); + marker.setCol(1); + marker.setColOff( 104775 ); + marker.setRow(3); + marker.setRowOff( 142875 ); + // Create object for from + CTMarker marker2 = dmlspreadsheetdrawingObjectFactory.createCTMarker(); + twocellanchor.setFrom(marker2); + marker2.setCol(0); + marker2.setColOff( 0 ); + marker2.setRow(0); + marker2.setRowOff( 0 ); + twocellanchor.setEditAs(STEditAs.fromValue("name")); + +// return drawingWrapped; + return drawing; + } + + /** + * This code generated using http://webapp.docx4java.org/OnlineDemo/PartsList.html + * "Method 2" + */ + public static CTDrawing buildDrawingPartContentFromXmlString(String imageRelID) throws JAXBException { + + String openXML = "" + + "" + + "" + + "0" + + "0" + + "0" + + "0" + +"" + + "" + + "1" + + "104775" + + "3" + + "142875" + +"" + + "" + + "" + + "" + + "" + + "" + +"" + +"" + + "" + + "" + + "" + + "" + + "" + +"" + +"" + +"" + + "" + + "" + +"" + +"" + + "" + + "" + + "" + + "" + +"" + + "" + + "" + +"" + +"" + +"" + + "" + +"" + +""; + + return (CTDrawing) XmlUtils.unwrap( + XmlUtils.unmarshalString(openXML)); + + } + +} From 2715dd2b682f6ae7f6cea2dd4db48db60d1eb8a6 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 24 Jul 2022 17:22:01 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA=20=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=E8=A7=92=E8=89=B2=E5=8F=AA?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 29 +++++++++++++++++-- .../collect/vo/ParamsCollectManifestVO.java | 3 ++ .../ParameterItemCollectionList.vue | 6 ++-- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 50ebb976f..78ca3a4a4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2157,8 +2157,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO); // 查询导出数据 + if (dataList == null || dataList.isEmpty()){ + // 没有查到数据，进行提示 + if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) { + throw new JeroBootException("No data, unable to export"); + } else { + throw new JeroBootException("无数据，无法导出"); + } + } List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询所有配置列 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java index 1421ccb64..cc37935f7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java @@ -74,4 +74,7 @@ public class ParamsCollectManifestVO { private String exportName; // 导出文件名 + @ApiModelProperty(value = "用户类型") + private String userTypes; // 用户类型 + } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index b1076e198..273116a1a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -822,11 +822,13 @@ paramsTemplateId: this.$route.query.paramsTemplateId, paramsTemplatePublishVersion:1, cut: this.cut, + userTypes: this.currentPersonRole, exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' } - console.log(query) getAction('/params/collectManifest/exportAll', query).then((res) => { - + if (res && !res.success) { + this.$message.error(res.message) + } this.textLoading = false }) }, From 8674a7d52f782d21e8cea1053ef8d16ccceafbfa Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 24 Jul 2022 17:31:06 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=9A=84=E6=A8=AA=E7=BA=BF=E7=BC=A9=E7=9F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 273116a1a..682fbe51a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -3,7 +3,7 @@
- {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}})——{{$t(this.paramsManifest.title)}} + {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.paramsManifest.title)}}
From f33318a1fbccc042e0926d87dfa4205c69ee989c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 25 Jul 2022 10:31:22 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= 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 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/RetrieveFilesList.vue | 4 +- .../components/addModel.vue | 18 +- .../components/documentTranslationResults.vue | 234 ++++++++++++++++++ .../documentTranslation/index.vue | 29 ++- 8 files changed, 271 insertions(+), 24 deletions(-) create mode 100644 jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..1db4084cc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1173,4 +1173,6 @@ module.exports = { convertFailed:'Convert Failed', standardData:'Standard Data', Theorganization:'The Organization', + originalText:'Original Text', + translatedText:'Translated Text', } \ 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 43142beb5..29c912d1d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1177,4 +1177,6 @@ module.exports = { convertFailed:'转换失败', standardData:'标准数据', Theorganization:'组织机构', + originalText:'原文', + translatedText:'译文', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 3d15fba0b..43d3b7322 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -99,6 +99,7 @@ this.$route.path == '/TaskPlanList' || this.$route.path == '/documentDataComparison' || this.$route.path == '/comparisonResults' || + this.$route.path == '/documentTranslationResults' || this.$route.path == '/initiateDocumentComparison' || this.$route.path == '/evaluationProcess' || this.$route.path == '/evaluationResultsClause' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index be6370596..b4a8ba6b4 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -387,6 +387,11 @@ export const constantRouterMap = [ name: 'initiateDocumentComparison', component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/initiateComparison') }, + { + path: '/documentTranslationResults', + name: 'documentTranslationResults', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentTranslation/components/documentTranslationResults') + }, { path: '/documentDataComparison', name: 'documentDataComparison', diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue index 7237ce8f6..fe311363b 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue @@ -73,7 +73,7 @@ class="box-input-One" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguage"> + v-model="formInline.sourceLanguage"> @@ -91,7 +91,7 @@ class="box-input-One" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguageOne"> + v-model="formInline.targetLanguage"> diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index 2838e708c..a96e3a73b 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -18,11 +18,11 @@ {{$t('file')}} - + - {{ (formInline.file === 'null' || formInline.file === '' || - formInline.file == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('sourceFileId')"> + {{ (formInline.sourceFileId === 'null' || formInline.sourceFileId === '' || + formInline.sourceFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -37,7 +37,7 @@ @@ -54,7 +54,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationResults"> + v-model="formInline.textStatus"> @@ -77,7 +77,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguage"> + v-model="formInline.sourceLanguage"> @@ -95,7 +95,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="formInline.translationLanguageOne"> + v-model="formInline.targetLanguage"> @@ -133,7 +133,7 @@ confirmLoading: false, formInline: {}, rules: { - file: [ + sourceFileId: [ { required: true, message: this.$t('file') + this.$t('cannotEmpty'), diff --git a/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue new file mode 100644 index 000000000..0247520ec --- /dev/null +++ b/jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index fddde2cf3..0f01630f4 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -30,7 +30,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.translationResults"> + v-model="queryParam.translationResult"> @@ -51,7 +51,7 @@ class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode" allowClear - v-model="queryParam.flowStatus"> + v-model="queryParam.releaseCondition"> @@ -105,7 +105,7 @@ {{$t('view')}} - {{$t('check')}} + {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}} @@ -200,7 +200,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'TextStatus' + dataIndex: 'textStatus' }, { title: this.$t('fileName'), @@ -212,13 +212,13 @@ { title: this.$t('translationLanguage'), align: 'center', - dataIndex: 'translationLanguage', + dataIndex: 'targetLanguage', width: 170 }, { title: this.$t('translationResults'), align: 'center', - dataIndex: 'translationResults', + dataIndex: 'translationResult', width: 170 }, { @@ -226,14 +226,14 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'conversionTime' + dataIndex: 'translationTime' }, { title: this.$t('releaseSituation'), align: 'center', width: 170, ellipsis: true, - dataIndex: 'releaseSituation' + dataIndex: 'releaseCondition' }, { title: this.$t('operation'), @@ -303,11 +303,14 @@ this.selectedRowKeys = value }, viewClick(row) { - - }, - checkClick(row) { - + let newUrl = this.$router.resolve({ + path: '/documentTranslationResults' + }) + window.open(newUrl.href, '_blank') }, + // checkClick(row) { + // + // }, downloadData() { }, @@ -320,7 +323,7 @@ RetrieveFilesClick() { this.$refs.RetrieveFilesListRef.addModel() }, - BatchDelete(){ + BatchDelete() { }, deleteData(val) { From aabbb7b5ce7b63b9311499cf0276fc89bbe21faa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 25 Jul 2022 11:33:09 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 9 ++ jero-web/src/common/lang/zh-cn.js | 9 ++ .../externalReports/components/addModel.vue | 91 +++++++++++++++---- jero-web/src/views/externalReports/index.vue | 45 ++++++--- .../commponts/conventionalmodle.vue | 3 + .../ParameterItemCollectionList.vue | 35 +++++-- 6 files changed, 150 insertions(+), 42 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..3a21c67e7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1173,4 +1173,13 @@ module.exports = { convertFailed:'Convert Failed', standardData:'Standard Data', Theorganization:'The Organization', + Addingfolder:'Adding a folder', + Addingsubfolders:'Adding Subfolders', + Editfolder:'Edit Folder', + Deletefolders:'Delete Folders', + Foldername:'Folder Name', + Folderpermissions:'Folder Permissions', + Folderorder:'Folder Order', + Downloadprivileges:'Download Privileges', + Openpersonnel:'Open Personnel' } \ 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 43142beb5..4ca188418 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1177,4 +1177,13 @@ module.exports = { convertFailed:'转换失败', standardData:'标准数据', Theorganization:'组织机构', + Addingfolder:'新增文件夹', + Addingsubfolders:'新增子文件夹', + Editfolder:'编辑文件夹', + Deletefolders:'删除文件夹', + Foldername:'文件夹名称', + Folderpermissions:'文件夹权限', + Folderorder:'文件夹顺序', + Downloadprivileges:'下载权限', + Openpersonnel:'开放人员' } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index c557ad5d5..190946488 100644 --- a/jero-web/src/views/externalReports/components/addModel.vue +++ b/jero-web/src/views/externalReports/components/addModel.vue @@ -1,4 +1,5 @@ diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index f261141e4..17b431dae 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -44,17 +44,18 @@ @@ -184,15 +185,19 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - - + + - - + + - + @@ -220,13 +225,14 @@ import Vue from 'vue' import moment from 'moment' import eventBUs from '@/common/event' import { mapGetters } from 'vuex' +import PersonnelSelection from '@/components/PersonnelSelection/index' export default { name: 'SplitDetail', components: { addModel, handleModel, - // exportTree, + PersonnelSelection, globalAdvancedQuery // ImportFile }, @@ -242,6 +248,7 @@ export default { }, pageSize: 10, pageNo: 1, + disabled:false, total: 0, tableData: [], selectedRowKeys: [], @@ -393,6 +400,10 @@ export default { this.contentVisible = true this.contentValue = val }, + PersonnelSelectionChange(value, id) { + this.form[value] = id + this.form = { ...this.form } + }, //关闭条款内容弹框 handleCancel() { this.contentVisible = false @@ -549,12 +560,18 @@ export default { }, //树形新增 orgAdd() { - this.menuTitle = this.$t('add') + this.menuTitle = this.$t('Addingfolder') this.isEdit = false this.form = {} this.menuRightVisible = true }, + orgAdds(){ + this.menuTitle = this.$t('Addingsubfolders') + this.isEdit = false + this.form = {} + this.menuRightVisible = true + }, //树形修改 orgEdit() { this.menuTitle = this.$t('edit') diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index ead1ddc77..56a23cacc 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -17,6 +17,7 @@
+ * {{$t('certificationCategory')}}
@@ -35,6 +36,7 @@
+ * {{$t('configure')}}
@@ -59,6 +61,7 @@
+ * {{$t('WhetherMergeParameters')}}
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 682fbe51a..5ef39eb9b 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -108,7 +108,7 @@ - +