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 | 534 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 307 insertions(+), 227 deletions(-)
diff --git a/src/views/article/discussionManage.vue b/src/views/article/discussionManage.vue
index 2d904b4..0d961b0 100644
--- a/src/views/article/discussionManage.vue
+++ b/src/views/article/discussionManage.vue
@@ -5,51 +5,55 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
+ <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+ 除
</el-button>
</template>
<template slot-scope="{type,size,row }" slot="menu">
-
- <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
- 创建议题
+ <el-button icon="el-icon-s-tools" :size="size" :type="type" @click.stop="openDilog(row, 1)">
+ 设置
</el-button>
+
+ <el-button icon="el-icon-edit" :size="size" :type="type" @click.stop="openEditPopup(row, 1)">
+ 编辑议题
+ </el-button>
+
+ <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.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)">
撤销
</el-button>
+
<el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
发布
</el-button>
</template>
- <template slot-scope="{ row }" slot="publish">
- <el-tag>{{row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"}}
+ <template slot-scope="{ row, size }" slot="publish">
+ <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
</el-tag>
</template>
- <template slot-scope="{ row }" slot="iscomment">
- <el-tag>{{ row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"}}
- </el-tag>
+ <template slot-scope="{ row, size }" slot="iscomment">
+ <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
+ :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
+ </el-switch>
</template>
</avue-crud>
+ <deitDiscussion ref="DeitDiscussion">
+ </deitDiscussion>
-
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="80%" :before-close="handleClose">
- <discussionManageChild ref="discussionManageChild" />
- <!-- <span slot="title" class="dialog-footer">
- {{discussForm.ontitle}}
- </span> -->
- <!-- <div id="" v-if="discussForm.eventType == 1">
- <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
- </div> -->
-
- <!-- <div id="" v-else>
- <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
- </avue-form>
- </div> -->
- </el-dialog>
-
+ <discussionManageChild ref="discussionManageChild" />
</basic-container>
</template>
@@ -62,7 +66,7 @@
add,
getNotice,
upcomment
- } from "@/api/article/article";
+ } from "@/api/article/article"
import {
getListPd,
@@ -71,19 +75,38 @@
addPd,
getNoticePd,
upcommentPd
- } from "@/api/discuss/publicDiscuss";
- import website from '@/config/website';
+ } from "@/api/discuss/publicDiscuss"
+ import website from '@/config/website'
import {
getDistrictTree
- } from "@/api/district/index";
+ } from "@/api/district/index"
import {
mapGetters
- } from "vuex";
+ } from "vuex"
+ import deitDiscussion from "./components/deitDiscussion"
import discussionManageChild from "./components/discussionManageChild"
+ import NProgress from 'nprogress'
+ import 'nprogress/nprogress.css'
+ import Qs from "qs"
+ import {
+ exportBlob
+ } from "@/api/common"
+ import {
+ getToken
+ } from '@/util/auth'
+ import {
+ downloadXls
+ } from "@/util/util"
+ import {
+ dateNow
+ } from "@/util/date"
+
export default {
components: {
- discussionManageChild
+ deitDiscussion,
+ discussionManageChild,
},
+
data() {
return {
discussForm: {
@@ -105,7 +128,6 @@
userIds: '',
eventType: 1,
},
- dialogVisibles: false,
form: {},
query: {},
loading: true,
@@ -117,38 +139,64 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 500,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 450,
- border: false,
+ border: true,
//stripe:true,
index: true,
- viewBtn: true,
+ viewBtn: false,
selection: true,
excelBtn: true,
dialogClickModal: false,
column: [{
- label: "资讯标题",
+ overHidden: true,
+ label: "议事标题",
prop: "title",
span: 24,
row: true,
searchSpan: 4,
search: true,
+ searchLabelWidth: 76,
rules: [{
required: true,
- message: "请输入资讯标题",
+ message: "请输入议事标题",
trigger: "blur",
}, ],
},
{
- label: "资讯封面",
+ label: "范围",
+ prop: "articleList",
+ span: 24,
+ minRows: 2,
+ tags: true,
+ type: "tree",
+ dataType: "string",
+ multiple: true,
+ dicData: [],
+ rules: [{
+ required: true,
+ message: "请选择范围",
+ trigger: "blur",
+ }, ],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ // hide: true,
+ },
+ {
+ width: 110,
+ label: "封面",
prop: "url",
// align:'center',
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -160,32 +208,13 @@
span: 24,
},
{
- label: "资讯范围",
- prop: "articleList",
- span: 12,
- minRows: 2,
- type: "cascader",
- multiple: true,
- tags: true,
- dicData: [],
- rules: [{
- required: true,
- message: "请选择资讯范围",
- trigger: "blur",
- }, ],
- props: {
- label: "name",
- value: 'id'
- },
- hide: true,
- },
- {
- label: "文章类型",
+ width: 110,
+ label: "议事类型",
prop: "articleType",
addDisplay: true,
editDisplay: true,
viewDisplay: true,
- searchSpan: 3,
+ searchSpan: 4,
checkStrictly: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
props: {
@@ -196,41 +225,46 @@
type: "tree",
rules: [{
required: true,
- message: "请选择文章类型",
+ message: "请选择议事类型",
trigger: "blur",
}, ],
},
+ // {
+ // label: "发布时间",
+ // prop: "dateTime",
+ // type: "daterange",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // searchSpan: 6,
+ // searchRange: true,
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请选择发布时间",
+ // trigger: "blur",
+ // }, ],
+ // },
{
- label: "发布时间",
- prop: "dateTime",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 5,
- searchRange: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [{
- required: true,
- message: "请选择发布时间",
- trigger: "blur",
- }, ],
- },
- {
+ width: 100,
label: "发布时间",
prop: "createTime",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd HH:mm:ss",
+ search: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
},
{
+ width: 100,
label: "发布状态",
prop: "publish",
- searchSpan: 3,
- width: 80,
+ searchSpan: 4,
value: "0",
slot: true,
search: true,
@@ -251,11 +285,15 @@
],
},
{
+ span: 24,
label: "评论区",
prop: "iscomment",
width: 80,
slot: true,
- type: "select",
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
dicData: [{
label: "关闭",
value: "0",
@@ -281,7 +319,7 @@
},
},
{
- label: "资讯内容",
+ label: "议事内容",
prop: "content",
component: "AvueUeditor",
options: {
@@ -410,26 +448,26 @@
]
},
districtTree: [],
- };
+ }
},
watch: {
"form.articleType": {
handler(val) {
if (val) {
- var videoUrl = this.findObject(this.option.column, "videoUrl");
- var content = this.findObject(this.option.column, "content");
+ var videoUrl = this.findObject(this.option.column, "videoUrl")
+ var content = this.findObject(this.option.column, "content")
if (val.indexOf('ksp') != -1) {
- videoUrl.display = true;
- content.display = false;
+ videoUrl.display = true
+ content.display = false
videoUrl.rules = [{
required: false,
message: "请选择视频",
trigger: "blur",
- }, ];
+ }, ]
} else {
- videoUrl.display = false;
- content.display = true;
- videoUrl.rules = "";
+ videoUrl.display = false
+ content.display = true
+ videoUrl.rules = ""
}
}
},
@@ -444,98 +482,134 @@
viewBtn: this.vaildData(this.permission.article_view, true),
delBtn: this.vaildData(this.permission.article_delete, true),
editBtn: this.vaildData(this.permission.article_edit, true),
- };
+ }
},
+
ids() {
- let ids = [];
+ let ids = []
this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
+ ids.push(ele.id)
+ })
+ return ids.join(",")
},
+
+ showStatus() {
+ return (data, type) => {
+ if (data == 0) {
+ return {
+ text: type == 1 ? '未发布' : '关闭',
+ type: 'info'
+ }
+ } else if (data == 1) {
+ return {
+ text: type == 1 ? '已发布' : '开启',
+ type: 'success'
+ }
+ }
+ }
+ }
},
methods: {
+ handleExport(row) {
+ this.$confirm("是否导出投票结果数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ this.query = {}
+ this.query.articleId = row.id
+ this.query.districtId = row.articleRange
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data)
+ .then(
+ res => {
+ downloadXls(res.data, `投票结果${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ })
+ },
+ iscommentInput(e, data) {
+ upcomment(data.id, e).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+
+ openEditPopup(row) {
+ getListPd(1, 10, {
+ eventType: 1,
+ articleId: row.id
+ }).then(res => {
+ if (res.data.data.records.length == 0) {
+ this.$message.warning('请先设置议事规则!')
+ setTimeout(() => {
+ this.openDilog(row, 1)
+ }, 200)
+ } else {
+ this.$refs.DeitDiscussion.initData(row)
+ }
+ })
+ },
+
+ openUserPopup(row, type) {
+ this.$refs.DeitDiscussion.openUser(row, type)
+ },
+
openDilog(row, type) {
var that = this
- this.dialogVisibles = true
this.$nextTick(() => {
that.$refs.discussionManageChild.init(row)
})
- // this.discussForm.eventType = type
- // this.discussForm.articleId = row.id
- // this.discussForm.title = row.title
- // if (type == 0) {
- // this.discussForm.ontitle = '公益报名'
- // } else {
- // this.discussForm.ontitle = '创建议题'
- // }
},
- handleSubmit(form, done) {
- done();
- addPd(form).then(
- () => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.dialogVisibles = false
- done();
- },
- (error) => {
- window.console.log(error);
- // loading();
- }
- );
- },
-
- handleClose(done) {
- done();
- // this.$confirm('确认关闭？')
- // .then(_ => {
- // done();
- // })
- // .catch(_ => {});
- },
rowSave(row, done, loading) {
if (row.videoUrl.length == 0) {
- row.videoUrl = "";
+ row.videoUrl = ""
}
- row.userid = this.userInfo.user_id;
- row.articleRange = JSON.stringify(row.articleList)
+ row.userid = this.userInfo.user_id
+ row.articleRange = row.articleList
if (row.url.length > 0) {
var urls = []
- var split = row.url.split(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
}
// 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
row.type = 4
+ // row.publish = 1
+
add(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
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(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
@@ -543,18 +617,18 @@
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
@@ -563,37 +637,37 @@
type: "warning",
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- });
+ })
+ })
},
searchReset() {
- this.query = {};
- this.onLoad(this.page);
+ this.query = {}
+ this.onLoad(this.page)
},
searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
selectionChange(list) {
- this.selectionList = list;
+ this.selectionList = list
},
selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
handleDelete() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -601,16 +675,16 @@
type: "warning",
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
@@ -619,146 +693,152 @@
// data.forEach(item=>{
if (data.url.length > 0) {
var urls = []
- var names = data.url.split(",");
+ var names = data.url.split(",")
names.forEach(name => {
urls.push(website.minioUrl + name)
})
data.url = urls.join(",")
}
// })
- this.form = data;
- });
+ this.form = {
+ ...data,
+ articleList: data.articleRange
+ }
+ })
}
// con
- done();
+ done()
},
currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ this.page.currentPage = currentPage
},
sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ this.page.pageSize = pageSize
},
refreshChange() {
- this.onLoad(this.page, this.query);
+ this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
const {
dateTime
- } = this.query;
+ } = this.query
let values = {
...params,
- };
+ }
if (dateTime) {
values = {
...params,
startTime: dateTime[0],
endTime: dateTime[1],
...this.query,
- };
- values.dateTime = null;
+ }
+ values.dateTime = null
}
values.type = 4
- this.loading = true;
+ this.loading = true
console.log(values)
getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
this.data.forEach(item => {
+ item.articleList = item.articleRange
if (item.url.length > 0) {
var urls = []
- var names = item.url.split(",");
+ var names = item.url.split(",")
names.forEach(name => {
urls.push(website.minioUrl + name)
})
item.url = urls.join(",")
}
})
- this.loading = false;
- this.selectionClear();
- });
- getDistrictTree(params = {}).then((res) => {
- const data = res.data.data;
- this.districtTree = data;
- const column = this.findObject(this.option.column, "articleList");
- column.dicData = res.data.data;
- this.loading = false;
- });
+ this.loading = false
+ this.selectionClear()
+ })
+ getDistrictTree(params = {
+ filterFlag: 1
+ }).then((res) => {
+ const data = res.data.data
+ this.districtTree = data
+ const column = this.findObject(this.option.column, "articleList")
+ column.dicData = res.data.data
+ this.loading = false
+ })
},
updateFb(row) {
if (row.publish == "0") {
- row.publish = "1";
+ row.publish = "1"
} else {
- row.publish = "0";
+ row.publish = "0"
}
if (row.url.length > 0) {
var urls = []
- var split = row.url.split(",");
+ var split = row.url.split(",")
split.forEach(url => {
- var names = url.split("jczz/");
+ var names = url.split("jczz/")
urls.push(names[1])
})
row.url = urls.join(",")
}
update(row).then(
() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- done();
+ })
+ done()
},
(error) => {
- window.console.log(error);
- loading();
+ window.console.log(error)
+ loading()
}
- );
+ )
},
kqcomment() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据开启评论?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- return upcomment(this.ids, "1");
+ return upcomment(this.ids, "1")
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
},
gbcomment() {
if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ this.$message.warning("请选择至少一条数据")
+ return
}
this.$confirm("确定将选择数据开启评论?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- return upcomment(this.ids, "0");
+ return upcomment(this.ids, "0")
})
.then(() => {
- this.onLoad(this.page);
+ this.onLoad(this.page)
this.$message({
type: "success",
message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
+ })
+ this.$refs.crud.toggleSelection()
+ })
}
},
- };
+ }
</script>
<style>
--
Gitblit v1.9.3