From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/discussionManage.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 4d4049f..0d961b0 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -19,13 +19,15 @@
编辑议题
</el-button>
- <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
+ <el-button icon="el-icon-user" :size="size" v-if="row.articleType != 4" :type="type"
+ @click.stop="openUserPopup(row, 0)">
参与用户
</el-button>
- <!-- <el-button icon="el-icon-user" v-if="row.type == 4" :size="size" :type="type" @click.stop="handleExport(row)">
- 导出用户
- </el-button> -->
+ <el-button icon="el-icon-user" v-if="row.articleType == 4" :size="size" :type="type"
+ @click.stop="handleExport(row)">
+ 导出投票结果
+ </el-button>
<el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
撤销
@@ -176,6 +178,7 @@
minRows: 2,
tags: true,
type: "tree",
+ dataType: "string",
multiple: true,
dicData: [],
rules: [{
@@ -508,7 +511,7 @@
},
methods: {
handleExport(row) {
- this.$confirm("是否导出投票人员数据?", "提示", {
+ this.$confirm("是否导出投票结果数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -516,6 +519,7 @@
NProgress.start()
this.query = {}
this.query.articleId = row.id
+ this.query.districtId = row.articleRange
var data = {
...this.query
}
@@ -524,7 +528,7 @@
`/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data)
.then(
res => {
- downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
+ downloadXls(res.data, `投票结果${dateNow()}.xlsx`)
NProgress.done()
})
})
@@ -554,8 +558,8 @@
})
},
- openUserPopup(row) {
- this.$refs.DeitDiscussion.openUser(row)
+ openUserPopup(row, type) {
+ this.$refs.DeitDiscussion.openUser(row, type)
},
openDilog(row, type) {
@@ -570,7 +574,7 @@
row.videoUrl = ""
}
row.userid = this.userInfo.user_id
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -600,7 +604,7 @@
)
},
rowUpdate(row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -698,7 +702,7 @@
// })
this.form = {
...data,
- articleList: JSON.parse(data.articleRange)
+ articleList: data.articleRange
}
})
}
@@ -738,7 +742,7 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- item.articleList = JSON.parse(item.articleRange)
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
var names = item.url.split(",")
@@ -841,4 +845,4 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3