Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -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`;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1544,7 +1544,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					Map<String, String> msgMap = new HashMap<>();
 					msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber());
 					msgMap.put("state", paramsCollectManifestEO.getState());
-					msgMap.put("state", "1");
+					msgMap.put("type", "1");
 					msgMapList.add(msgMap);
 				}
 
@@ -1581,6 +1581,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				String content = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter the link to handle it.";
 
 				SysUser sysUser = sysUserService.getUserByName(sdt);
+				if(sysUser == null){
+					continue;
+				}
+
 				String[] thirdIds = new String[1];
 				thirdIds[0] = sysUser.getThirdId();
 				String urlParamsStr = parseUrlParams(paramsManifestEO);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/controller/DocTranslationEOController.java

@@ -4,13 +4,12 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 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 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
 
-
  /**
  * @Description: 文档翻译表
  * @Author: jero-boot
@@ -53,9 +51,7 @@ public class DocTranslationEOController extends JeroController<DocTranslationEO,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
-		QueryWrapper<DocTranslationEO> queryWrapper = QueryGenerator.initQueryWrapper(docTranslationEO, req.getParameterMap());
-		Page<DocTranslationEO> page = new Page<DocTranslationEO>(pageNo, pageSize);
-		IPage<DocTranslationEO> pageList = docTranslationEOService.page(page, queryWrapper);
+		IPage<DocTranslationEO> pageList = docTranslationEOService.queryPageList(docTranslationEO,pageNo,pageSize,cut,req);
 		return Result.OK(cut,pageList);
 	}
 
@@ -168,4 +164,27 @@ public class DocTranslationEOController extends JeroController<DocTranslationEO,
         return super.importExcel(request, response, DocTranslationEO.class);
     }
 
+	 /**
+	  *  批量更新文档翻译表发布情况
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "文档翻译表-批量更新发布情况")
+	 @ApiOperation(value="文档翻译表-批量更新发布情况", notes="文档翻译表-批量更新发布情况")
+	 @PostMapping(value = "/updateRleaseConditionBatch")
+	 public Result<?> updateRleaseConditionBatch(@RequestBody JSONObject json) {
+		 return this.docTranslationEOService.updateRleaseConditionBatch(json);
+	 }
+
+	 /**
+	  *  批量更新文档翻译表状态
+	  * @return
+	  */
+	 @AutoLog(value = "文档翻译表-查询文本状态下拉选项")
+	 @ApiOperation(value="文档翻译表-查询文本状态下拉选项", notes="文档翻译表-查询文本状态下拉选项")
+	 @GetMapping(value = "/queryTextStatusVal")
+	 public Result<?> queryTextStatusVal() {
+		 return this.docTranslationEOService.queryTextStatusVal();
+	 }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java

@@ -2,6 +2,7 @@ package com.jero.modules.docTranslation.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -73,10 +74,12 @@ public class DocTranslationEO implements Serializable {
     private String title;
 
 	/**文本状态*/
-	@Dict(dicCode = "state")
+	//@Dict(dicCode = "state")
 	@Excel(name = "文本状态", width = 15)
     @ApiModelProperty(value = "文本状态")
     private java.lang.String textStatus;
+	@TableField(exist = false)
+    private String textStatus_dictText;
 
 	/**文件名称*/
 	@Excel(name = "文件名称", width = 15)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/IDocTranslationEOService.java

@@ -1,7 +1,12 @@
 package com.jero.modules.docTranslation.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.common.api.vo.Result;
 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 +63,28 @@ public interface IDocTranslationEOService extends IService<DocTranslationEO> {
 	 * @return
 	 */
     List<DocTranslationEO> queryList();
+
+	/**
+	 * 分页查询
+	 * @param docTranslationEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param cut
+	 * @param req
+	 * @return
+	 */
+	IPage<DocTranslationEO> queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req);
+
+	/**
+	 * 批量更新发布情况
+	 * @param json
+	 * @return
+	 */
+    Result<?> updateRleaseConditionBatch(JSONObject json);
+
+	/**
+	 * 查询文本状态下拉选项（文档库中，文件类型字段）
+	 * @return
+	 */
+	Result<?> queryTextStatusVal();
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java

@@ -1,20 +1,40 @@
 package com.jero.modules.docTranslation.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+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.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.ModuleEnum;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.docTranslation.entity.DocTranslationEO;
 import com.jero.modules.docTranslation.enums.ReleaseConditionEnum;
 import com.jero.modules.docTranslation.enums.TranslationResultEnum;
 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.document.enums.FieldTypeEnum;
 import com.jero.modules.oss.entity.OSSFile;
+import me.zhyd.oauth.utils.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 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
@@ -25,6 +45,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class DocTranslationEOServiceImpl extends ServiceImpl<DocTranslationEOMapper, DocTranslationEO> implements IDocTranslationEOService {
 
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
 	/**
 	 * 保存
 	 *
@@ -103,4 +125,80 @@ public class DocTranslationEOServiceImpl extends ServiceImpl<DocTranslationEOMap
     public List<DocTranslationEO> queryList() {
         return list();
     }
+
+	@Override
+	public IPage<DocTranslationEO> queryPageList(DocTranslationEO docTranslationEO, Integer pageNo, Integer pageSize, String cut, HttpServletRequest req) {
+		Page<DocTranslationEO> page = new Page<DocTranslationEO>(pageNo, pageSize);
+
+		QueryWrapper<DocTranslationEO> 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<DocTranslationEO> result = this.page(page, queryWrapper);
+		disposeData(result.getRecords(),cut);
+		return result;
+	}
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	public void disposeData(List<DocTranslationEO> datas,String cut){
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (DocTranslationEO data : datas) {
+				String textStatus_dictText = "";
+				OnlCgformField fileTypeField = this.onlCgformFieldService.queryById(data.getTextStatus());
+				if (ObjectUtil.isNotEmpty(fileTypeField)) {
+					if (CutEnum.CN.getValue().equals(cut)) {
+						textStatus_dictText = fileTypeField.getDbFieldTxt();
+					} else {
+						textStatus_dictText = fileTypeField.getDbFieldEnName();
+					}
+				}
+				data.setTextStatus_dictText(textStatus_dictText);
+			}
+		}
+	}
+
+	@Override
+	public Result<?> updateRleaseConditionBatch(JSONObject json) {
+		String ids = json.getString("ids");
+		// 值对应枚举类 ReleaseConditionEnum 发布published  或撤回draft
+		String releaseCondition = json.getString("releaseCondition");
+		if (StringUtils.isNotEmpty(ids)) {
+			List<DocTranslationEO> docTranslationEOList = new ArrayList<>();
+
+			List<String> idList = Arrays.asList(ids.split(","));
+			idList.forEach(id -> {
+				DocTranslationEO docTranslationEO = new DocTranslationEO();
+				docTranslationEO.setId(id);
+				docTranslationEO.setReleaseCondition(releaseCondition);
+				docTranslationEOList.add(docTranslationEO);
+			});
+			this.updateBatchById(docTranslationEOList);
+		}
+		return new Result<>().success("操作成功！");
+	}
+
+	@Override
+	public Result<?> queryTextStatusVal() {
+		List<OnlCgformField> fieldList = this.onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+		List<OnlCgformField> result = fieldList.stream().filter(field -> {
+			boolean flag = false;
+			if(org.apache.commons.lang3.StringUtils.equals(field.getFieldShowType(), FieldTypeEnum.FILE.getValue())){
+				flag = true;
+			}
+			return flag;
+		}).collect(Collectors.toList());
+		return Result.OK(result);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3189,7 +3189,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //您订阅的XXX已被修改
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = serialNumber + " you subsribed to has been updated";
+                String msgTitle = serialNumber + " you subscribed to has been updated";
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);

jero-web/src/common/lang/en-us.js

@@ -1173,4 +1173,21 @@ 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',
+  onlyFilesUploaded:'Only.Docx,.Doc files can be uploaded',
+  selectDirectorylocation: 'Please select the directory location to add the folder',
+  Fileuploaded:'File uploaded, please wait',
+  uploadedbyyourself:'You can only delete files and data uploaded by yourself',
 }

jero-web/src/common/lang/zh-cn.js

@@ -577,6 +577,7 @@ module.exports = {
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
   selectDirectoryTerms: '请选择添加条款的目录位置',
+  selectDirectorylocation: '请选择添加文件夹的目录位置',
   OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
   OnlyWord: '只能导入word文件',
   labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除',
@@ -1177,4 +1178,19 @@ module.exports = {
   convertFailed:'转换失败',
   standardData:'标准数据',
   Theorganization:'组织机构',
+  Addingfolder:'新增文件夹',
+  Addingsubfolders:'新增子文件夹',
+  Editfolder:'编辑文件夹',
+  Deletefolders:'删除文件夹',
+  Foldername:'文件夹名称',
+  Folderpermissions:'文件夹权限',
+  Folderorder:'文件夹顺序',
+  Downloadprivileges:'下载权限',
+  Openpersonnel:'开放人员',
+  originalText:'原文',
+  translatedText:'译文',
+  Administrativeprivileges:'管理权限',
+  Checkthepermissions:'查看权限',
+  onlyFilesUploaded:'只能上传.docx、.doc文件',
+  uploadedbyyourself:'只能删除自己上传的文件数据',
 }

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' ||

jero-web/src/components/uploadFile/file.vue

@@ -2,7 +2,7 @@
   <div>
     <a-modal v-model="visible" :maskClosable="false" :footer="[]" :title="title">
       <a-upload-dragger
-        accept='*.*'
+        :accept='accept'
         :disabled="disabled"
         class="ant-upload-list"
         :class="{'uploadFile':isUploadFile}"
@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads'],
     data() {
       return {
         visible: false,
@@ -48,7 +48,8 @@
         myfileList: [],
         isLoding: false,
         cut: '',
-        multiple: true
+        multiple: true,
+        accept: ''
       }
     },
     created() {
@@ -67,6 +68,7 @@
       if (this.isMultiple) {
         this.multiple = false
       }
+      this.accept = this.restrictUploads ? '.docx,.doc' : '*.*'
       // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
     },
     methods: {
@@ -84,10 +86,23 @@
       },
       beforeUpload(file, fileList) {
         // let thisFileType = this.thisFileType.replace(/\s+/g, "");
+        console.log(file)
         this.fileTypeSatus = true
         if (this.isMultiple) {
           if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
-            this.$message.warning('只能上传一个文件')
+            this.$message.warning(this.$t('onlyOnefileUploaded'))
+            return false
+          }
+        }
+        if (this.restrictUploads) {
+          let fileName = file.name
+          let index1 = fileName.lastIndexOf('.')
+          let index2 = fileName.length
+          let fileSuffix = fileName.substring(index1, index2)
+          if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+
+          } else {
+            this.$message.warning(this.$t('onlyFilesUploaded'))
             return false
           }
         }

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',

jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue

@@ -42,10 +42,10 @@
       <a-table
         :columns="columns"
         rowKey="id"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 440px)'}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
         :loading="loading">
 
       </a-table>
@@ -68,38 +68,22 @@
               <span class="Required-One">*</span>
               <span class="title-text-text-One" :title="$t('translationLanguage')">{{$t('translationLanguage')}}</span>
             </div>
-            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguage">
-              <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
-                        class="box-input-One"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        allowClear
-                        v-model="formInline.translationLanguage">
-                <a-select-option v-for="(item, key) in LanguageList"
-                                 :key="key"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                </a-select-option>
-              </a-select>
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="sourceLanguage">
+              <j-dict-select-tag class="box-input" v-model="formInline.sourceLanguage"
+                                 @input="handleInput('sourceLanguage')"
+                                 :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="source_language"/>
             </a-form-model-item>
             <span class="text-icon-One">
                   <a-icon type="arrow-right" style="font-size: 20px"/>
               </span>
-            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguageOne">
-              <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
-                        class="box-input-One"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        allowClear
-                        v-model="formInline.translationLanguageOne">
-                <a-select-option v-for="(item, key) in LanguageList"
-                                 :key="key"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                </a-select-option>
-              </a-select>
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="targetLanguage">
+              <j-dict-select-tag class="box-input" v-model="formInline.targetLanguage"
+                                 @input="handleInput('targetLanguage')"
+                                 :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="target_language"/>
             </a-form-model-item>
           </div>
         </a-col>
@@ -127,14 +111,14 @@
         selectedRowKeys: [],
         formInline: {},
         rules: {
-          translationLanguage: [
+          sourceLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          translationLanguageOne: [
+          targetLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
@@ -166,19 +150,19 @@
           },
           {
             title: this.$t('TextStatus'),
-            dataIndex: 'TextStatus',
+            dataIndex: 'state',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('fileName'),
-            dataIndex: 'fileName',
+            dataIndex: 'file_name',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('textInformation'),
-            dataIndex: 'textInformation',
+            dataIndex: 'text_info',
             align: 'center',
             ellipsis: true
           }
@@ -189,19 +173,27 @@
         pageNo: 1,
         pageSize: 10,
         total: 0,
-        fieldList: [],
-        queryConditionVOList: []
+        selectedRowKeysRecord: []
       }
     },
     mounted() {
 
     },
     methods: {
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
       addModel() {
         this.visible = true
         this.queryParam = {}
         this.selectedRowKeys = []
-        // this.replacePage()
+        this.replacePage()
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
       },
       searchQuery() {
         this.pageNo = 1
@@ -222,13 +214,16 @@
         this.replacePage()
       },
       replacePage() {
+        let pageNo = JSON.parse(JSON.stringify(this.pageNo))
+        let pageSize = JSON.parse(JSON.stringify(this.pageSize))
         let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
+          pageNo: pageNo + '',
+          pageSize: pageSize + '',
+          type: 'doc',
           ...this.queryParam
         }
         this.loading = true
-        postAction('', query).then((res) => {
+        postAction('document/bussDocumentLibraryEO/ocrPageInfo', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -240,8 +235,15 @@
           }
         })
       },
-      onSelectChange(value) {
+      onSelectChange(value, record) {
         this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+        this.selectedRowKeysRecord = record.filter(res => {
+          return res.id == this.selectedRowKeys[0]
+        })
+        this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
       },
       handleCancel() {
         this.visible = false
@@ -250,9 +252,25 @@
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.$refs.ruleForm.validate(valid => {
             if (valid) {
+              let query = {
+                ...this.formInline,
+                serialNumber: this.selectedRowKeysRecord[0].serial_number,
+                title: this.selectedRowKeysRecord[0].title,
+                fileName: this.selectedRowKeysRecord[0].file_name,
+                textStatus: this.selectedRowKeysRecord[0].text_info_id
+              }
               this.confirmLoading = true
-              let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-              this.visible = false
+              postAction('/docTranslation/docTranslationEO/add', query).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visible = false
+                  this.confirmLoading = false
+                  this.$emit('RetrieveFilesListForm')
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                  this.confirmLoading = false
+                }
+              })
             }
           })
         } else {

jero-web/src/views/documentTools/documentTranslation/components/addModel.vue

@@ -18,11 +18,11 @@
                 <span class="title-text-text"
                       :title="$t('file')">{{$t('file')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="file">
+              <a-form-model-item class="itemModel" prop="sourceFileId">
                 <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload('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')
                   }}
                 </a-button>
               </a-form-model-item>
@@ -34,10 +34,10 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('standard')">{{$t('standard')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="standard">
+              <a-form-model-item class="itemModel" prop="serialNumber">
                 <a-input class="box-input"
                          readonly
-                         v-model="formInline.standard"
+                         v-model="formInline.serialNumber"
                          @click.native="standardClick"
                          :placeholder="$t('PleaseSelect')+$t('standard')"/>
               </a-form-model-item>
@@ -49,17 +49,17 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('TextStatus')">{{$t('TextStatus')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="translationResults">
+              <a-form-model-item class="itemModel" prop="textStatus">
                 <a-select :placeholder="$t('PleaseSelect')+$t('TextStatus')"
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          v-model="formInline.translationResults">
+                          v-model="formInline.textStatus">
                   <a-select-option v-for="(item, key) in translationResultsList"
                                    :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.dbFieldTxt">
+                           {{ item.dbFieldTxt }}
                      </span>
                   </a-select-option>
                 </a-select>
@@ -72,45 +72,29 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('translationLanguage')">{{$t('translationLanguage')}}</span>
               </div>
-              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="translationLanguage">
-                <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
-                          class="box-input"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          v-model="formInline.translationLanguage">
-                  <a-select-option v-for="(item, key) in LanguageList"
-                                   :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
+              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="sourceLanguage">
+                <j-dict-select-tag class="box-input" v-model="formInline.sourceLanguage"
+                                   @input="handleInput('sourceLanguage')"
+                                   :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                                   :type="'select'"
+                                   :triggerChange="false" dictCode="source_language"/>
               </a-form-model-item>
               <span class="text-icon">
                   <a-icon type="arrow-right" style="font-size: 20px"/>
               </span>
-              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="translationLanguageOne">
-                <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
-                          class="box-input"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          v-model="formInline.translationLanguageOne">
-                  <a-select-option v-for="(item, key) in LanguageList"
-                                   :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
+              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="targetLanguage">
+                <j-dict-select-tag class="box-input" v-model="formInline.targetLanguage"
+                                   @input="handleInput('targetLanguage')"
+                                   :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                                   :type="'select'"
+                                   :triggerChange="false" dictCode="target_language"/>
               </a-form-model-item>
             </div>
           </a-col>
         </a-row>
       </a-form-model>
     </a-modal>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <uploadFile ref="uploadFile" :restrictUploads="true" :isMultiple="true" @uploadSuccess="uploadSuccess"/>
     <standardData ref="standardDataRef" @standardDataForm="standardDataForm"/>
   </div>
 </template>
@@ -133,35 +117,35 @@
         confirmLoading: false,
         formInline: {},
         rules: {
-          file: [
+          sourceFileId: [
             {
               required: true,
               message: this.$t('file') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          standard: [
+          serialNumber: [
             {
               required: true,
               message: this.$t('standard') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          translationResults: [
+          textStatus: [
             {
               required: true,
               message: this.$t('TextStatus') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          translationLanguage: [
+          sourceLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          translationLanguageOne: [
+          targetLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
@@ -175,8 +159,18 @@
       }
     },
     mounted() {
+      this.getTextStatus()
     },
     methods: {
+      getTextStatus() {
+        getAction('/docTranslation/docTranslationEO/queryTextStatusVal', {}).then((res) => {
+          if (res.success) {
+            this.translationResultsList = res.result || []
+          } else {
+            this.translationResultsList = []
+          }
+        })
+      },
       add() {
         this.visible = true
         this.formInline = {}
@@ -193,18 +187,16 @@
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            let ids = JSON.parse(JSON.stringify(this.ids))
             let query = {
-              ids: ids.join(','),
               ...this.formInline
             }
             this.confirmLoading = true
-            postAction(this.url.setBatch, query).then((res) => {
+            postAction('/docTranslation/docTranslationEO/add', query).then((res) => {
               if (res.success) {
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.visible = false
                 this.confirmLoading = false
-                this.$emit('batSettingList')
+                this.$emit('addModelForm')
               } else {
                 this.$message.warning(this.$t('operationFailed'))
                 this.confirmLoading = false
@@ -232,20 +224,36 @@
       /** 上传文件的回调 */
       uploadSuccess(data) {
         let attIdList = []
+        let fileName = []
         if (data && data.length > 0) {
           data.map(item => {
             attIdList.push(item.id || data.name)
+            fileName.push(item.fileName)
           })
         }
         /** 赋值给当前对应的表单文件 */
         this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline.fileName = fileName.join(',')
         this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          if (this.formInline[this.uploadName]) {
+            this.$refs.ruleForm.validateField([this.uploadName])
+          }
+        })
       },
       standardClick() {
         this.$refs.standardDataRef.addModel()
       },
-      standardDataForm() {
-
+      standardDataForm(row) {
+        this.formInline.serialNumber = row.serial_number
+        this.formInline.title = row.title
+        this.formInline.bussDocumentLibraryId = row.id
+        this.formInline = { ...this.formInline }
+        this.$nextTick(() => {
+          if (this.formInline.serialNumber) {
+            this.$refs.ruleForm.validateField(['serialNumber'])
+          }
+        })
       }
     }
   }

jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+             <span style="line-height: 66px;display: inline-block;float: left" @click="Fallback">
+               <a-icon type="arrow-left" style="margin-right: 6px;"/>
+             </span>
+          <span> {{$t('DocumentTranslation')}}</span>
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="detail-content-left">
+            <div class="detail-text-top">
+              {{$t('originalText')}}
+            </div>
+            <div class="detail-text">
+              汽车用LED前照灯
+
+              1 范围
+
+              本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色、温度循环等试验方法和检验规则等，
+              本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。
+
+              2 规范性引用文件
+
+              下列文件中的条款，通过本标准的引用而成为本标准的条款，凡是注日期的引用文件，其随后所有的修改单（不包括勘误的内容）或修订版均不适用于本标准，然而,鼓励根据本标准达成协议的各方研究是否可使用这些文件的最新版本。凡是不注日期的引用文件，其最新版本适用于本标准.
+              GB 4599—2007 汽车用灯丝灯泡前照灯
+              GB 4785 汽车及挂车外部照明和光信号装置的安装规定
+              GB/T 7922 照明光源颜色的测量方法
+              GB 15766.1 道路机动车辆灯丝灯泡 尺寸、光电性能要求
+
+              3 术语和定义
+
+              GB 4599—2007和GB 4785中确立的，以及下列术语和定义适用于本标准占
+              3. 1
+              目标光通量： objective luminous flux
+              可更换光源或光源模块光通量的设计值。
+              3.2
+              光源失效 failure of light source
+              LED或LED模块在正常使用条件下，一个或多个LED失去发光功能、变暗、色度超标、或出现闪烁的现象。
+              3.3
+              LED 模块 LED module
+              仅含有LED的光源模块。
+
+              4 前照灯的不同型式
+
+              在以下主要方面有差异的前照灯：
+              ——商品名称或商标；
+              ——光学系统的特性；
+              ——通过反射、折射、吸收和/或工作时的变形，改变光学效果的部件；
+              ——提供的光束种类（近光，远光或远、近光）；
+              ——配光镜及其涂层的材料；
+
+
+              ——LED光源/模块类型和参数（电压、功率、光通量、色度、显色性九
+              5 要求
+              5.1 一般要求
+              5.1. 1 LED前照灯应设计和制造成在正常使用条件下，即使受到振动，仍能保证满足使用要求和符合本标准规定。
+              5.1.2 LED前照灯应具有良好的散热性，防止LED光源热堆积，LED前照灯即使在低温凝冻的环境下仍能正常工作，
+              5.1.3 LED前照灯应具有良好的电磁兼容性能。
+              5.1.4 当前照灯装有LED光源或LED模块时其性能均应满足本标准要求；当LED前照灯中装有灯丝灯泡或HID光源实现远光或近光功能时，其配光性能和检测应分别满足其相应标准的要求，
+              5.1.5 前照灯应具有光束调整装置，当近光灯和远光灯形成一组合体，并各自装有LED光源/模块、灯丝灯泡（或灯光组）时，调整装置应能对它们分别进行调整,这些要求不适用于远光灯和近光灯不能单独调节的前照灯，
+            </div>
+          </div>
+          <div class="detail-content-right">
+            <div class="detail-text-top">
+              {{$t('translatedText')}}
+            </div>
+            <div class="detail-text">
+              LED headlamp for automobile
+              one Range
+              This standard specifies the test methods and inspection rules for light distribution performance, light
+              color, temperature cycle, etc. of automotive LED light source / module or headlamp containing LED light
+              source / module,
+              This standard is applicable to LED headlamps used by M and N vehicles, or LED headlamps that mainly form
+              high beam or low beam by LED light source or LED module.
+              two Normative references
+              The provisions in the following documents become the provisions of this standard through the reference of
+              this standard. For dated references, all subsequent amendments (excluding the contents of Corrigendum) or
+              revisions are not applicable to this standard. However, parties to agreements based on this standard are
+              encouraged to study whether the latest versions of these documents can be used. For undated references,
+              the latest edition is applicable to this standard
+              GB 4599—2007 Automotive filament bulb headlamps
+              GB 4785 Provisions for the installation of exterior lighting and light signalling devices for automobiles
+              and trailers
+              GB/T 7922 Methods of measuring the color of lighting sources
+              GB 15766.1 Requirements for dimensions and photoelectric performance of filament bulbs for road motor
+              vehicles
+              three Terms and definitions
+              The terms and definitions established in GB 4599-2007 and GB 4785 and the following terms and definitions
+              are applicable to this standard
+              3. 1
+              Objective luminous flux
+              Design value of luminous flux of replaceable light source or light source module.
+              three point two
+              Failure of light source
+              Under normal use conditions of LED or LED module, one or more LEDs lose light-emitting function, darken,
+              chromaticity exceeds the standard, or flicker.
+              three point three
+              LED module
+              Light source module with led only.
+              four Different types of headlamps
+              Headlamps that differ in the following main respects:
+              ——Trade name or trademark;
+              ——Characteristics of optical system;
+              ——Components that change the optical effect through reflection, refraction, absorption and / or
+              deformation during operation;
+              ——Type of beam provided (low beam, high beam or high beam and low beam);
+              ——Materials of lens and its coating;
+              ——LED light source / module type and parameters (voltage, power, luminous flux, chromaticity, color
+              rendering IX
+              five requirement
+              five point one general requirements
+              5.1. one The LED headlamp shall be designed and manufactured to ensure that it can meet the use
+              requirements and comply with the provisions of this standard even if it is vibrated under normal
+              conditions of use.
+              5.1.2 The LED headlamp shall have good heat dissipation to prevent thermal accumulation of LED light
+              source. The LED headlamp can work normally even in the low-temperature freezing environment,
+              5.1.3 LED headlamp shall have good electromagnetic compatibility performance.
+              5.1.4 When the headlamp is equipped with LED light source or LED module, its performance shall meet the
+              requirements of this standard; When the LED headlamp is equipped with filament bulb or HID light source to
+              realize the function of high beam or low beam, its Photometric Performance and detection shall meet the
+              requirements of corresponding standards respectively,
+              5.1.5 The headlamp shall have a beam adjustment device. When the dipped beam and the high beam form a
+              combination and each is equipped with an LED light source / module and a filament bulb (or light group),
+              the adjustment device shall be able to adjust them respectively. These requirements do not apply to
+              headlamps where the high beam and the low beam cannot be adjusted separately,
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'documentTranslationResults',
+    data() {
+      return {}
+    },
+    mounted() {
+    },
+    methods: {
+      Fallback() {
+        this.$router.push({
+          path: '/documentTranslation'
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        z-index: 1000;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+      }
+    }
+  }
+
+  .detail-content {
+    padding: 32px;
+    box-sizing: border-box;
+  }
+
+  .detail-content-left {
+    width: calc(50% - 12px);
+    height: calc(100vh - 130px);
+    float: left;
+    border: 1px solid #CED0D8;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    overflow: auto;
+  }
+
+  .detail-content-right {
+    float: left;
+    width: calc(50% - 12px);
+    padding: 24px 32px;
+    margin-left: 24px;
+    height: calc(100vh - 130px);
+    box-sizing: border-box;
+    border: 1px solid #CED0D8;
+    overflow: auto;
+  }
+
+  .detail-text-top {
+    height: 30px;
+    font-size: 18px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 20px;
+  }
+
+  .detail-text {
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>

jero-web/src/views/documentTools/documentTranslation/components/standardData.vue

@@ -157,7 +157,7 @@
         total: 0,
         fieldList: [],
         queryConditionVOList: [],
-        selectedRowKeysRecord:[],
+        selectedRowKeysRecord: []
       }
     },
     mounted() {
@@ -214,12 +214,12 @@
           }
         })
       },
-      onSelectChange(value) {
+      onSelectChange(value,record) {
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
         }
-        this.selectedRowKeysRecord = record.filter(res=>{
+        this.selectedRowKeysRecord = record.filter(res => {
           return res.id == this.selectedRowKeys[0]
         })
         this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
@@ -229,8 +229,7 @@
       },
       handleSubmit() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.confirmLoading = true
-          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.$emit('standardDataForm', this.selectedRowKeysRecord[0])
           this.visible = false
         } else {
           this.$message.warning(this.$t('selectLeastOne'))

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -26,19 +26,10 @@
               <div class="title-text" :title="$t('translationResults')">
                 <span>{{$t('translationResults')}}</span>
               </div>
-              <a-select :placeholder="$t('PleaseSelect')+$t('translationResults')"
-                        class="box-input"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        allowClear
-                        v-model="queryParam.translationResults">
-                <a-select-option v-for="(item, key) in translationResultsList"
-                                 :key="key"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                </a-select-option>
-              </a-select>
+              <j-dict-select-tag class="box-input" v-model="queryParam.translationResult"
+                                 :placeholder="$t('PleaseSelect')+$t('translationResults')"
+                                 :type="'select'"
+                                 :triggerChange="false" dictCode="translation_result"/>
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -47,19 +38,10 @@
                 <div class="title-text" :title="$t('releaseSituation')">
                   <span>{{$t('releaseSituation')}}</span>
                 </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
-                          class="box-input"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          v-model="queryParam.flowStatus">
-                  <a-select-option v-for="(item, key) in gatherResultList"
-                                   :key="key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
+                <j-dict-select-tag class="box-input" v-model="queryParam.releaseCondition"
+                                   :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                                   :type="'select'"
+                                   :triggerChange="false" dictCode="release_condition"/>
               </div>
             </a-col>
           </template>
@@ -105,13 +87,18 @@
         <!--         -->
         <span slot="operation" slot-scope="text,record">
           <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
-          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>
-                     <a class="text-operation"
-                        @click="subscribe(record)">
-            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+          <!--          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
+           <a class="text-operation"
+              v-if="record.createBy == userInfoQuery.username"
+              @click="subscribe(record)">
+            {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
-          <a class="text-operation" @click="downloadData(record)">{{$t('download')}}</a>
-          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+          <a class="text-operation"
+             v-if="record.translationResult == 'Translation done'"
+             @click="downloadData(record)">{{$t('download')}}</a>
+          <a class="text-operation"
+             v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
+             @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -133,9 +120,11 @@
 </template>
 
 <script>
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import addModel from './components/addModel'
   import RetrieveFilesList from './components/RetrieveFilesList'
+  import eventBUs from '../../../common/event'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
@@ -147,8 +136,8 @@
       return {
         //url传参严格按照当前命名
         url: {
-          list: '',
-          deleteBatch: ''
+          list: '/docTranslation/docTranslationEO/page',
+          deleteBatch: '/docTranslation/docTranslationEO/deleteBatch'
         },
         toggleSearchStatus: false,
         loading: false,
@@ -158,30 +147,7 @@
         pageSize: 10,
         pageNo: 1,
         queryParam: {},
-        gatherResultList: [
-          {
-            value: '1',
-            name: this.$t('draft')
-          },
-          {
-            value: '2',
-            name: this.$t('Published')
-          }
-        ],
-        translationResultsList: [
-          {
-            value: '1',
-            name: this.$t('Converting')
-          },
-          {
-            value: '2',
-            name: this.$t('convertNetwork')
-          },
-          {
-            value: '3',
-            name: this.$t('convertFailed')
-          }
-        ],
+        userInfoQuery: {},
         columns: [
           {
             title: this.$t('standard'),
@@ -200,7 +166,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'TextStatus'
+            dataIndex: 'textStatus_dictText'
           },
           {
             title: this.$t('fileName'),
@@ -212,13 +178,13 @@
           {
             title: this.$t('translationLanguage'),
             align: 'center',
-            dataIndex: 'translationLanguage',
+            dataIndex: 'targetLanguage_dictText',
             width: 170
           },
           {
             title: this.$t('translationResults'),
             align: 'center',
-            dataIndex: 'translationResults',
+            dataIndex: 'translationResult_dictText',
             width: 170
           },
           {
@@ -226,14 +192,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_dictText'
           },
           {
             title: this.$t('operation'),
@@ -247,12 +213,16 @@
     },
     mounted() {
       this.getList()
+      this.userInfoQuery = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       addModelForm() {
+        this.pageNo = 1
         this.getList()
       },
       RetrieveFilesListForm() {
+        this.pageNo = 1
         this.getList()
       },
       handleToggleSearch() {
@@ -303,16 +273,42 @@
         this.selectedRowKeys = value
       },
       viewClick(row) {
-
+        let newUrl = this.$router.resolve({
+          path: '/documentTranslationResults'
+        })
+        window.open(newUrl.href, '_blank')
       },
-      checkClick(row) {
-
+      // checkClick(row) {
+      //
+      // },
+      downloadData(fileQuery) {
+        downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.targetFileId })
       },
-      downloadData() {
-
-      },
-      subscribe() {
-
+      subscribe(record) {
+        let _this = this
+        this.$confirm({
+          content: record.releaseCondition == 'draft' ? _this.$t('confirmRelease') : _this.$t('confirmWithdraw'),
+          onOk() {
+            let releaseCondition = ''
+            if (record.releaseCondition == 'draft') {
+              releaseCondition = 'published'
+            } else {
+              releaseCondition = 'draft'
+            }
+            let query = {
+              releaseCondition: releaseCondition,
+              ids: record.id
+            }
+            postAction('/docTranslation/docTranslationEO/updateRleaseConditionBatch', query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
       },
       uploadClick() {
         this.$refs.addModelRef.add()
@@ -320,15 +316,34 @@
       RetrieveFilesClick() {
         this.$refs.RetrieveFilesListRef.addModel()
       },
-      BatchDelete(){
-
+      BatchDelete() {
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          this.$confirm({
+            content: _this.$t('ConfirmBatchDeletion'),
+            onOk() {
+              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(res.message)
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
       deleteData(val) {
         let _this = this
         this.$confirm({
           content: _this.$t('ConfirmDelete'),
           onOk() {
-            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+            deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()

jero-web/src/views/externalReports/components/addModel.vue

@@ -1,104 +1,108 @@
 <template>
-  <a-modal
-    :title="title"
-    :maskClosable="false"
-    :width="800"
-    placement="right"
-    :closable="true"
-    @cancel="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
-      <a-form>
-        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text"
-                        :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model.trim="formInline.paramsTemplateName"
-                           :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="region">
-                  <j-dict-select-tag class="box-input" v-model="formInline.region"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'region'"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <div class="box-title-text">
-                <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="description">
-                  <a-input class="box-input add-input"
-                           type="textarea"
-                           :disabled="disabled"
-                           v-model="formInline.description"
-                           :placeholder="$t('PleaseEnter')+$t('contentDescription')"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-        </a-form-model>
-      </a-form>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
-    </div>
-  </a-modal>
+  <div>
+      <a-modal
+        :title="title"
+        :maskClosable="false"
+        :width="800"
+        placement="right"
+        :closable="true"
+        @cancel="handleCancel"
+        :visible="visible"
+        style="height: 100%;overflow: auto;padding-bottom: 53px;">
+        <a-spin :tip="this.$t('Fileuploaded')" :spinning='spinning'>
+          <a-form>
+            <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+              <a-row :gutter="24">
+                <a-col :span="24">
+                  <div class="box-title-text">
+                    <div class="title-text">
+                      <span class="Required">*</span>
+                      <span class="title-text-text"
+                            :title="$t('fileName')">{{$t('fileName')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="sourceFileId">
+                      <a-button type="primary" class="button-text"
+                                @click="clickButtonToUpload('sourceFileId')">
+                        {{ (formInline.sourceFileId === 'null' || formInline.sourceFileId === '' ||
+                        formInline.sourceFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                        }}
+                      </a-button>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+                <a-row :gutter="24">
+                <a-col :span="24">
+                  <div class="box-title-text">
+                    <div class="title-text">
+    <!--                  <span class="Required">*</span>-->
+                      <span class="title-text-text" :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
+                    </div>
+                    <a-form-model-item class="itemModel" prop="description">
+                      <a-input class="box-input add-input"
+                               type="textarea"
+                               :disabled="disabled"
+                               :placeholder="$t('PleaseEnter')+$t('fileDeclaration')"
+                               v-model="formInline.description"/>
+                    </a-form-model-item>
+                  </div>
+                </a-col>
+              </a-row>
+            </a-form-model>
+          </a-form>
+        </a-spin>
+        <div class="drawer-bootom-button">
+          <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+          <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+        </div>
+      </a-modal>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+<!--    <div class="loading-box" v-if="spinning">-->
+<!--      <div class="loading-content">-->
+<!--        <a-icon class="loading" type="loading"/>-->
+<!--        <div class="loading-tips">-->
+<!--          {{this.$t('Fileuploaded')}}...-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+  </div>
+
 </template>
 
 <script>
 import PersonnelSelection from '@/components/PersonnelSelection/index'
 import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 
 export default {
   name: 'addModel',
   components: {
-    PersonnelSelection
+    PersonnelSelection,
+    uploadFile
   },
-  props: ['url'],
+  // props: ['url'],
   data() {
     return {
       formInline: {},
       confirmLoading: false,
+      spinning: false,
       visible: false,
+      url: {
+        add: 'params/template/add',
+        edit: 'params/template/edit',
+      },
       rules: {
-        paramsTemplateName:[
-          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' },
-          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
-        ],
         description:[
-          { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+          // { required: true, message: this.$t('PleaseEnter')+this.$t('fileDeclaration'), trigger: 'blur' },
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        state: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        sourceFileId: [
+          {
+            required: true,
+            message: this.$t('fileName') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
         ],
-        region: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
-        ]
       },
       disabled: false,
       projectNameList: [],
@@ -135,7 +139,12 @@ export default {
       })
     },
     handleCancel() {
-      this.visible = false
+      if(this.spinning == true){
+        this.visible = true
+        return
+      }else{
+        this.visible = false
+      }
     },
     handleSubmit() {
       if(this.formInline.paramsTemplateName !== undefined) {
@@ -143,6 +152,7 @@ export default {
       }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          this.spinning = true
           let url = ''
           let Action
           if (this.formInline.id) {
@@ -158,14 +168,14 @@ export default {
               query[res] = query[res].join(',')
             }
           })
-          this.confirmLoading = true
-          Action(url, query).then((res) => {
+          postAction(url, query).then((res) => {
             if (res.success) {
-              this.confirmLoading = false
+              this.spinning = false
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.$emit('addModelList')
             } else {
+              this.spinning = false
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
             }
@@ -186,6 +196,30 @@ export default {
     projectNameChange(value){
       console.log(value)
     },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.perentHandleFunc()
+      this.$refs.uploadFile.visible = true
+      this.uploadName = item
+      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
   }
 }
 </script>
@@ -306,4 +340,40 @@ export default {
 .ant-input-disabled {
   color: rgba(0, 0, 0, 0.65) !important;
 }
+</style>
+<style scoped lang="less">
+.loading-box {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999900;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 8px;
+  user-select: none;
+
+  .loading-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    color: #21c9cc;
+    transform: translate(-50%, -50%);
+    text-align: center;
+
+    .loading {
+      font-size: 28px;
+    }
+
+    .spin-loading {
+      animation: rotating 2s linear infinite;
+    }
+
+    .loading-tips {
+      margin-top: 5px;
+      font-size: 16px;
+      color: #21c9cc;
+    }
+  }
+}
 </style>

jero-web/src/views/externalReports/index.vue

@@ -8,7 +8,6 @@
               <a-input-search style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onLeftChange"
                               @search="onSearch"/>
               <a-tree
-                v-if="gData.length>0"
                 :selected-keys="selectedKeys"
                 :expanded-keys.sync="expandedKeys"
                 :auto-expand-parent="autoExpandParent"
@@ -44,17 +43,18 @@
                     <template #overlay>
                       <a-menu
                               @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}}
+                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('Addingfolder')}}
+                        </a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds" v-if="deleteNode"
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('Addingsubfolders')}}
                         </a-menu-item>
                         <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">
-                          {{$t('modifyNode')}}
+                          {{$t('Editfolder')}}
                         </a-menu-item>
                         <a-menu-item key="3" @click="orgDelete"
-                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('deleteNode')}}
-                        </a-menu-item>
-                        <a-menu-item key="4" @click="orgDelete" v-if="deleteNode"
-                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('add')}}
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('Deletefolders')}}
                         </a-menu-item>
+
                       </a-menu>
                     </template>
                   </a-dropdown>
@@ -90,7 +90,7 @@
                         <div class="title-text" :title="$t('uploadTime')">
                           <span>{{ $t('uploadTime') }}</span>
                         </div>
-                        <a-date-picker class="box-input"
+                        <a-range-picker
                                        style='width: 264px'
                                        :placeholder="$t('PleaseSelect')+$t('uploadTime')"
                                        @change="onChange"
@@ -143,7 +143,7 @@
           </a>
         </span>
                   <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>
+<!--            <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>-->
             <a class="text-operation" @click="download(record)">{{$t('download')}}</a>
             <a class="text-operation" @click="handleEdit(record)">{{$t('edit')}}</a>
             <a class="text-operation" @click="batchDel(record)">{{$t('delete')}}</a>
@@ -163,13 +163,14 @@
                 />
               </div>
               <!--  上传文件-->
-              <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+              <addModel  ref="addModelRef" @addModelList="addModelList"/>
               <!--  文件详情-->
               <handleModel :url="url" ref="handleModelRef" />
               <!--          添加节点-->
               <a-modal
                 class="add-menus"
                 :title="menuTitle"
+                :width="600"
                 :visible="menuRightVisible"
                 :confirm-loading="confirmLoading"
                 @cancel="handleCancelMenuRight"
@@ -184,16 +185,28 @@
                   :label-col="labelCol"
                   :wrapper-col="wrapperCol"
                 >
-                  <a-form-model-item :label="$t('clauseNo')" prop="name">
-                    <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')"/>
+                  <a-form-model-item :label="$t('Foldername')" prop="name">
+                    <a-input class="box-input add-input" v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
                   </a-form-model-item>
-                  <a-form-model-item :label="$t('clauseName')" prop="itemName">
-                    <a-input v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')"/>
+                  <a-form-model-item :label="$t('Administrativeprivileges')" prop="Administrativeprivileges">
+                    <PersonnelSelection class="box-input add-input"
+                                        :personneQuery="form"
+                                        :query="{db_field_name:'Administrativeprivileges',db_field_txt:$t('Administrativeprivileges')}"
+                                        @change="PersonnelSelectionChange"
+                                        v-model="form.Administrativeprivileges"/>
                   </a-form-model-item>
-                  <a-form-model-item :label="$t('serialNumber')" prop="displaySeq">
-                    <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
-                                    :placeholder="$t('PleaseEnter')+$t('serialNumber')" :formatter="limitNumber"
-                                    :parser="limitNumber" style="width: 100%"/>
+                  <a-form-model-item :label="$t('Checkthepermissions')" prop="Checkthepermissions">
+                    <PersonnelSelection
+                      class="box-input add-input"
+                      :personneQuery="form"
+                      :query="{db_field_name:'Checkthepermissions',db_field_txt:$t('Checkthepermissions')}"
+                      @change="PersonnelSelectionChange"
+                      v-model="form.Checkthepermissions"/>
+                  </a-form-model-item>
+                  <a-form-model-item :label="$t('Folderorder')" prop="displaySeq">
+                    <a-input-number v-model="form.displaySeq" :min="1" :max="99999" class="box-input add-input"
+                                    :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
+                                    :parser="limitNumber" />
                     <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
                   </a-form-model-item>
                 </a-form-model>
@@ -220,13 +233,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 +256,7 @@ export default {
       },
       pageSize: 10,
       pageNo: 1,
+      disabled:false,
       total: 0,
       tableData: [],
       selectedRowKeys: [],
@@ -267,15 +282,17 @@ export default {
       form: {},
       rules: {
         name: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
-          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+          { required: true, message: this.$t('PleaseEnter') + this.$t('Foldername'), trigger: 'blur' },
+          { min: 1, max: 50, message: this.$t('cantExeed') + '50' + this.$t('characters'), trigger: 'blur' }
         ],
-        itemName: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseName'), trigger: 'blur' },
-          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+        Administrativeprivileges: [
+          { required: true, message: this.$t('PleaseSelect') + this.$t('Administrativeprivileges'), trigger: 'change' },
+        ],
+        Checkthepermissions: [
+          { required: true, message: this.$t('PleaseSelect') + this.$t('Checkthepermissions'), trigger: 'change' },
         ],
         displaySeq: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('serialNumber'), trigger: 'blur' }
+          { required: true, message: this.$t('PleaseEnter') + this.$t('Folderorder'), trigger: 'blur' }
           // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
         ]
       },
@@ -393,6 +410,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 +570,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')
@@ -603,7 +630,7 @@ export default {
     handleCancelMenuRight() {
       this.menuRightVisible = false
     },
-    //增加条款确定
+    //增加文件夹确定
     hideModalMenuRight() {
 
       let expandId = []
@@ -783,8 +810,15 @@ export default {
 
       downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
     },
-    onChange(){
-
+    onChange(value,dateString){
+      if (this.queryParams.uploadTime && this.queryParams.uploadTime.length > 0) {
+        let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
+        let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
+        this.queryParams.uploadTime = [dateOne, dateTwo]
+      } else {
+        this.queryParams.uploadTime = []
+        // this.queryParamOne[item + '_name'] = []
+      }
     },
     selectClear() {
       this.$refs.splitDetailTabel.selectedRowKeys = []
@@ -930,7 +964,12 @@ export default {
     },
     // 上传文件
     handleuploadFile(e) {
-      this.$refs.addModelRef.addModel()
+      if (this.menuId) {
+        this.$refs.addModelRef.addModel()
+      } else {
+        this.$message.warning(this.$t('selectDirectorylocation'))
+      }
+
     },
     onSearch() {
       let self = this

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -17,6 +17,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('certificationCategory')">
+                    <span class="Required">*</span>
                     <span>{{$t('certificationCategory')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="certCategory">
@@ -35,6 +36,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('configure')">
+                    <span class="Required">*</span>
                     <span>{{$t('configure')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="configIds">
@@ -59,6 +61,7 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
                   </div>

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.paramsManifest.title)}}
+          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
         </span>
       </div>
     </div>
@@ -108,7 +108,7 @@
             <!--      // R&H Manager manager-->
             <!--      // 系统管理员 admin-->
             <!--      // 游客 guest-->
-            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo"'>
               <template slot="title" id="popconfirm">
                 <!--      添加-->
                 <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -121,10 +121,9 @@
 <!--                  {{$t('distributionAndCollection')}}-->
 <!--                </div>-->
                 <!--      导出-->
-                <div @click="handleExport" class="operator-text-title"
-                     v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+                <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="export"/>
-                  {{$t('export')}}
+                  {{$t('dataExport')}}
                 </div>
                 <!--     一键下发收集 -->
                 <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -171,6 +170,11 @@
               <a-icon type="copy"/>
               {{$t('Assignedby')}}
             </div>
+            <!--      导出-->
+            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
+              <a-icon type="export"/>
+              {{$t('dataExport')}}
+            </div>
             <!--      引用参数-->
             <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '>
               <a-icon type="plus"/>
@@ -194,7 +198,7 @@
             </div>
             <!--      强制撤回-->
             <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
-                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
               <a-icon type="delete"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>
@@ -204,7 +208,7 @@
                  v-if="!this.$route.query.it"
                  @click="roleSwitchingClick">
               <a-icon type="select"/>
-              {{ $t('roleSwitching') }}
+              {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})
             </div>
           </div>
           <div style="width: 100%">
@@ -584,6 +588,7 @@
         configureareaVisible: false, // 配置的彈框
         pageNo: 1,
         pageSize: 10,
+        rolename:'',
         total: 0,
         selectedRowKeysArray: '',
         templatetitle: '',
@@ -643,7 +648,6 @@
     mounted() {
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
-      // this.LoginUserType()
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -690,6 +694,11 @@
                 this.visibleRoleSwitching = false
                 this.confirmLoadingRoleSwitching = false
                 localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
+                this.RoleType.forEach((item,index) => {
+                  if(item.value == this.currentPersonRole){
+                    this.rolename = item.label
+                  }
+                })
                 this.selectedRowKeysValue = []
               } else {
                 this.confirmLoadingRoleSwitching = false
@@ -1025,6 +1034,11 @@
           this.currentPersonRole = currentPersonRole || userType || val[0].value
         }
         this.RoleType = val
+        this.RoleType.forEach((item,index) => {
+          if(item.value == this.currentPersonRole){
+            this.rolename = item.label
+          }
+        })
         this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
         this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
       },
@@ -1103,7 +1117,7 @@
       },
       getFreeze(callback) {
         let _this = this
-        let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
+        let param = { paramsManifestId: this.$route.query.id, configFlag: 1 }
         axios({
           url: '/jero-boot/params/collectManifest/getConfigLableList',
           method: 'post',
@@ -1659,7 +1673,6 @@
     cursor: pointer;
     border-radius: 4px;
   }
-
   .operator-text-title {
     cursor: pointer;
     margin-right: 22px;
@@ -1808,4 +1821,9 @@
   .text-wraning{
     word-break: break-word;
   }
+</style>
+<style lang='less'>
+.ant-popover-message-title{
+  margin-bottom: -30px;
+}
 </style>

jero-web/src/views/regulationsKanban/index.vue

@@ -33,9 +33,9 @@
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
-            <div class="box-title-text">
+            <div class="box-title-text tree-select">
               <div class="title-text" :title="$t('technicalField')">
-                <span>{{ $t('technicalField') }}</span>
+                <span>{{$t('technicalField')}}</span>
               </div>
               <a-tree-select
                 tree-node-filter-prop="title"
@@ -48,10 +48,6 @@
                 tree-checkable
                 :placeholder="$t('PleaseSelect')+$t('technicalField')"
               />
-<!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">