From 547eb8b79ef5fd4b9322ade54a537845527913b9 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:20:08 +0800
Subject: [PATCH] 公益 议题
---
src/views/article/publicSignUp.vue | 64 ++++++++++++++++++++-
src/views/article/discussionManage.vue | 38 ++++++++++++
src/api/discuss/userPublicEnroll.js | 13 ++++
src/option/discuss/publicDiscuss.js | 2
src/api/discuss/topics.js | 11 +++
src/api/discuss/publicDiscuss.js | 2
6 files changed, 122 insertions(+), 8 deletions(-)
diff --git a/src/api/discuss/publicDiscuss.js b/src/api/discuss/publicDiscuss.js
index f3f03f8..f954578 100644
--- a/src/api/discuss/publicDiscuss.js
+++ b/src/api/discuss/publicDiscuss.js
@@ -2,7 +2,7 @@
export const getListPd = (current, size, params) => {
return request({
- url: '/api/public_discuss/publicDiscuss/list',
+ url: '/api/public_discuss/publicDiscuss/page',
method: 'get',
params: {
...params,
diff --git a/src/api/discuss/topics.js b/src/api/discuss/topics.js
index 6403418..e4c1e63 100644
--- a/src/api/discuss/topics.js
+++ b/src/api/discuss/topics.js
@@ -23,6 +23,16 @@
})
}
+export const getCount = (params) => {
+ return request({
+ url: '/api/blade-topics/topics/list',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
export const getDetail = (id) => {
return request({
url: '/api/blade-topics/topics/detail',
@@ -58,4 +68,3 @@
data: row
})
}
-
diff --git a/src/api/discuss/userPublicEnroll.js b/src/api/discuss/userPublicEnroll.js
index 9839076..fa7b9b7 100644
--- a/src/api/discuss/userPublicEnroll.js
+++ b/src/api/discuss/userPublicEnroll.js
@@ -12,6 +12,18 @@
})
}
+export const getPageUser = (current, size, params) => {
+ return request({
+ url: '/api/blade-userPublicEnroll/userPublicEnroll/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const getDetail = (id) => {
return request({
url: '/api/blade-userPublicEnroll/userPublicEnroll/detail',
@@ -47,4 +59,3 @@
data: row
})
}
-
diff --git a/src/option/discuss/publicDiscuss.js b/src/option/discuss/publicDiscuss.js
index 0a1824c..26c8970 100644
--- a/src/option/discuss/publicDiscuss.js
+++ b/src/option/discuss/publicDiscuss.js
@@ -23,7 +23,7 @@
},
{
label: '参与人数',
- prop: 'number',
+ prop: 'topsCount',
searchSpan: 4,
search: true,
},
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index c18948e..c8c12ef 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -404,7 +404,43 @@
// 选择行
selectionList: [],
// 表单配置
- option: option,
+ option: {
+ selection: true,
+ height: "auto",
+ calcHeight: 54,
+ align: 'center',
+ menuAlign: 'center',
+ addBtn: false,
+ editBtn: false,
+ searchMenuSpan: 3,
+ searchBtn: true,
+ menuWidth: 500,
+ column: [{
+ label: 'ID',
+ prop: 'id',
+ searchSpan: 4,
+ // search: true,
+ },
+ {
+ label: '标题',
+ prop: 'title',
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: '参与人数',
+ prop: 'topsCount',
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: '截止时间',
+ prop: 'endTime',
+ searchSpan: 4,
+ search: true,
+ }
+ ]
+ },
// 表单列表
data: [],
dataTop: [],
diff --git a/src/views/article/publicSignUp.vue b/src/views/article/publicSignUp.vue
index 1f6a467..c6d7aec 100644
--- a/src/views/article/publicSignUp.vue
+++ b/src/views/article/publicSignUp.vue
@@ -32,7 +32,7 @@
<!-- <span slot="title" class="dialog-footer">
{{discussForm.ontitle}}
</span> -->
- <avue-crud :data="data" :option="option1"></avue-crud>
+ <avue-crud :data="dataUser" :page="pageUser" :option="option1" @on-load="getUser"></avue-crud>
</el-dialog>
@@ -45,8 +45,11 @@
getDetailPd,
addPd,
updatePd,
- removePd
+ removePd,
} from "@/api/discuss/publicDiscuss";
+ import {
+ getPageUser,
+ } from "@/api/discuss/userPublicEnroll";
import option from "@/option/discuss/publicDiscuss";
import {
mapGetters
@@ -204,14 +207,59 @@
currentPage: 1,
total: 0
},
+
+ // 分页信息
+ pageUser: {
+ pageSize: 10,
+ pageSizes: [10, 20, 30, 50, 100],
+ currentPage: 1,
+ total: 0
+ },
// 表单数据
form: {},
// 选择行
selectionList: [],
// 表单配置
- option: option,
+ option: {
+ selection: true,
+ height: "auto",
+ calcHeight: 54,
+ align: 'center',
+ menuAlign: 'center',
+ addBtn: false,
+ editBtn: false,
+ searchMenuSpan: 3,
+ searchBtn: true,
+ menuWidth: 500,
+ column: [{
+ label: 'ID',
+ prop: 'id',
+ searchSpan: 4,
+ // search: true,
+ },
+ {
+ label: '标题',
+ prop: 'title',
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: '参与人数',
+ prop: 'enrollCount',
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: '截止时间',
+ prop: 'endTime',
+ searchSpan: 4,
+ search: true,
+ }
+ ]
+ },
// 表单列表
data: [],
+ dataUser: [],
}
},
mounted() {
@@ -229,11 +277,21 @@
}
},
methods: {
+ getUser(page, params = {}) {
+ getPageUser(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.pageUser.total = data.total;
+ this.dataUser = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
userHandleClose() {
this.dialogVisiblesUser = false
},
openUser(row) {
this.dialogVisiblesUser = true
+ this.getUser(this.pageUser,params = {})
},
openDilog(row, type) {
this.dialogVisibles = true
--
Gitblit v1.9.3