From d1afece6a525c40a8cd0cf45993d94a3bfc626f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 17:58:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue index da44748fb..b998e89aa 100644 --- a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue @@ -10,8 +10,8 @@
{{$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) } }) } From cae532d0b266bf2828e773dd0b2527910f5337b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 18:08:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E3=80=81=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentManage/collection/index.vue | 14 +++++++------- .../src/views/documentTools/searchCenter/index.vue | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) 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 @@ - - - - + + + + From 26374b1d214fc7606146c94bb25f85336a76b954 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 31 Aug 2022 18:12:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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