From ebfc739bdbbc0dd0fccd0bf47b7d2d5397c3c511 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 12:44:21 +0800
Subject: [PATCH] 轮播图片
---
src/views/article/components/deitDiscussion.vue | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 300 insertions(+), 40 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 44369ec..b254595 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -1,20 +1,45 @@
-<!--
- * @Author: shuishen 1109946754@qq.com
- * @Date: 2024-01-04 15:18:13
- * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-01-04 17:13:22
- * @FilePath: \jczz_web\src\views\article\components\deitDiscussion.vue
- * @Description:
- *
- * Copyright (c) 2024 by shuishen, All Rights Reserved.
--->
<template>
<div>
+ <el-dialog title="" append-to-body :visible.sync="popupTableShow" width="80%" :before-close="handleClose">
+ <span slot="title" class="dialog-footer">
+ {{ ontitle }}
+ </span>
+ <div id="" v-if="editFlag">
+ <avue-form @submit="handleSubmit" :option="optionDiscuss" @reset-change="handleReset" v-model="disCussFrom">
+ </avue-form>
+ </div>
+
+ <div id="" v-if="!editFlag">
+ <avue-crud :table-loading="loading" :option="optionList" :data="data" v-model="form" ref="crud"
+ @row-update="rowUpdate" @row-del="rowDel">
+ <template slot="menuLeft" v-if="!editFlag">
+ <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
+ </el-button>
+ </template>
+ <template #icon="scope">
+ <i :class="scope.row.icon" style="font-size:14px"></i>
+ </template>
+ <template #menu="{ row, size }">
+ <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
+ <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
+ <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
+ 选择此项人数：{{ row.number }} 详情</el-button>
+ </template>
+ </avue-crud>
+ </div>
+ </el-dialog>
<el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
- <avue-crud :data="userData" @search-change="searchChange" @row-del="rowDel" @search-reset="searchReset"
- :page="userPage" :option="userOption"></avue-crud>
+ <basic-container>
+ <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
+ @search-reset="searchReset">
+ <template slot-scope="{type,size,row }" slot="menuLeft">
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
</el-dialog>
</div>
</template>
@@ -29,11 +54,23 @@
} from "@/api/discuss/publicDiscuss"
import {
- getPage,
- remove
+ getPage
} from "@/api/discuss/userTopics"
-
-
+ 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"
import website from '@/config/website'
@@ -43,6 +80,7 @@
getDetail,
add,
update,
+ remove
} from "@/api/discuss/topics"
export default {
@@ -50,11 +88,130 @@
return {
popupTableShow: false,
popupTableUserShow: false,
+
loading: true,
+
+ ontitle: '编辑议题',
+ editFlag: false,
+ disCussFromListClone: {},
+ disCussFrom: {
+ discussContent: '',
+ optionRange: 0,
+ sort: 1,
+ optionContent: '',
+ optionDetail: '',
+ number: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ articleId: '',
+ parentId: '',
+ level: '',
+ children: [{
+ optionContent: '',
+ optionDetail: '',
+ number: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ articleId: '',
+ parentId: '',
+ level: '',
+ }]
+ },
+ optionDiscuss: {
+ emptyText: '取消',
+ column: [{
+ label: '议题',
+ prop: 'discussContent',
+ type: 'input',
+ row: true,
+ rules: [{
+ required: true,
+ message: '请输入议题',
+ trigger: 'blur'
+ }],
+ },
+ {
+ label: '选项范围',
+ prop: 'optionRange',
+ type: 'radio',
+ value: 0,
+ button: true,
+ row: true,
+ dicData: [{
+ label: '多选',
+ value: 1
+ }, {
+ label: '单选',
+ value: 0
+ }],
+ rules: [{
+ required: true,
+ message: '请选项范围',
+ trigger: 'blur'
+ }],
+ }, {
+ label: '最多选择数',
+ prop: 'optionNumber',
+ min: 1,
+ type: 'number',
+ step: 1,
+ value: 1
+ },
+ {
+ label: '选项内容',
+ prop: 'children',
+ type: 'dynamic',
+ span: 24,
+ children: {
+ column: [{
+ label: '选项标题',
+ prop: 'optionContent',
+ type: 'input',
+ rules: [{
+ required: true,
+ message: '请输入选项标题',
+ trigger: 'blur'
+ }]
+ }, {
+ label: '选项说明',
+ prop: 'optionDetail',
+ type: 'input',
+ }]
+ }
+ },
+ ]
+ },
+
// 表单数据
- form: {},
+ form: {
+ optionRange: 0,
+ },
data: [],
+ optionList: {
+ headerAlign: 'center',
+ align: 'center',
+ border: true,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ defaultExpandAll: true,
+ rowKey: 'id',
+ rowParentKey: 'parentId',
+ column: [{
+ label: '标题',
+ prop: 'discussContent',
+ },
+ {
+ label: '选项内容',
+ prop: 'optionContent',
+ }
+ ]
+ },
+
articleId: '',
+
userData: [],
userOption: {
labelWidth: 96,
@@ -62,27 +219,32 @@
searchShow: true,
searchMenuSpan: 3,
// menuWidth: 500,
-
+ menu: false,
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- border: false,
+ border: true,
//stripe:true,
index: true,
editBtn: false,
addBtn: false,
viewBtn: false,
selection: true,
+ delBtn: false,
excelBtn: true,
dialogClickModal: false,
+ header: true,
column: [{
label: '姓名',
prop: 'name',
searchSpan: 4,
search: true,
+ searchLabelWidth: 46,
}, {
label: '头像',
+ type: 'upload',
+ listType: "picture-img",
prop: 'avatar'
}, {
label: '手机',
@@ -101,6 +263,9 @@
listType: "picture-img",
prop: 'signaturePath'
}, {
+ label: '投票项',
+ prop: 'optionContent'
+ }, {
label: '时间',
prop: 'createTime'
}]
@@ -112,13 +277,56 @@
currentPage: 1,
total: 0
},
+ query: {},
+ type: '',
+ newData: {},
+ articleRange: {},
+ tops: {},
}
},
- watch: {},
+ watch: {
+ 'froms.optionRange': {
+ handler(newData) {
+ console.log('** ** ** ** ** ** **', newData)
+ const column = this.findObject(this.optionDiscuss.column, "optionNumber")
+ if (newData == 1) {
+ column.display = true
+ } else {
+ column.display = false
+ }
+ },
+ },
+ },
methods: {
+ handleExport() {
+ this.$confirm("是否导出投票人员数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ this.query = {}
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ var data = {
+ ...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()
+ })
+ })
+ },
userHandleClose() {
@@ -126,22 +334,61 @@
},
searchReset() {
- this.query = {}
- this.getUserPage(this.userPage)
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
+ this.userPage.currentPage = 1
+ this.getUserPage(this.userPage, this.query)
},
searchChange(params, done) {
this.query = params
+ this.query.districtId = this.newData.articleRange
+ if (this.type == 0) {
+ this.query.articleId = this.articleId
+ } else {
+ this.query.topicsId = this.tops.id
+ }
this.userPage.currentPage = 1
- this.getUserPage(this.userPage, params)
+ this.getUserPage(this.userPage, this.query)
done()
},
+
+ openUser(row, type = 0) {
+ this.type = type
+ this.popupTableUserShow = true
+ this.query = {}
+ this.articleId = row.id
+ let districtId
+ if (type == 0) {
+ this.newData = row
+ districtId = this.newData.articleRange
+ this.userParams = {
+ articleId: row.id,
+ districtId: districtId
+ }
+ } else {
+ districtId = this.newData.articleRange
+ this.tops = row
+ this.userParams = {
+ topicsId: row.id,
+ districtId: districtId
+ }
+ }
+ this.getUserPage(this.userPage, this.userParams)
+ },
+
initData(newData) {
this.editFlag = false
this.popupTableShow = true
this.articleId = newData.id
this.query.level = 1
this.query.articleId = this.articleId
+ this.newData = newData
+ this.query.districtId = newData.articleRange
this.onLoad(this.userPage, this.query)
},
@@ -153,7 +400,17 @@
handleSubmit(form, done) {
done()
form.articleId = this.articleId
-
+ if (this.disCussFromListClone.length > 0) {
+ this.disCussFromListClone.forEach(item => {
+ if (form.children.length > 0) {
+ let same = form.children.find(array => array.id === item.id)
+ if (!same) {
+ item.deleteFlag = 1
+ form.children.push(item)
+ }
+ }
+ })
+ }
add(form).then(
() => {
this.$message({
@@ -162,12 +419,10 @@
})
form = {}
this.editFlag = false
-
let params = {
level: 1,
articleId: this.articleId
}
-
getLists(1, 100, Object.assign(params, this.query)).then(res => {
const data = res.data.data
this.data = data
@@ -218,6 +473,7 @@
})
.then(() => {
this.getUserPage(this.userPage)
+
this.$message({
type: "success",
message: "操作成功!"
@@ -231,25 +487,29 @@
edit(row) {
this.disCussFrom = row
+ this.disCussFromListClone = [].concat(row.children)
this.editFlag = true
},
-
- openUser(row, type = 0) {
- this.popupTableUserShow = true
- this.query = {}
- if (type == 0) {
- this.userParams = {
- articleId: row.id
- }
- } else {
- this.userParams = {
- topicsId: row.id
- }
- }
- this.getUserPage(this.userPage, this.userParams)
+ deletes(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ return remove(row.id)
+ }).then(() => {
+ let param = {}
+ this.onLoad(this.userPage, param)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
},
+
+
getUserPage(page, params = {}) {
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data
--
Gitblit v1.9.3