优化文章和banner管理功能,调整界面和逻辑

This commit is contained in:
钊钊 2024-12-18 16:11:42 +08:00
parent 36e9168098
commit e1a6a1528e
7 changed files with 679 additions and 354 deletions

View File

@ -48,7 +48,6 @@ export interface ArticleVO {
*
*/
updateTime: string;
}
export interface ArticleForm extends BaseEntity {
@ -56,7 +55,7 @@ export interface ArticleForm extends BaseEntity {
* ID
*/
id?: string | number;
tagId_copy?: string[] | number[];
/**
*
*/
@ -91,11 +90,9 @@ export interface ArticleForm extends BaseEntity {
* 0- 1- 2-
*/
status?: number;
}
export interface ArticleQuery extends PageQuery {
/**
*
*/
@ -136,6 +133,3 @@ export interface ArticleQuery extends PageQuery {
*/
params?: any;
}

View File

@ -0,0 +1,78 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { BannerVO, BannerForm, BannerQuery } from '@/api/manage/banner/types';
/**
* banner图管理列表
* @param query
* @returns {*}
*/
export const listBanner = (query?: BannerQuery): AxiosPromise<BannerVO[]> => {
return request({
url: '/manage/banner/list',
method: 'get',
params: query
});
};
/**
* banner图管理详细
* @param id
*/
export const getBanner = (id: string | number): AxiosPromise<BannerVO> => {
return request({
url: '/manage/banner/' + id,
method: 'get'
});
};
/**
* banner图管理
* @param data
*/
export const addBanner = (data: BannerForm) => {
return request({
url: '/manage/banner',
method: 'post',
data: data
});
};
/**
* banner图管理
* @param data
*/
export const updateBanner = (data: BannerForm) => {
return request({
url: '/manage/banner',
method: 'put',
data: data
});
};
/**
* banner图管理
* @param id
*/
export const delBanner = (id: string | number | Array<string | number>) => {
return request({
url: '/manage/banner/' + id,
method: 'delete'
});
};
/**
*
* @param query
* @returns
*/
export const regionTree = () => {
return request({
url: '/manage/region/Tree',
method: 'get',
params: {
regionParentCode: 460000
}
});
};

View File

@ -0,0 +1,96 @@
export interface BannerVO {
/**
* ID
*/
id: string | number;
/**
* banner名称
*/
name: string;
/**
*
*/
targetUrl: string;
/**
* 0-bannner 1- 2- 3-
*/
type: number;
/**
*
*/
sortNum: number;
/**
* 0- 1-
*/
status: number;
}
export interface BannerForm extends BaseEntity {
/**
* ID
*/
id?: string | number;
city: string | number;
province: string | number;
/**
* banner名称
*/
name?: string;
/**
*
*/
targetUrl?: string;
/**
* 0-bannner 1- 2- 3-
*/
type?: number | string;
/**
*
*/
sortNum?: number;
/**
* 0- 1-
*/
status?: number;
}
export interface BannerQuery extends PageQuery {
/**
* banner名称
*/
name?: string;
/**
*
*/
targetUrl?: string;
/**
* 0-bannner 1- 2- 3-
*/
type?: number;
/**
*
*/
sortNum?: number;
/**
* 0- 1-
*/
status?: number;
/**
*
*/
params?: any;
}

View File

@ -1,102 +1,104 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.title" class="inputWidth" placeholder="请输入标题" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="标签id以逗号分隔" prop="tagId">
<el-input v-model="queryParams.tagId" placeholder="请输入标签id以逗号分隔" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="喜欢数" prop="agreeCount">
<el-input v-model="queryParams.agreeCount" placeholder="请输入喜欢数" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="评论数" prop="commentCount">
<el-input v-model="queryParams.commentCount" placeholder="请输入评论数" clearable @keyup.enter="handleQuery" />
<el-form-item label="发布状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择发布状态" clearable class="inputWidth">
<el-option label="未发布" value="0"></el-option>
<el-option label="审核中" value="1"></el-option>
<el-option label="已发布" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="标签" prop="tagId">
<el-select class="inputWidth" filterable v-model="queryParams.tagId" placeholder="请选择标签" clearable>
<el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="dict.id" />
</el-select>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:article:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
v-hasPermi="['manage:article:edit']">修改</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['manage:article:remove']">删除</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:article:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:article:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:article:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:article:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="articleList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :height="autoTableHeight" border :data="articleList"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="true" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="内容" align="center" prop="content" />
<el-table-column label="用户ID" align="center" prop="userId" />
<el-table-column label="标签id以逗号分隔" align="center" prop="tagId" />
<el-table-column label="喜欢数" align="center" prop="agreeCount" />
<el-table-column label="评论数" align="center" prop="commentCount" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="更新者" align="center" prop="updateBy" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
<el-table-column label="ID" align="center" prop="id" v-if="true" width="180px" />
<el-table-column label="标题" align="center" prop="title" width="300px" />
<el-table-column label="内容" align="center" prop="content" width="80px">
<template #default="scope">
<el-button link type="primary" @click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="标签" align="center" prop="tagId" width="180px">
<template #default="scope">
<span>{{ formatTag(scope.row.tagId) }}</span>
</template>
</el-table-column>
<el-table-column label="喜欢数" align="center" prop="agreeCount" width="80px" />
<el-table-column label="评论数" align="center" prop="commentCount" width="80px" />
<el-table-column label="状态" align="center" prop="status" width="90px">
<template #default="scope">
<el-tag v-if="scope.row.status === 0" type="info">未发布</el-tag>
<el-tag v-if="scope.row.status === 1" type="success">审核中</el-tag>
<el-tag v-if="scope.row.status === 2" type="success">已发布</el-tag>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="updateTime" width="120">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:article:edit']"></el-button>
<el-button link type="primary" v-if="scope.row.status === 0" @click="updateRow(scope.row,'2')"
v-hasPermi="['manage:article:edit']">发布</el-button>
<el-button link type="primary" v-if="scope.row.status === 2" @click="updateRow(scope.row,'0')"
v-hasPermi="['manage:article:edit']">撤销发布</el-button>
<el-tooltip content="修改" placement="top" v-if="scope.row.status === 0">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:article:remove']"></el-button>
<el-tooltip content="删除" placement="top" v-if="scope.row.status === 0">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:article:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<pagination id="table_page" v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改文章对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-dialog :title="dialog.title" v-model="dialog.visible" width="700px" append-to-body>
<el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" />
<el-form-item label="文章标题" prop="title">
<el-input v-model="form.title" placeholder="请输入文章标题" />
</el-form-item>
<el-form-item label="内容">
<editor v-model="form.content" :min-height="192"/>
<el-form-item label="标签" prop="tagId_copy">
<el-select class="inputWidth" v-model="form.tagId_copy" multiple filterable placeholder="请选择标签" clearable>
<el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title"
:value="String(dict.id)" />
</el-select>
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="标签id以逗号分隔" prop="tagId">
<el-input v-model="form.tagId" placeholder="请输入标签id以逗号分隔" />
</el-form-item>
<el-form-item label="喜欢数" prop="agreeCount">
<el-input v-model="form.agreeCount" placeholder="请输入喜欢数" />
</el-form-item>
<el-form-item label="评论数" prop="commentCount">
<el-input v-model="form.commentCount" placeholder="请输入评论数" />
<el-form-item label="内容" prop="content">
<editor v-model="form.content" :min-height="150" />
</el-form-item>
</el-form>
<template #footer>
@ -106,15 +108,31 @@
</div>
</template>
</el-dialog>
<!-- 查看文章内容 -->
<el-dialog title="文章详情" v-model="articleVisible" width="500px" append-to-body center>
<div>
<div style="font-size: 18px;font-weight: bold;">{{ articleTitle }}</div>
<div v-html="articleContent" class="ql-editor"
style="height: 500px; overflow-y: auto;font-size: 16px;padding: 0px;padding-top: 15px;text-align: justify;">
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Article" lang="ts">
import { listTag } from '@/api/manage/tag';
import { listArticle, getArticle, delArticle, addArticle, updateArticle } from '@/api/manage/article';
import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/manage/article/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const sys_user_tagOptions = ref([]); //
const autoTableHeight = ref<number>(750);
const articleList = ref<ArticleVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -123,7 +141,9 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const articleVisible = ref(false); //
const articleTitle = ref(''); //
const articleContent = ref(''); //
const queryFormRef = ref<ElFormInstance>();
const articleFormRef = ref<ElFormInstance>();
@ -134,13 +154,14 @@ const dialog = reactive<DialogOption>({
const initFormData: ArticleForm = {
id: undefined,
tagId_copy: [],
title: undefined,
content: undefined,
userId: undefined,
tagId: undefined,
agreeCount: undefined,
commentCount: undefined,
status: undefined,
status: 0,
}
const data = reactive<PageData<ArticleForm, ArticleQuery>>({
form: {...initFormData},
@ -158,30 +179,15 @@ const data = reactive<PageData<ArticleForm, ArticleQuery>>({
}
},
rules: {
id: [
{ required: true, message: "ID不能为空", trigger: "blur" }
],
title: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
content: [
{ required: true, message: "内容不能为空", trigger: "blur" }
],
userId: [
{ required: true, message: "用户ID不能为空", trigger: "blur" }
],
tagId: [
tagId_copy: [
{ required: true, message: "标签id以逗号分隔不能为空", trigger: "blur" }
],
agreeCount: [
{ required: true, message: "喜欢数不能为空", trigger: "blur" }
],
commentCount: [
{ required: true, message: "评论数不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
],
}
});
@ -200,8 +206,29 @@ const getList = async () => {
const cancel = () => {
reset();
dialog.visible = false;
articleVisible.value = false;
}
//
const getTag = async () => {
const res = await listTag({ pageNum: 1, pageSize: 1000 });
sys_user_tagOptions.value = res.rows; //
};
/**
* 标签格式化
*/
const formatTag = (tagId: string | null) => {
let tagString = '';
for (let i = 0; i < sys_user_tagOptions.value.length; i++) {
const element = sys_user_tagOptions.value[i];
if (tagId!=null) {
let filteredArray = tagId.split(',').filter((item) => item==element.id);
if (filteredArray.length>0) {
tagString += '' + element.title;
}
}
}
return tagString.substring(1);
};
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
@ -235,20 +262,39 @@ const handleAdd = () => {
}
/** 修改按钮操作 */
const handleUpdate = async (row?: ArticleVO) => {
const handleUpdate = async (row?:any) => {
reset();
const _id = row?.id || ids.value[0]
const res = await getArticle(_id);
res.data.tagId_copy = res.data.tagId?.split(',');
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改文章";
}
/**
*
* @param row 发布撤销发布
* @param type
*/
const updateRow = async (row: any, type: string) => {
await proxy?.$modal.confirm('是否确认' + (type == '0' ? '撤销发布' : '发布') + '名称为"' + row.title + '"的数据项?');
row.status = type;
buttonLoading.value = true;
await updateArticle(row).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
getList();
};
const handleDetail = (row: any) => {
articleTitle.value= row.title;
articleContent.value = row.content;
articleVisible.value = true;
}
/** 提交按钮 */
const submitForm = () => {
articleFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.tagId = form.value.tagId_copy?.join(',');
if (form.value.id) {
await updateArticle(form.value).finally(() => buttonLoading.value = false);
} else {
@ -278,6 +324,24 @@ const handleExport = () => {
}
onMounted(() => {
getTag();
getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
});
</script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;
padding-bottom: 10px !important;
}
</style>

View File

@ -1,28 +1,29 @@
<!-- banner管理列表 -->
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
<el-form-item label="banner名称" prop="" label-width="90px">
<el-input class="inputWidth" placeholder="请输入banner名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="发布状态" prop="">
<el-select class="inputWidth" v-model="queryParams.status" placeholder="请选择发布状态" clearable>
<el-option v-for="dict in note_publish_list" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-form-item label="上架状态" prop="">
<el-select class="inputWidth" v-model="queryParams.status" placeholder="请选择上架状态" clearable>
<el-option v-for="dict in note_publish_list" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:article:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:article:edit']"
>修改</el-button
>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:article:remove']"
>删除</el-button
>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['system:article:add']">新增</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
v-hasPermi="['system:article:edit']">修改</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['system:article:remove']">删除</el-button>
</el-form-item>
</el-form>
</el-card>
@ -30,82 +31,138 @@
</transition>
<el-tabs type="border-card" v-model="activeName" @tab-change="handleClick">
<el-tab-pane label="发现页banner" name="0">
<el-table :height="autoTableHeight" v-loading="loading" :data="articleList" @selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="" />
<el-table-column label="图片" align="center" prop="" />
<el-table-column label="跳转地址" align="center" prop="" />
<el-table-column label="排序" align="center" prop="" />
<el-table-column label="操作人" align="center" prop="" />
<el-table-column label="操作时间" align="center" prop="" />
<el-table-column label="状态" align="center" prop="" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-tab-pane label="发现页banner" :name="0">
<el-table :height="autoTableHeight" v-loading="loading" :data="bannerList"
@selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="name" />
<el-table-column label="图片" align="center" prop="" width="100px" />
<el-table-column label="跳转地址" align="center" prop="targetUrl" />
<el-table-column label="排序" align="center" prop="sortNum" width="80px" />
<el-table-column label="操作" align="center" prop="updateByName" width="120px" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="120px" />
<el-table-column label="状态" align="center" prop="" width="90px">
<template #default="scope">
<el-tooltip content="编辑" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
<el-tag v-if="scope.row.status == 0" type="info">未上架</el-tag>
<el-tag v-if="scope.row.status == 1" type="success">已上架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
<template #default="scope">
<el-button link type="primary" @click="putaway(scope.row,'0')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 1">下架</el-button>
<el-button link type="primary" @click="putaway(scope.row,'1')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 0">上架</el-button>
<el-tooltip content="编辑" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="上架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
<el-tooltip content="删除" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="租车图片" name="1">
<el-table :height="autoTableHeight" v-loading="loading" :data="articleList" @selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="" />
<el-table-column label="图片" align="center" prop="" />
<el-table-column label="跳转地址" align="center" prop="" />
<el-table-column label="排序" align="center" prop="" />
<el-table-column label="操作人" align="center" prop="" />
<el-table-column label="操作时间" align="center" prop="" />
<el-table-column label="状态" align="center" prop="" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-tab-pane label="租车图片" :name="1">
<el-table :height="autoTableHeight" v-loading="loading" :data="bannerList"
@selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="name" />
<el-table-column label="图片" align="center" prop="" width="100px" />
<el-table-column label="跳转地址" align="center" prop="targetUrl" />
<el-table-column label="排序" align="center" prop="sortNum" width="80px" />
<el-table-column label="操作" align="center" prop="updateByName" width="120px" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="120px" />
<el-table-column label="状态" align="center" prop="" width="90px">
<template #default="scope">
<el-tooltip content="编辑" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
<el-tag v-if="scope.row.status == 0" type="info">未上架</el-tag>
<el-tag v-if="scope.row.status == 1" type="success">已上架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
<template #default="scope">
<el-button link type="primary" @click="putaway(scope.row,'0')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 1">下架</el-button>
<el-button link type="primary" @click="putaway(scope.row,'1')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 0">上架</el-button>
<el-tooltip content="编辑" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="上架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
<el-tooltip content="删除" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="租游艇图片" name="2">
<el-table :height="autoTableHeight" v-loading="loading" :data="articleList" @selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="" />
<el-table-column label="图片" align="center" prop="" />
<el-table-column label="跳转地址" align="center" prop="" />
<el-table-column label="排序" align="center" prop="" />
<el-table-column label="操作人" align="center" prop="" />
<el-table-column label="操作时间" align="center" prop="" />
<el-table-column label="状态" align="center" prop="" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-tab-pane label="租游艇图片" :name="2">
<el-table :height="autoTableHeight" v-loading="loading" :data="bannerList"
@selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="name" />
<el-table-column label="图片" align="center" prop="" width="100px" />
<el-table-column label="跳转地址" align="center" prop="targetUrl" />
<el-table-column label="排序" align="center" prop="sortNum" width="80px" />
<el-table-column label="操作" align="center" prop="updateByName" width="120px" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="120px" />
<el-table-column label="状态" align="center" prop="" width="90px">
<template #default="scope">
<el-tooltip content="编辑" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
<el-tag v-if="scope.row.status == 0" type="info">未上架</el-tag>
<el-tag v-if="scope.row.status == 1" type="success">已上架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
<template #default="scope">
<el-button link type="primary" @click="putaway(scope.row,'0')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 1">下架</el-button>
<el-button link type="primary" @click="putaway(scope.row,'1')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 0">上架</el-button>
<el-tooltip content="编辑" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
<el-tooltip content="删除" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"></el-button>
</el-tooltip>
<el-tooltip content="上架" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="行政区域景点图片" :name="3">
<el-table :height="autoTableHeight" v-loading="loading" :data="bannerList"
@selection-change="handleSelectionChange" border>
<el-table-column label="banner名称" align="center" prop="name" />
<el-table-column label="图片" align="center" prop="" width="100px" />
<el-table-column label="跳转地址" align="center" prop="targetUrl" />
<el-table-column label="行政区域" align="center" prop="city">
<template #default="scope">
<span>{{ formartCity(scope.row.city) }}</span>
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="sortNum" width="80px" />
<el-table-column label="操作人" align="center" prop="updateByName" width="120px" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="120px" />
<el-table-column label="状态" align="center" prop="" width="90px">
<template #default="scope">
<el-tag v-if="scope.row.status == 0" type="info">未上架</el-tag>
<el-tag v-if="scope.row.status == 1" type="success">已上架</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
<template #default="scope">
<el-button link type="primary" @click="putaway(scope.row,'0')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 1">下架</el-button>
<el-button link type="primary" @click="putaway(scope.row,'1')" v-hasPermi="['system:article:edit']"
v-if="scope.row.status == 0">上架</el-button>
<el-tooltip content="编辑" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
<el-tooltip content="删除" placement="top" v-if="scope.row.status == 0">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -113,28 +170,30 @@
</el-tab-pane>
</el-tabs>
<pagination
v-show="total > 0"
id="table_page"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改景点租赁管理对话框 -->
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改banner图管理对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="banner类型" prop="">
<el-input v-model="form.recommend" placeholder="请输入推荐语" />
<el-form ref="bannerFormRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="banner类型" prop="type">
<el-select v-model="form.type" placeholder="请选择banner类型" clearable>
<el-option v-for="dict in bannerTypeList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="banner名称" prop="">
<el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
<el-form-item label="banner名称" prop="name">
<el-input v-model="form.name" placeholder="请输入banner名称" clearable />
</el-form-item>
<el-form-item label="链接地址" prop="">
<el-input v-model="form.address" placeholder="请输入链接地址" />
<el-form-item label="行政区域" prop="city" v-if="form.type == 3">
<el-select v-model="form.city" placeholder="请选择行政区域" clearable>
<el-option v-for="dict in regionTreeList" :key="dict.id" :label="dict.label" :value="dict.id"
@click="handleCityChange(dict)" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="longitude">
<el-input-number v-model="form.longitude" :min="1" :max="100" />
<el-form-item label="链接地址" prop="targetUrl">
<el-input v-model="form.targetUrl" placeholder="请输入跳转链接" clearable />
</el-form-item>
<el-form-item label="banner排序" prop="sortNum">
<el-input-number v-model="form.sortNum" :min="1" :max="1000" />
</el-form-item>
</el-form>
<template #footer>
@ -147,13 +206,23 @@
</div>
</template>
<script setup name="Article" lang="ts">
import { listArticle, getArticle, delArticle, addArticle, updateArticle } from '@/api/manage/article';
import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/manage/article/types';
<script setup name="bannerManage" lang="ts">
const note_publish_list = ref([
{ label: '未上架', value: 0 },
{ label: '已上架', value: 1 }
]);
const bannerTypeList= ref([
{ label: '发布页banner', value: 0 },
{ label: '租车图片', value: 1 },
{ label: '租游艇图片', value: 2 },
{ label: '行政区域景点图片', value: 3 },
]);
import { listBanner, getBanner, delBanner, addBanner, updateBanner,regionTree } from '@/api/manage/banner';
import { BannerVO, BannerQuery, BannerForm } from '@/api/manage/banner/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const autoTableHeight = ref<number>(750);
const articleList = ref<ArticleVO[]>([]);
const bannerList = ref<BannerVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@ -161,86 +230,196 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const activeName = ref('0');
const queryFormRef = ref<ElFormInstance>();
const articleFormRef = ref<ElFormInstance>();
const note_publish_list = ref([
{ label: '已发布', value: 1 },
{ label: '未发布', value: 2 }
]);
const bannerFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ArticleForm = {
const initFormData: BannerForm = {
id: undefined,
type: undefined,
secondType: undefined,
isOpen: undefined,
attribute: undefined,
status: undefined,
province: undefined,
name: undefined,
targetUrl: undefined,
type: '0',
sortNum: 0,
status: 0,
city: undefined,
remark: undefined,
memberLevel: undefined,
tagId: undefined,
recommend: undefined,
intro: undefined,
address: undefined,
longitude: undefined,
latitude: undefined,
orderNum: undefined,
level: undefined
};
const data = reactive<PageData<ArticleForm, ArticleQuery>>({
form: { ...initFormData },
province: undefined,
}
const data = reactive<PageData<BannerForm, BannerQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
type: undefined,
secondType: undefined,
isOpen: undefined,
attribute: undefined,
name: undefined,
targetUrl: undefined,
type: 0,
sortNum: undefined,
status: undefined,
province: undefined,
city: undefined,
memberLevel: undefined,
tagId: undefined,
recommend: undefined,
intro: undefined,
address: undefined,
longitude: undefined,
latitude: undefined,
orderNum: undefined,
level: undefined,
params: {}
params: {
}
},
rules: {
id: [{ required: true, message: '景点ID/租赁ID/游艇ID不能为空', trigger: 'blur' }],
type: [{ required: true, message: '类别 景点-0、租赁-1 游艇-2不能为空', trigger: 'change' }],
secondType: [{ required: true, message: '二级类别不能为空', trigger: 'change' }],
isOpen: [{ required: true, message: '开放/营业不能为空', trigger: 'blur' }],
attribute: [{ required: true, message: '景点属性/商家属性不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态 0-未发布 1-审核中 2-发布不能为空', trigger: 'change' }],
province: [{ required: true, message: '省code不能为空', trigger: 'blur' }],
city: [{ required: true, message: '市/区不能为空', trigger: 'blur' }],
remark: [{ required: true, message: '个人简介不能为空', trigger: 'blur' }],
memberLevel: [{ required: true, message: '会员等级不能为空', trigger: 'blur' }],
tagId: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
recommend: [{ required: true, message: '推荐语不能为空', trigger: 'blur' }],
intro: [{ required: true, message: '介绍不能为空', trigger: 'blur' }],
address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }],
orderNum: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
level: [{ required: true, message: '景区等级不能为空', trigger: 'blur' }]
name: [
{ required: true, message: "banner名称不能为空", trigger: "blur" }
],
targetUrl: [
{ required: true, message: "跳转链接不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "banner类型不能为空", trigger: "change" }
],
city: [
{ required: true, message: "行政区域不能为空", trigger: "change" }
],
sortNum: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询banner图管理列表 */
const getList = async () => {
loading.value = true;
const res = await listBanner(queryParams.value).finally(() => loading.value = false);
bannerList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/**
* 获取省市县树
*/
const regionTreeList = ref([]);
const getRegionTree = async () => {
const res = await regionTree();
regionTreeList.value = res.data;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
bannerFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: BannerVO[]) => {
ids.value = selection.map(item => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
form.value.type=activeName.value;
dialog.visible = true;
dialog.title = "添加banner图管理";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: BannerVO) => {
reset();
const _id = row?.id || ids.value[0]
const res = await getBanner(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改banner图管理";
}
/**
* 省市区选择 赋值province
*/
const handleCityChange = (val:any) => {
form.value.province=val.parentId;
}
/**
* banner上下架
*/
const putaway= async (row:any,status:number|string)=>{
await proxy?.$modal.confirm('是否确认' + (status == '0' ? '下架' : '上架') + '名称为"' + row.name + '"的数据项?');
loading.value = true;
row.status=status;
updateBanner(row).then(()=>{
proxy?.$modal.msgSuccess("操作成功");
getList();
}).finally(() => loading.value = false);
}
/** 提交按钮 */
const submitForm = () => {
bannerFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateBanner(form.value).finally(() => buttonLoading.value = false);
} else {
await addBanner(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: BannerVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除banner图管理编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
await delBanner(_ids);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('manage/banner/export', {
...queryParams.value
}, `banner_${new Date().getTime()}.xlsx`)
}
// tab
const activeName = ref(0);
const autoTableHeight = ref(750);
const handleClick = (tab: any) => {
activeName.value = tab;
queryParams.value.type = tab;
queryParams.value.pageNum = 1;
getList();
};
/**
* 行政区域格式化
*/
const formartCity = (city: any) => {
for (let i = 0; i < regionTreeList.value.length; i++) {
const element = regionTreeList.value[i];
if (element.id==city) {
return element.label;
}
}
}
onMounted(() => {
getList();
getRegionTree();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
@ -248,99 +427,12 @@ onMounted(() => {
autoTableHeight.value = proxy?.autoTableHeight();
};
});
/** 查询景点、租赁管理列表 */
const getList = async () => {
loading.value = true;
const res = await listArticle(queryParams.value).finally(() => (loading.value = false));
articleList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
articleFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ArticleVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加景点、租赁管理';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ArticleVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getArticle(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改景点、租赁管理';
};
/** 提交按钮 */
const submitForm = () => {
articleFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateArticle(form.value).finally(() => (buttonLoading.value = false));
} else {
await addArticle(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ArticleVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除景点、租赁管理编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delArticle(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
// tab
const handleClick = (tab: any) => {
console.log(tab);
activeName.value = tab;
};
</script>
<style lang="scss" scoped>
.el-card :deep(.el-card__body) {
padding-bottom: 0px !important;
}
#table_page {
height: 50px !important;
margin-top: 10px !important;

View File

@ -40,11 +40,11 @@
<el-option :label="queryParams.type == '0' ? '非标志性景点' : '非标志性商家'" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="标签" prop="tagId">
<!-- <el-form-item label="标签" prop="tagId">
<el-select class="inputWidth" filterable v-model="queryParams.tagId" placeholder="请选择标签" clearable>
<el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="dict.id" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>

View File

@ -25,7 +25,8 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
open: true,
proxy: {
[env.VITE_APP_BASE_API]: {
target: 'http://192.168.18.23:8080',
// target: 'http://192.168.18.23:8080',
target: 'http://192.168.18.113:8080',
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')