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 | 591 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 295 insertions(+), 296 deletions(-)
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 247ac47..9e7ae0f 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -5,21 +5,22 @@
@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> -->
</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 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>
@@ -28,28 +29,23 @@
</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}}
+ {{ discussForm.ontitle }}
</span>
- <div id="" v-if="discussForm.eventType == 2">
+ <div id="" v-if="discussForm.eventType == 1">
<avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
</div>
@@ -57,21 +53,7 @@
<avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
</avue-form>
</div>
-
</el-dialog>
-
- <!-- <el-dialog title="用户数据导入" append-to-body :visible.sync="dialogVisibles" width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog> -->
-
-
-
</basic-container>
</template>
@@ -83,7 +65,7 @@
add,
getNotice,
upcomment
- } from "@/api/article/article";
+ } from "@/api/article/article"
import {
getListPd,
@@ -92,10 +74,18 @@
addPd,
getNoticePd,
upcommentPd
- } from "@/api/discuss/publicDiscuss";
+ } from "@/api/discuss/publicDiscuss"
+
+ import website from '@/config/website'
+
+
+ import {
+ getDistrictTree
+ } from "@/api/district/index"
+
import {
mapGetters
- } from "vuex";
+ } from "vuex"
export default {
data() {
@@ -130,14 +120,17 @@
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: 450,
- border: false,
+ border: true,
//stripe:true,
index: true,
viewBtn: true,
@@ -145,23 +138,25 @@
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: "资讯封面",
+ width: 110,
+ label: "文章封面",
prop: "url",
// align:'center',
- width: 80,
type: "upload",
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
@@ -173,24 +168,43 @@
span: 24,
},
{
- label: "资讯来源",
+ width: 100,
+ label: "文章来源",
prop: "sourceName",
search: true,
searchSpan: 4,
span: 24,
rules: [{
required: true,
- message: "请输入资讯类型",
+ 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: {
@@ -201,41 +215,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,
@@ -256,11 +275,14 @@
],
},
{
+ width: 100,
label: "评论区",
prop: "iscomment",
- width: 80,
slot: true,
- type: "select",
+ type: "switch",
+ activeColor: "#13ce66",
+ inactiveColor: "#ccc",
+ value: '1',
dicData: [{
label: "关闭",
value: "0",
@@ -286,7 +308,7 @@
},
},
{
- label: "资讯内容",
+ label: "文章内容",
prop: "content",
component: "AvueUeditor",
options: {
@@ -319,7 +341,7 @@
}
}, {
labelWidth: 100,
- label: '开启投票',
+ label: '开启',
prop: 'openFlag',
type: 'radio',
button: true,
@@ -335,48 +357,18 @@
},
{
labelWidth: 100,
- label: '人数限制',
- prop: 'numberRestrictions',
- type: 'number',
- button: true,
- row: true,
- min: 0,
- max: 99999999,
- controlsPosition: '',
- step: 10,
- offset: 6,
- }, {
- labelWidth: 100,
- label: '投票限制',
- prop: 'voteRestrictions',
+ label: '开启投票',
+ prop: 'openFlag',
type: 'radio',
button: true,
row: true,
offset: 6,
dicData: [{
- label: '一人一票',
+ label: '开启',
value: 0
}, {
- label: '一户一票',
+ label: '不开启',
value: 1
- }]
- }, {
- labelWidth: 100,
- label: '用户限制',
- prop: 'userRestrictions',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '必须绑定手机',
- value: 1
- }, {
- label: '必须绑定房屋',
- value: 2
}]
},
{
@@ -393,14 +385,12 @@
optionDiscuss: {
column: [{
label: "",
- // labelWidth: 20,
type: 'title',
prop: "title",
span: 24,
row: true,
offset: 2,
styles: {
- // color: 'red',
fontSize: '24px'
}
}, {
@@ -420,72 +410,18 @@
}]
}, {
labelWidth: 100,
- label: '多房屋可重复',
- prop: 'repeatVote',
+ label: '开启签名',
+ prop: 'signatureFlag',
type: 'radio',
button: true,
row: true,
offset: 6,
dicData: [{
- label: '不可以',
+ label: '开启',
value: 0
}, {
- label: '可以',
+ label: '不开启',
value: 1
- }]
- }, {
- labelWidth: 100,
- label: '投票限制',
- prop: 'voteRestrictions',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '一人一票',
- value: 0
- }, {
- label: '一户一票',
- value: 1
- }]
- }, {
- labelWidth: 100,
- label: '用户限制',
- prop: 'userRestrictions',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '必须绑定手机',
- value: 1
- }, {
- label: '必须绑定房屋',
- value: 2
- }]
- }, {
- labelWidth: 100,
- label: '票数公开',
- prop: 'voteNumberPublic',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '全程公开',
- value: 0
- }, {
- label: '投票后公开',
- value: 1
- }, {
- label: '投票结束后公开',
- value: 2
- }, {
- label: '不公开',
- value: 3
}]
},
{
@@ -497,57 +433,29 @@
format: "yyyy-MM-dd hh:mm:ss",
valueFormat: "timestamp",
},
- // {
- // labelWidth: 100,
- // label: '人数限制',
- // prop: 'numberRestrictions',
- // type: 'number',
- // button: true,
- // row: true,
- // min: 0,
- // max: 99999999,
- // controlsPosition: '',
- // step: 10,
- // offset: 6,
- // },
- // {
- // labelWidth: 100,
- // label: '指定用户',
- // prop: 'appointUser',
- // type: 'radio',
- // button: true,
- // row: true,
- // offset: 6,
- // dicData: [{
- // label: '不限制',
- // value: 0
- // }, {
- // label: '指定用户可见',
- // value: 1
- // }]
- // },
]
},
- };
+ 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 = ""
}
}
},
@@ -562,17 +470,41 @@
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
@@ -587,25 +519,25 @@
},
handleSubmit(form, done) {
- done();
+ done()
addPd(form).then(
() => {
this.$message({
type: "success",
message: "操作成功!",
- });
+ })
this.dialogVisibles = false
- done();
+ done()
},
(error) => {
- window.console.log(error);
+ window.console.log(error)
// loading();
}
- );
+ )
},
handleClose(done) {
- done();
+ done()
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
@@ -614,39 +546,60 @@
},
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("确定将选择数据删除?", {
@@ -655,37 +608,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: "确定",
@@ -693,129 +646,175 @@
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)) {
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;
+ } = 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");
+ 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>
+<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