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/article.vue | 772 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 526 insertions(+), 246 deletions(-)
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 679dade..9e7ae0f 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -1,56 +1,26 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- ref="crud"
- @row-del="rowDel"
- v-model="form"
- :permission="permissionList"
- @row-update="rowUpdate"
- @row-save="rowSave"
- :before-open="beforeOpen"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+ @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>
- <el-button
-
- size="small"
- icon="el-icon-s-order"
- plain
- @click="kqcomment"
- >开启评论
+ <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
</el-button>
- <el-button
-
- size="small"
- icon="el-icon-s-release"
- plain
- @click="gbcomment"
- >关闭评论
- </el-button>
-
-
+ <el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
+ </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, 0)">
+ 公益报名
+ </el-button>
+ <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row, 1)">
+ 创建议题
+ </el-button> -->
<el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
撤销
</el-button>
@@ -59,33 +29,86 @@
</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="showPublish(row.publish).type" v-text="showPublish(row.publish).text">
</el-tag>
</template>
<template slot-scope="{ row }" slot="iscomment">
- <el-tag
- >{{
- row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
- }}
- </el-tag>
+ <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>
+
+ <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+ <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>
</basic-container>
</template>
<script>
- import {getList, remove, update, add, getNotice, upcomment} from "@/api/article/article";
- import {mapGetters} from "vuex";
+ import {
+ getList,
+ remove,
+ update,
+ add,
+ getNotice,
+ upcomment
+ } from "@/api/article/article"
+
+ import {
+ getListPd,
+ removePd,
+ updatePd,
+ addPd,
+ getNoticePd,
+ upcommentPd
+ } from "@/api/discuss/publicDiscuss"
+
+ import website from '@/config/website'
+
+
+ import {
+ getDistrictTree
+ } from "@/api/district/index"
+
+ import {
+ mapGetters
+ } from "vuex"
export default {
data() {
return {
+ discussForm: {
+ ontitle: '',
+ title: '',
+ openFlag: 0,
+ numberRestrictions: 0,
+ voteRestrictions: 0,
+ userRestrictions: 0,
+ endTime: '',
+ articleId: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ repeatVote: 0,
+ voteNumberPublic: 0,
+ appointUser: '',
+ userIds: '',
+ eventType: 1,
+ },
+ dialogVisibles: false,
form: {},
query: {},
loading: true,
@@ -97,41 +120,43 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 350,
- border: false,
+ border: true,
//stripe:true,
index: true,
viewBtn: true,
selection: true,
excelBtn: true,
dialogClickModal: false,
- column: [
- {
- label: "资讯标题",
+ column: [{
+ overHidden: true,
+ label: "文章标题",
prop: "title",
span: 24,
row: true,
searchSpan: 4,
search: true,
- rules: [
- {
- required: true,
- message: "请输入资讯标题",
- trigger: "blur",
- },
- ],
+ searchLabelWidth: 76,
+ rules: [{
+ required: true,
+ message: "请输入文章标题",
+ trigger: "blur",
+ }, ],
},
{
- label: "资讯封面",
+ width: 110,
+ label: "文章封面",
prop: "url",
// align:'center',
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -143,26 +168,43 @@
span: 24,
},
{
- label: "资讯来源",
+ width: 100,
+ label: "文章来源",
prop: "sourceName",
search: true,
searchSpan: 4,
span: 24,
- rules: [
- {
- required: true,
- message: "请输入资讯类型",
- trigger: "blur",
- },
- ],
+ rules: [{
+ required: true,
+ message: "请输入文章类型",
+ trigger: "blur",
+ }, ],
},
{
- label: "资讯类型",
+ label: "文章范围",
+ prop: "articleList",
+ span: 12,
+ minRows: 2,
+ type: "tree",
+ dataType: "string",
+ multiple: true,
+ tags: true,
+ // search: true,
+ dicData: [],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ hide: true,
+ },
+ {
+ width: 100,
+ label: "文章类型",
prop: "articleType",
addDisplay: true,
editDisplay: true,
viewDisplay: true,
- searchSpan: 3,
+ searchSpan: 4,
checkStrictly: true,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=articleType",
props: {
@@ -171,60 +213,58 @@
},
search: true,
type: "tree",
- rules: [
- {
- required: true,
- message: "请选择资讯类型",
- trigger: "blur",
- },
- ],
+ rules: [{
+ required: true,
+ 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,
type: "select",
- rules: [
- {
- required: true,
- message: "请选择发布状态",
- trigger: "blur",
- },
- ],
- dicData: [
- {
+ rules: [{
+ required: true,
+ message: "请选择发布状态",
+ trigger: "blur",
+ }, ],
+ dicData: [{
label: "未发布",
value: "0",
},
@@ -235,13 +275,15 @@
],
},
{
+ width: 100,
label: "评论区",
prop: "iscomment",
- width: 80,
slot: true,
- type: "select",
- dicData: [
- {
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
+ dicData: [{
label: "关闭",
value: "0",
},
@@ -266,7 +308,7 @@
},
},
{
- label: "资讯内容",
+ label: "文章内容",
prop: "content",
component: "AvueUeditor",
options: {
@@ -286,28 +328,134 @@
],
},
data: [],
- };
+ optionEnroll: {
+ column: [{
+ label: "",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ row: true,
+ offset: 2,
+ styles: {
+ fontSize: '24px'
+ }
+ }, {
+ labelWidth: 100,
+ label: '开启',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ },
+ {
+ labelWidth: 100,
+ label: '开启投票',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ },
+ {
+ label: "截止时间",
+ row: true,
+ offset: 6,
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ },
+ ]
+ },
+ optionDiscuss: {
+ column: [{
+ label: "",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ row: true,
+ offset: 2,
+ styles: {
+ fontSize: '24px'
+ }
+ }, {
+ labelWidth: 100,
+ label: '开启投票',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ }, {
+ labelWidth: 100,
+ label: '开启签名',
+ prop: 'signatureFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ },
+ {
+ label: "截止时间",
+ row: true,
+ offset: 6,
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ },
+ ]
+ },
+ 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.rules = [
- {
- required: false,
- message: "请选择视频",
- trigger: "blur",
- },
- ];
+ 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 = ""
}
}
},
@@ -315,226 +463,358 @@
}
},
computed: {
- ...mapGetters(["permission","userInfo"]),
+ ...mapGetters(["permission", "userInfo"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.article_add, true),
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(",")
},
+
+ showPublish() {
+ return (data) => {
+ if (data == 0) {
+ return {
+ text: '未发布',
+ type: 'info'
+ }
+ } else if (data == 1) {
+ return {
+ text: '已发布',
+ type: 'success'
+ }
+ }
+ }
+ }
},
methods: {
+ iscommentInput(e, data) {
+ upcomment(data.id, e).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+
+ openDilog(row, type) {
+ this.dialogVisibles = true
+ 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.userid = this.userInfo.user_id
+ row.articleRange = JSON.stringify(row.articleList)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
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)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ 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()
}
- );
+ )
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
})
.then(() => {
- this.onLoad(this.page);
+ return remove(row.id)
+ })
+ .then(() => {
+ 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: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(this.ids);
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
})
.then(() => {
- this.onLoad(this.page);
+ return remove(this.ids)
+ })
+ .then(() => {
+ 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)) {
getNotice(this.form.id).then((res) => {
- this.form = res.data.data;
- });
+ let data = res.data.data
+ if (data.url.length > 0) {
+ var urls = []
+ var names = data.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ data.url = urls.join(",")
+ }
+ data.articleList = JSON.parse(data.articleRange)
+ this.form = data
+ })
}
- // 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;
+ const {
+ dateTime
+ } = this.query
let values = {
...params,
- };
+ }
if (dateTime) {
values = {
...params,
startTime: dateTime[0],
endTime: dateTime[1],
...this.query,
- };
- values.dateTime = null;
+ }
+ values.dateTime = null
}
- this.loading = true;
+ values.type = 0
+ this.loading = true
getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ if (item.url.length > 0) {
+ var urls = []
+ 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
+ })
},
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(",")
+ split.forEach(url => {
+ 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");
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ 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");
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ 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>
+<style lang="scss" scoped>
.avue-upload__icon {
line-height: 6;
}
-</style>
+
+ :deep(.avue-form__menu--center) {
+ text-align: left;
+ }
+
+ :deep(.avue-form__menu--center .el-button) {
+ margin: 0 5px 0 0;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3