diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index 8906be54b..0a0b444a8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -22,10 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -197,4 +194,23 @@ public class ParamsReportDetailEOController extends JeroController save(@RequestBody ParamsReportDetailVO paramsReportDetailVO) { + boolean isSuccess = paramsReportDetailEOService.save(paramsReportDetailVO.getConfigDataList(), paramsReportDetailVO.getParamsManifestId()); + if (isSuccess) { + return Result.OK("保存成功！"); + } else { + return Result.error("保存失败！"); + } + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index 16dce9473..dc3818c1d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -23,4 +23,11 @@ public interface IParamsReportConfigDataEOService extends IService queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId); + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + List queryListByConfigIdList(List configIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java index 4c0d18c9c..076a08978 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java @@ -1,7 +1,8 @@ package com.jero.modules.cert.report.service; -import com.jero.modules.cert.report.entity.ParamsReportConfigEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.report.entity.ParamsReportConfigEO; + import java.util.List; /** @@ -12,5 +13,10 @@ import java.util.List; */ public interface IParamsReportConfigEOService extends IService { + /** + * 列表查询 + * @param paramsManifestId + * @return + */ List queryList(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 551b001b1..9f377b597 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -56,4 +56,7 @@ public interface IParamsReportDetailEOService extends IService> configDataList, String paramsManifestId); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index ac69c6438..cce1ae4ed 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; @@ -38,4 +39,20 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl queryByConfigIdListAndCollectManifestId(List paramsConfigIdList, String paramsCollectManifestId) { return baseMapper.selectByConfigIdListAndCollectManifestId(paramsConfigIdList, paramsCollectManifestId); } + + /** + * 查询清单的所有配置数据 + * @param configIdList + * @return + */ + @Override + public List queryListByConfigIdList(List configIdList) { + if (CollectionUtil.isNotEmpty(configIdList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportConfigDataEO::getParamsConfigId, configIdList); + return list(queryWrapper); + } + return null; + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 7810e4dd3..0330b1067 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; import com.jero.modules.cert.report.entity.*; +import com.jero.modules.cert.report.enums.ExportTemplateStateEnum; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper; import com.jero.modules.cert.report.service.*; @@ -674,7 +675,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> getTemplateLabelList() { // 查询所有导出模板 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime); + queryWrapper.eq(ParamsExportTemplateEO::getState, ExportTemplateStateEnum.ENABLE.getValue()) + .orderByDesc(ParamsExportTemplateEO::getCreateTime); List paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper); List> templateLabelList = new ArrayList<>(); @@ -1366,6 +1368,103 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> configDataList, String paramsManifestId) { + List newConfigDataEOList = new ArrayList<>(); + List paramsReportConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsReportConfigIdList = paramsReportConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsReportConfigDataEOList = paramsReportConfigDataEOService.queryListByConfigIdList(paramsReportConfigIdList); // 查询所有配置数据 + + // 处理数据 + for (Map map : configDataList) { + String paramsCollectManifestId = (String) map.get("id"); + + // 添加配置数据 + for (Map.Entry entry : map.entrySet()) { + ParamsReportConfigDataEO paramsReportConfigDataEO = new ParamsReportConfigDataEO(); + if ("id".equals(entry.getKey())) { + continue; + } + + // 取值 + String paramsReportConfigEOId = entry.getKey(); + Map paramsReportConfigDataMap = (Map) entry.getValue(); + // 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO） + List> configDataVOList = (List>) paramsReportConfigDataMap.get("list"); + + // 判断是新增还是修改 + ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList); + if (ObjectUtil.isNotEmpty(oldConfigDataEO)) { + paramsReportConfigDataEO.setId(oldConfigDataEO.getId()); + + } + paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); + paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); + if (CollectionUtil.isNotEmpty(configDataVOList)) { + for (Map paramsConfigDataVO : configDataVOList) { + String type = (String) paramsConfigDataVO.get("type"); + String dataValue = (String) paramsConfigDataVO.get("dataValue"); + + if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { + paramsReportConfigDataEO.setTextData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.PULL.getValue()) + || type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) { + paramsReportConfigDataEO.setPullData(dataValue); + + } else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) { + if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件 + // 处理文件connectId + String[] fileIdList = dataValue.split(","); + String connectId = UUID.randomUUID().toString().replace("-", ""); + List updateFileList = new ArrayList<>(); + for (int i = 0; i < fileIdList.length; i++) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileIdList[i]); + ossFile.setConnectId(connectId); + updateFileList.add(ossFile); + } + ossFileService.updateBatchById(updateFileList); + dataValue = connectId; + } else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) { + List ossFiles = ossFileService.getFileInfosByConnectId(dataValue); + if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件 + String connectId = UUID.randomUUID().toString().replace("-", ""); + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : dataValue.split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(connectId); + oSSFileList.add(ossFile); + } + ossFileService.updateFileInfo(oSSFileList); + dataValue = connectId; + } + } + paramsReportConfigDataEO.setFileConnectId(dataValue); + + } + } + } + newConfigDataEOList.add(paramsReportConfigDataEO); + } + } + + // 批量更新 + return paramsReportConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); + } + + private ParamsReportConfigDataEO getConfigDataEOByConfigIdAndCollectManifestId(String configId, String collectManifestId, List paramsReportConfigDataEOList) { + List configDataEOList = paramsReportConfigDataEOList.stream() + .filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(configDataEOList)) { + return configDataEOList.get(0); + } + return null; + } + /** * 实体对象转成Map * @param obj 实体对象 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java index 1ab8e7c79..d93101f2b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java @@ -3,6 +3,9 @@ package com.jero.modules.cert.report.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; +import java.util.Map; + @Data public class ParamsReportDetailVO { @@ -37,6 +40,9 @@ public class ParamsReportDetailVO { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; + @ApiModelProperty(value = "保存专用") + private List> configDataList; // 保存专用 + // 导出通用 private String cut; private String exportName; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index eca22b3fb..8648bb5b7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl impl sysUser.setUsername(ppEmployee.getWorker_user_id()); sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); - sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); +// sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); sysUser.setThirdId(ppEmployee.getWorker_user_id()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8b51e9e80..cddee045e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -788,7 +788,7 @@ module.exports = { copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completion Time', parameterTemplateName: 'Parameter Template Name', - onlyThree: 'Only letters, numbers, dashes (-), and decimal points (.) can be entered. , left slash, space six kinds of content ', + onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces', templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', @@ -1221,4 +1221,16 @@ module.exports = { dre:'dre', applicableInstructionsMarketList:'Applicable instructions of market list', pleaseSelectTheDataCompared:'Please select the data to be compared', + problemLabel:'Problem label', + personCharge:'Person in charge', + addLabel:'Add Label', + editLabel:'Edit Label', + applicableMarket:'Applicable market', + templateMaintenance:'Template maintenance', + associatedWebsite:'Associated website', + dropDownOptions:'Drop down options', + dropDownOptionMaintenance:'Drop down option maintenance', + displayInformation:'Display information', + addComparison:'Add comparison', + showOrNot:'Show or not', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 472fcb015..2b024825c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -804,7 +804,7 @@ module.exports = { copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', parameterTemplateName: '参数模板名称', - onlyThree: '只能输入字母，数字，横杠（-），小数点（.），左斜杠，空格六种内容', + onlyThree: '只能输入字母，数字，横杠（-），左斜杠，空格五种内容', templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', @@ -1324,4 +1324,16 @@ module.exports = { dre:'填写人', applicableInstructionsMarketList:'市场清单适用说明', pleaseSelectTheDataCompared:'请选择需要对比的数据', + problemLabel:'问题标签', + personCharge:'负责人', + addLabel:'新增标签', + editLabel:'编辑标签', + applicableMarket:'适用市场', + templateMaintenance:'模板维护', + associatedWebsite:'关联网址', + dropDownOptions:'下拉选项', + dropDownOptionMaintenance:'下拉选项维护', + displayInformation:'展示信息', + addComparison:'添加对比', + showOrNot:'是否展示', } \ No newline at end of file diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue new file mode 100644 index 000000000..2404a2e38 --- /dev/null +++ b/jero-web/src/components/CollectionTypeDisabled/index.vue @@ -0,0 +1,795 @@ + + + + + diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index 1b353803e..cd59122b3 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -1,36 +1,36 @@ @@ -85,4 +219,132 @@ } } } + + .box-text { + display: flex; + justify-content: space-between; + height: 60px; + line-height: 40px; + + .header-text { + font-size: 16px; + font-weight: 400; + color: #000F16; + } + } + + .content-text { + width: 100%; + display: flex; + flex-wrap: wrap; + + .text-field { + width: 33%; + margin-bottom: 8px; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + color: #040B29; + font-weight: 400; + } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + margin-top: 10px; + } + } + } + + .content { + font-size: 16px; + color: #040B29; + font-weight: 400; + } + + .content-icon { + height: 40px; + line-height: 40px; + font-size: 16px; + color: #040B29; + font-weight: 400; + text-align: right; + margin-top: 20px; + } + + .content-icon-text { + display: inline-block; + padding: 0 20px; + cursor: pointer; + line-height: 40px; + } + + .content-icon-text .icon { + font-size: 24px; + color: #3b4249 !important; + } + + .content-icon-text span { + display: inline-block; + margin-left: 4px; + } + + .box-title-text { + line-height: 1.4; + display: flex; + /*align-items: center;*/ + } + + .title-text { + width: 88px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; + color: #000F16; + } + + .box-input { + display: inline-block; + height: 38px; + width: 100%; + } + + .itemModel { + width: 100%; + display: inline-block; + margin-top: 2px; + margin-bottom: 12px; + } + + .content-button { + text-align: right; + } + + .header-btn { + height: 38px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index cdf207ef6..c229dafa3 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -27,7 +27,7 @@
-
+
diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index c12ecab81..bdcd92593 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -324,6 +324,7 @@ if (res.success) { this.loading = false this.$message.success(this.$t('OperationSuccessful')) + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 246dcc425..392dad7b4 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -26,19 +26,10 @@
{{$t('releaseSituation')}}
- - - - {{ item.name }} - - - +
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index ed60ad494..f255960da 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -66,7 +66,7 @@ :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}
- + {{$t('nonjoinder')}} @@ -82,11 +82,11 @@
- * + * {{$t('MergeSeparator')}}
- + ?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/, + message: this.$t('punctuationmark'), + trigger: 'blur' + } ], certCategory:[ { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' }, @@ -188,9 +193,9 @@ export default { flagChange(value){ console.log(value.target.value) if(value.target.value == 2){ - this.required = true - }else{ this.required = false + }else{ + this.required = true } }, getNameList() { diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 47bc18363..d178b43be 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -81,12 +81,17 @@
+ +
+ + {{$t('preservation')}} +
- + {{$t('ConventionalExport')}}
- + {{$t('CustomExport')}}
@@ -134,6 +139,7 @@ + {{this.$t('pleaseWaitWhileRunning')}} @@ -159,6 +165,7 @@ export default { columns:[], selectedRowKeys: [], formInline: {}, + textLoading:false, url: { tableHeader: 'report/detail/getHeader', tableList: 'report/detail/list', @@ -286,6 +293,59 @@ export default { this.formInline[value] = id this.formInline = { ...this.formInline } }, + // 保存 + handlePreservation(num) { + let _this = this + let postDate = [] + let data = JSON.parse(JSON.stringify(this.dataSource)) + let selectedRowKeysValue = [] + data.forEach(res => { + selectedRowKeysValue.push(res) + }) + console.log(selectedRowKeysValue) + for (let i = 0; i < selectedRowKeysValue.length; i++) { + let postDateobj = {} + let itemIn = Object.keys(selectedRowKeysValue[i]) + console.log(itemIn) + for (let j = 0; j < itemIn.length; j++) { + if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) { + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue) + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue instanceof Array) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + } + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + } + } + } + } + } + postDateobj.id = selectedRowKeysValue[i].id + postDate.push(postDateobj) + } + let configDataList = { configDataList: postDate } + if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { + this.textLoading = true + let query = { + ...configDataList, + paramsManifestId: this.$route.query.id + } + postAction('/report/detail/save', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList() + this.textLoading = false + } else { + _this.$message.warning(_this.$t('operationFailed')) + this.textLoading = false + } + }) + } else { + } + }, getTableList() { // console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) @@ -319,70 +379,6 @@ export default { getDataSource(data) { this.dataSource = data }, - handlePreservation(num) { - let _this = this - let postDate = [] - let data = JSON.parse(JSON.stringify(this.dataSource)) - let selectedRowKeysValue = [] - data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写') { - selectedRowKeysValue.push(res) - } - }) - for (let i = 0; i < selectedRowKeysValue.length; i++) { - let postDateobj = {} - let itemIn = Object.keys(selectedRowKeysValue[i]) - for (let j = 0; j < itemIn.length; j++) { - if (itemIn[j] !== 'sdt') { - if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') - } - if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() - } - } - } - } - } - postDateobj.id = selectedRowKeysValue[i].id - postDate.push(postDateobj) - } - let configDataList = { configDataList: postDate } - if (selectedRowKeysValue && selectedRowKeysValue.length > 0) { - if (num && num == 1) { - this.textLoading = true - } - let query = { - ...configDataList, - paramsManifestId: this.paramsManifest.id - } - postAction('/params/collectManifest/save', query).then((res) => { - if (res.success) { - if (num && num == 1) { - _this.$message.success(_this.$t('OperationSuccessful')) - this.textLoading = false - } - setTimeout(() => { - if (this.currentPersonRole == 'dre') { - this.handlePreservation() - } - }, 10000) - } else { - if (num && num == 1) { - _this.$message.warning(_this.$t('operationFailed')) - this.textLoading = false - } - } - }) - } else { - if (num && num == 1) { - this.$message.warning(this.$t('theCurrentListSaved')) - } - } - }, LoginUserType(val, currentPersonRole, userType) { this.RoleType = [] if (this.currentPersonRole == '') { diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index c3bf52f65..046e8655d 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -376,7 +376,7 @@ export default { { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' }, { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' }, { - pattern: /^[0-9a-zA-Z-/. ]{1,}$/, + pattern: /^[0-9a-zA-Z-/ ]{1,}$/, message: this.$t('onlyThree'), trigger: 'blur' } diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 57d5c035c..4786177ce 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -219,6 +219,8 @@ html += params[i].marker + params[i].seriesName + ":" + params[i].value; if (_this.queryParam.value == 1) { html += "%" + "
"; + }else{ + html +="
"; } } return html;