diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 85f26e2c4..b43b2b7a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl {{$t('title')}} - + -
{{$t('CancelCollection')}}
+
{{$t('CancelCollection')}} +
@@ -98,7 +101,8 @@ loading: false, queryParams: {}, url: { - getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/queryCollectPageList', + deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/deleteBatch' } } }, @@ -107,7 +111,6 @@ }, watch: { checkboxText: function(value) { - console.log(value) this.conList.forEach(val => { val.checked = false }) @@ -159,9 +162,11 @@ this.$confirm({ content: _this.$t('BatchCancelCollection'), onOk() { - getAction('', {}).then((res) => { + let checkboxText = JSON.parse(JSON.stringify(_this.checkboxText)) + deleteAction(_this.url.deleteBatch, { ids: checkboxText.join(',') }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) + _this.checkboxText = [] _this.getList() } else { _this.$message.warning(res.message) @@ -178,7 +183,7 @@ this.$confirm({ content: _this.$t('confirmCancelCollection'), onOk() { - getAction('', {}).then((res) => { + deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -221,7 +226,7 @@ if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { if (val.content) { - val.contentOne = this.getText(val.content) + val.content = this.getText(val.content) } }) } diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 0e0ba89a0..5bb40aa2b 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -1,8 +1,8 @@ diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 8270a0c4b..7e7cd2b69 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + +