diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6268531d7..6722f97f8 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 '创建人', @@ -440,7 +440,7 @@ CREATE TABLE `laws_weilai`.`doc_translation` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文档翻译表' ROW_FORMAT = Dynamic; --- 文档翻译-源语言数据字典 +-- 文档翻译-源语言数据字典 2022-7-25 已同步生产环境 INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550306517749547010', '文档翻译-翻译语言-源语言', 'source_language', '文档翻译-翻译语言-源语言', 0, 'admin', '2022-07-22 10:27:32', 'admin', '2022-07-22 10:29:17', NULL, NULL, 1, 0, '1', 2); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('155030756958032691412', '1550306517749547010', '中文', 'zh', '中文', 2, 1, 'admin', '2022-07-22 10:31:43', 'admin', '2022-07-22 10:31:59', 1, NULL, NULL, '0', 'Chinese'); @@ -459,7 +459,7 @@ INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_v INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503119403009474586', '1550306517749547010', '朝鲜语', 'ko', '朝鲜语', 15, 1, 'admin', '2022-07-22 10:49:05', NULL, NULL, 1, NULL, NULL, '0', 'Korean'); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503120084961361947', '1550306517749547010', '越南语', 'vi', '越南语', 16, 1, 'admin', '2022-07-22 10:49:21', NULL, NULL, 1, NULL, NULL, '0', 'Vietnamese'); --- 文档翻译-目标语言数据字典 +-- 文档翻译-目标语言数据字典 2022-7-25 已同步生产环境 INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550306581909815297', '文档翻译-翻译语言-目标语言', 'target_language', '文档翻译-翻译语言-目标语言', 0, 'admin', '2022-07-22 10:27:47', 'admin', '2022-07-22 10:29:13', NULL, NULL, 1, 0, '1', 1); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('15503075695803269141', '1550306581909815297', '中文', 'zh', '中文', 2, 1, 'admin', '2022-07-22 10:31:43', 'admin', '2022-07-22 10:31:59', 1, NULL, NULL, '0', 'Chinese'); @@ -478,19 +478,19 @@ INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_v INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550311940300947458', '1550306581909815297', '朝鲜语', 'ko', '朝鲜语', 15, 1, 'admin', '2022-07-22 10:49:05', NULL, NULL, 1, NULL, NULL, '0', 'Korean'); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550312008496136194', '1550306581909815297', '越南语', 'vi', '越南语', 16, 1, 'admin', '2022-07-22 10:49:21', NULL, NULL, 1, NULL, NULL, '0', 'Vietnamese'); --- 文档翻译-发布情况数据字典 +-- 文档翻译-发布情况数据字典 2022-7-25 已同步生产环境 INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550314527293128705', '文档翻译-发布情况', 'release_condition', '文档翻译-发布情况', 0, 'admin', '2022-07-22 10:59:21', 'admin', '2022-07-22 11:01:07', NULL, NULL, 1, 0, '1', 2); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314666682433537', '1550314527293128705', '已发布', 'published', '已发布', 1, 1, 'admin', '2022-07-22 10:59:55', NULL, NULL, 1, NULL, NULL, '0', 'Have published'); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550314731320852482', '1550314527293128705', '草稿', 'draft', '草稿', 2, 1, 'admin', '2022-07-22 11:00:10', NULL, NULL, 1, NULL, NULL, '0', 'Draft'); --- 文档翻译-翻译结果数据字典 +-- 文档翻译-翻译结果数据字典 2022-7-25 已同步生产环境 INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1550314971079852034', '文档翻译-翻译结果', 'translation_result', '文档翻译-翻译结果', 0, 'admin', '2022-07-22 11:01:07', NULL, NULL, NULL, NULL, 1, 0, '1', 1); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550315090797871105', '1550314971079852034', '翻译中', 'In the translation', '翻译中', 1, 1, 'admin', '2022-07-22 11:01:36', NULL, NULL, 1, NULL, NULL, '0', 'In the translation'); INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1550315193285689345', '1550314971079852034', '翻译完成', 'Translation done', '翻译完成', 2, 1, 'admin', '2022-07-22 11:02:00', NULL, NULL, 1, NULL, NULL, '0', 'Translation done'); --- 文档翻译表-增加字段 编号、标题 +-- 文档翻译表-增加字段 编号、标题 2022-7-25 已同步生产环境 ALTER TABLE `laws_weilai`.`doc_translation` ADD COLUMN `serial_number` varchar(255) NULL COMMENT '编号' AFTER `buss_document_library_id`, ADD COLUMN `title` varchar(255) NULL COMMENT '标题' AFTER `serial_number`; 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 65f6fe3e6..4456a79fb 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 @@ -2161,8 +2161,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-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-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 9ea7b911d..04d975382 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); // 添加用户信息 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java index 1ffb02b43..506e32cc6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java @@ -5,12 +5,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.jero.modules.docTranslation.service.IDocTranslationEOService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +18,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** * @Description: 文档翻译表 * @Author: jero-boot @@ -53,9 +49,7 @@ public class DocTranslationEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = docTranslationEOService.page(page, queryWrapper); + IPage pageList = docTranslationEOService.queryPageList(docTranslationEO,pageNo,pageSize,cut,req); return Result.OK(cut,pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java index 432741eb5..1ff232e8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java @@ -1,7 +1,10 @@ package com.jero.modules.docTranslation.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -58,4 +61,15 @@ public interface IDocTranslationEOService extends IService { * @return */ List queryList(); + + /** + * 分页查询 + * @param docTranslationEO + * @param pageNo + * @param pageSize + * @param cut + * @param req + * @return + */ + IPage queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java index 20b0115d2..fa9549e06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java @@ -1,5 +1,10 @@ package com.jero.modules.docTranslation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.docTranslation.entity.DocTranslationEO; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; import com.jero.modules.docTranslation.enums.TranslationResultEnum; @@ -7,6 +12,8 @@ import com.jero.modules.docTranslation.mapper.DocTranslationEOMapper; import com.jero.modules.docTranslation.service.IDocTranslationEOService; import com.jero.modules.docTranslation.utils.TranslationDocumentUtils; import com.jero.modules.oss.entity.OSSFile; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -15,6 +22,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 文档翻译表 * @Author: jero-boot @@ -103,4 +112,24 @@ public class DocTranslationEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public IPage queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap()); + // 获取当前登录人 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + /** + * 数据权限：自己创建的、或发布情况为“已发布”的数据 + */ + queryWrapper.lambda().and(query -> { + query.eq(DocTranslationEO::getCreateBy,currentUser.getUsername()); + query.or(o -> { + o.eq(DocTranslationEO::getReleaseCondition,ReleaseConditionEnum.PUBLISHED.getValue()); + }); + }); + IPage result = this.page(page, queryWrapper); + return result; + } } 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(","); 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)); + + } + +} diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1c5b2d4a..1259e9eba 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1173,4 +1173,17 @@ 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', + originalText:'Original Text', + translatedText:'Translated Text', + Administrativeprivileges:'Administrativ Pprivileges', + Checkthepermissions:'Check The Permissions', } \ 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..bb2251c6c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1177,4 +1177,17 @@ module.exports = { convertFailed:'转换失败', standardData:'标准数据', Theorganization:'组织机构', + Addingfolder:'新增文件夹', + Addingsubfolders:'新增子文件夹', + Editfolder:'编辑文件夹', + Deletefolders:'删除文件夹', + Foldername:'文件夹名称', + Folderpermissions:'文件夹权限', + Folderorder:'文件夹顺序', + Downloadprivileges:'下载权限', + Openpersonnel:'开放人员', + originalText:'原文', + translatedText:'译文', + Administrativeprivileges:'管理权限', + Checkthepermissions:'查看权限', } \ 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) { diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue index c557ad5d5..6c13c556c 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..6173aaa85 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -44,17 +44,18 @@ @@ -90,7 +91,7 @@
{{ $t('uploadTime') }}
- - {{$t('view')}} + {{$t('download')}} {{$t('edit')}} {{$t('delete')}} @@ -170,6 +171,7 @@ - - + + - - + + - - + + + + + @@ -220,13 +234,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 +257,7 @@ export default { }, pageSize: 10, pageNo: 1, + disabled:false, total: 0, tableData: [], selectedRowKeys: [], @@ -393,6 +409,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 +569,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') @@ -930,7 +956,12 @@ export default { }, // 上传文件 handleuploadFile(e) { - this.$refs.addModelRef.addModel() + if (this.menuId) { + this.$refs.addModelRef.addModel() + } else { + this.$message.warning(this.$t('selectDirectoryTerms')) + } + }, onSearch() { let self = this 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 b1076e198..5ef39eb9b 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)}}
@@ -108,7 +108,7 @@ - +