diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java index 53ea08cfd..82b3dec8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCommentEOController.java @@ -67,8 +67,8 @@ public class ProjectCommentEOController extends JeroController> queryList() { - List list = projectCommentEOService.getInfoList(); + public Result> queryList(ProjectCommentEO projectCommentEO) { + List list = projectCommentEOService.getInfoList(projectCommentEO); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java index cec006357..d684bbaaf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectReplyEOController.java @@ -80,7 +80,7 @@ public class ProjectReplyEOController extends JeroController add(ProjectReplyEO projectReplyEO) { + public Result add(@RequestBody ProjectReplyEO projectReplyEO) { projectReplyEOService.add(projectReplyEO); return Result.OK("添加成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java index e13ad165b..5f8f9ee25 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCommentEOService.java @@ -62,5 +62,5 @@ public interface IProjectCommentEOService extends IService { List queryList(); - List getInfoList(); + List getInfoList(ProjectCommentEO projectCommentEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java index 55cd1e5ea..334ee2e1e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -101,11 +101,11 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl getInfoList() { + public List getInfoList(ProjectCommentEO projectCommentEOTemp) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //评论的内容 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()); + wrapper.in(ProjectCommentEO::getCreateBy,sysUser.getUsername()).in(ProjectCommentEO::getProjectLibraryId,projectCommentEOTemp.getProjectLibraryId()); List projectCommentEOS = this.list(wrapper); List projectCommentIdList = projectCommentEOS.stream().map(ProjectCommentEO::getId).collect(Collectors.toList()); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index dc15b7c5c..c9f3d1ae1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + pleaseSelectData: 'please Select Data', + templateCopy: 'template Copy', NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', attachmentTemplate: 'attachment Template', controlAlternatives: 'control Alternatives', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 6f72610d1..7ea56f0ad 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -712,6 +712,8 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + pleaseSelectData: '请选择数据', + templateCopy: '模板复制', NiOnumberalreadyexists: 'NIO编号已存在,请更换NIO编号', attachmentTemplate: '附件模板', controlAlternatives: '控件备选值', diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index c90cabb98..6a8cdc022 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -40,6 +40,10 @@ dummyInventoryBaseId: { type: String, default: '' + }, + paramsTemplateId: { + type: String, + default: '' } }, data() { @@ -54,6 +58,8 @@ return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId } else if (this.dummyInventoryBaseId) { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId + } else if (this.paramsTemplateId) { + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '¶msTemplateId=' + this.paramsTemplateId } return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut } diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index d2c3664f3..ccaaf9a15 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -88,6 +88,25 @@ /> + + + + + + {{$t('parameterTemplate')}} + + + + + +
+ {{$t('cancel')}} + {{$t('submit')}} +
+
@@ -120,7 +139,8 @@ export default { add: 'params/template/add', edit: 'params/template/edit', deleteBatch: 'params/template/delete', - deleteAll: 'params/template/deleteBatch' + deleteAll: 'params/template/deleteBatch', + copy: 'params/template/copyById' }, total: 0, pageSize: 10, @@ -169,13 +189,29 @@ export default { scopedSlots: { customRender: 'operation' } } ], - queryParam: {} + queryParam: {}, + areaVisible:false, + paramsTemplateName: '', } }, mounted() { this.getList() }, methods: { + handleCancel() { + this.areaVisible=false + }, + handleSubmit() { + getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}¶msTemplateName=${this.paramsTemplateName}`, {}).then((res) => { + if (res.success) { + this.areaVisible=false + this.$message.success(res.message) + this.getList() + } else { + this.$message.warning(res.message) + } + }) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, @@ -189,7 +225,16 @@ export default { }, // 复制 handlecody(){ - + if (this.selectedRowKeys.length > 1) { + this.$message.warning(this.$t('OnlyOneSelected')) + } else if(this.selectedRowKeys.length == 0){ + this.$message.warning(this.$t('pleaseSelectData')) + } else { + this.areaVisible=true + } + }, + hideModal(){ + this.visible = false; }, //批量删除 handleDel() { diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 1d0057fc2..3d1864209 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -53,7 +53,7 @@ {{$t('templateDownload')}}
- +
diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index e1da6a4bb..08b73d8d9 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -49,6 +49,7 @@
{{$t('noComment')}}
+ {{$t('dataLoading')}}
+ * {{title}}
@@ -97,6 +99,7 @@ visible: false, dataList: [], formInline: {}, + loading: false, title: this.$t('comment'), confirmLoading: false, visibleComment: false, @@ -137,12 +140,18 @@ this.title = this.$t('publishComment') this.formInline = {} this.visibleComment = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, getList() { - getAction(this.url.list, {}).then((res) => { + this.loading = true + getAction(this.url.list, { projectLibraryId: this.$route.query.id }).then((res) => { if (res.success) { + this.loading = false this.dataList = res.result || [] } else { + this.loading = false this.dataList = [] } }) @@ -165,17 +174,20 @@ projectCommentId: this.formInline.projectCommentId } } + this.confirmLoading = true postAction(url, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) + this.visibleComment = false + this.confirmLoading = false this.getList() } else { + this.confirmLoading = false this.$message.success(this.$t('operationFailed')) } }) } }) - this.visibleComment = false }, handleCancelComment() { this.visibleComment = false @@ -185,6 +197,9 @@ this.formInline.projectCommentId = row.id this.title = this.$t('replyToComments') this.visibleComment = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) } } } @@ -308,7 +323,7 @@ } .title-text { - width: 64px; + width: 74px; text-align: right; display: inline-block; font-weight: 500;