From 4c8352e5dfd520423424c689ecc35e96ca1988de Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 09:12:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/article/components/deitDiscussion.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 1f9795d..e30c9a1 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -423,12 +423,23 @@
...this.query
}
data = Qs.stringify(data)
- exportBlob(
- `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data).then(
- res => {
- downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
- NProgress.done()
- })
+ if (this.type == 0 && this.newData.articleType === 4) {
+ exportBlob(
+ `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data
+ ).then(
+ res => {
+ downloadXls(res.data, `投票统计${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ } else {
+ exportBlob(
+ `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data)
+ .then(
+ res => {
+ downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ }
})
},
@@ -661,7 +672,7 @@
this.userPage.total = data.total
this.userData = data.records
this.userData.forEach(item => {
- if (item.avatar.length > 0) {
+ if (item.avatar) {
item.avatar = website.minioUrl + item.avatar
}
if (item.signaturePath && item.signaturePath.length > 0) {
@@ -684,4 +695,4 @@
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
--
Gitblit v1.9.3