This commit is contained in:
helen 2024-12-19 17:06:07 +08:00
parent 1759dbb28d
commit ec93faf572
3 changed files with 122 additions and 78 deletions

View File

@ -52,26 +52,16 @@ export interface BannedVO {
/**
* 1=,2=,3=,4=
*/
classify: number;
/**
*
*/
createTime: string;
/**
*
*/
updateBy: number;
/**
*
*/
updateTime: string;
type: number;
}
export interface BannedForm extends BaseEntity {
/**
* ID
*/
id?: string | number;
/**
* id
*/
@ -120,7 +110,7 @@ export interface BannedForm extends BaseEntity {
/**
* 1=,2=,3=,4=
*/
classify?: number;
type?: number;
}
@ -174,7 +164,7 @@ export interface BannedQuery extends PageQuery {
/**
* 1=,2=,3=,4=
*/
classify?: number;
type?: number;
/**
*

View File

@ -35,9 +35,6 @@
<el-option v-for="dict in dy_banned_handling_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="1=用户,2=笔记,3=活动,4=评论" prop="classify">
<el-input v-model="queryParams.classify" placeholder="请输入1=用户,2=笔记,3=活动,4=评论" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -86,18 +83,7 @@
<dict-tag :options="dy_banned_handling_status" :value="scope.row.handlingStatus"/>
</template>
</el-table-column>
<el-table-column label="1=用户,2=笔记,3=活动,4=评论" align="center" prop="classify" />
<el-table-column label="举报时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="updateBy" />
<el-table-column label="操作时间" align="center" prop="updateTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="1=用户,2=笔记,3=活动,4=评论" align="center" prop="type" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -154,9 +140,6 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="1=用户,2=笔记,3=活动,4=评论" prop="classify">
<el-input v-model="form.classify" placeholder="请输入1=用户,2=笔记,3=活动,4=评论" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -193,6 +176,7 @@ const dialog = reactive<DialogOption>({
});
const initFormData: BannedForm = {
id: undefined,
contentId: undefined,
reportUserId: undefined,
reportReason: undefined,
@ -202,7 +186,7 @@ const initFormData: BannedForm = {
banDays: undefined,
handlingMethod: undefined,
handlingStatus: undefined,
classify: undefined,
type: undefined,
}
const data = reactive<PageData<BannedForm, BannedQuery>>({
form: {...initFormData},
@ -218,11 +202,14 @@ const data = reactive<PageData<BannedForm, BannedQuery>>({
banDays: undefined,
handlingMethod: undefined,
handlingStatus: undefined,
classify: undefined,
type: undefined,
params: {
}
},
rules: {
id: [
{ required: true, message: "唯一标识ID不能为空", trigger: "blur" }
],
contentId: [
{ required: true, message: "被举报内容id不能为空", trigger: "blur" }
],
@ -250,8 +237,8 @@ const data = reactive<PageData<BannedForm, BannedQuery>>({
handlingStatus: [
{ required: true, message: "状态(0=已发布,1=已下架)不能为空", trigger: "change" }
],
classify: [
{ required: true, message: "1=用户,2=笔记,3=活动,4=评论不能为空", trigger: "blur" }
type: [
{ required: true, message: "1=用户,2=笔记,3=活动,4=评论不能为空", trigger: "change" }
],
}
});

View File

@ -13,7 +13,7 @@
</el-form-item>
<el-form-item label="标记地点" prop="cover">
<!-- <el-input v-model="queryParams.cover" placeholder="请输入标记地点" clearable @keyup.enter="handleQuery" />-->
<el-select v-model="queryParams.cover" placeholder="请选择标记地点" size="large" style="width: 240px">
<el-select v-model="queryParams.cover" placeholder="请选择标记地点" style="width: 240px">
<el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -38,16 +38,11 @@
<el-col :span="1.5">
<el-button v-hasPermi="['manage:notebook:add']" type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
</el-col>
<el-col :span="1.5">
<el-button v-hasPermi="['manage:notebook:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button v-hasPermi="['manage:notebook:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
>删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button v-hasPermi="['manage:notebook:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">
<el-button v-hasPermi="['manage:notebook:export']" type="warning" plain icon="Download"
@click="handleExport">导出 </el-button>
@ -57,7 +52,7 @@
</template>
<el-table v-loading="loading" :data="notebookList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column v-if="true" label="ID" align="center" prop="id" />
<el-table-column label="笔记标题" align="center" prop="title" />
<el-table-column label="笔记封面" align="center" prop="cover">
@ -66,8 +61,16 @@
<!-- <image-preview :src="scope.row.productImageUrl" /> -->
</template>
</el-table-column>
<el-table-column label="标记地点" align="center" prop="cover" />
<el-table-column label="标签" align="center" prop="status" />
<el-table-column label="标记地点" align="center" prop="location">
<template #default="scope">
<span>{{ formatlocation(scope.row.location) }}</span>
</template>
</el-table-column>
<el-table-column label="标签" align="center" prop="tagId">
<template #default="scope">
<span>{{ formatTag(scope.row.tagId) }}</span>
</template>
</el-table-column>
<el-table-column label="笔记详情" align="center" prop="tagId">
<template #default="scope">
<el-button type="text" @click="contenttext(scope.row)">查看详情</el-button>
@ -80,7 +83,7 @@
<!-- <image-preview :src="scope.row.productImageUrl" /> -->
</template>
</el-table-column>
<el-table-column label="笔记点赞数" align="center" prop="likeCount" />
<el-table-column label="笔记点赞数" align="center" prop="agreeCount" />
<el-table-column label="发布状态" align="center" prop="status">
<template #default="scope">
<el-tag v-if="scope.row.status == 0" type="info">未发布</el-tag>
@ -94,18 +97,21 @@
<el-table-column label="操作时间" align="center" prop="updateTime" width="200px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="编辑" placement="top">
<el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-button v-if="scope.row.status != 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button v-if="scope.row.status != 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="fabudata(scope.row)"
>发布</el-button
>
<el-button v-if="scope.row.status == 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="fabudata(scope.row)"
>撤销发布</el-button
>
<!-- <el-tooltip content="发布" placement="top">-->
<!-- <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>-->
<!-- </el-tooltip>-->
<el-tooltip content="删除" placement="top">
<el-button v-hasPermi="['manage:notebook:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
<el-button v-hasPermi="['manage:notebook:remove']" link type="primary" @click="handleDelete(scope.row)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -116,29 +122,29 @@
<el-dialog v-model="dialog.visible" :title="dialog.title" width="60%" append-to-body>
<el-form ref="notebookFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="笔记标题" prop="title">
<el-input v-model="form.title" placeholder="请输入攻略名称" style="width: 300px" />
<el-input v-model="form.title" placeholder="请输入笔记标题" style="width: 300px" />
</el-form-item>
<el-form-item label="笔记标签" prop="tagId">
<el-select v-model="value" placeholder="请选择标签" size="large" style="width: 240px" multiple>
<el-select v-model="tagvalue" placeholder="请选择标签" size="large" style="width: 240px" multiple>
<el-option v-for="item in sys_user_tagOptions" :key="item.id" :label="item.title" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="标记地点" prop="tagId">
<el-select v-model="value" placeholder="请选择标记地点" size="large" style="width: 240px">
<el-form-item label="标记地点" prop="location">
<el-select v-model="addressvalue" placeholder="请选择标记地点" size="large" style="width: 240px" multiple>
<el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="笔记照片" prop="cover">
<imageUpload :model-value="form.cover" :file-size="20" />
</el-form-item>
<el-form-item label="笔记内容">
<el-form-item label="笔记内容" prop="content">
<editor v-model="form.content" :min-height="192" />
</el-form-item>
</el-form>
<template #footer>
<div style="display: flex; justify-content: space-between">
<div>
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button :loading="buttonLoading" type="primary" @click="yulansave"> </el-button>
<el-button @click="cancel">存草稿</el-button>
</div>
<div>
@ -151,7 +157,9 @@
<!-- 笔记详情-->
<el-dialog v-model="concentdialog.visible" title="笔记详情" width="50%" append-to-body>
<div>{{ form.title }}</div>
<div>{{ form.content }}</div>
<div>{{ formatTag(form.tagId) }}</div>
<div>{{ formatlocation(form.location) }}</div>
<div v-html="form.content"></div>
</el-dialog>
</div>
</template>
@ -175,17 +183,20 @@ const sys_user_contentOptions = ref([]); //标签库
const queryFormRef = ref<ElFormInstance>();
const notebookFormRef = ref<ElFormInstance>();
const value = ref('');
const tagvalue = ref('');
const addressvalue = ref('');
const statusoptions = [
{
value: '1',
label: '全部'
label: '审核中'
},
{
value: '2',
label: '已发布'
},
{
value: '3',
value: '0',
label: '未发布'
}
];
@ -221,18 +232,49 @@ const data = reactive<PageData<NotebookForm, NotebookQuery>>({
},
rules: {
id: [{ required: true, message: '笔记ID不能为空', trigger: 'blur' }],
title: [{ required: true, message: '攻略名称不能为空', trigger: 'blur' }],
title: [{ required: true, message: '笔记标题不能为空', trigger: 'blur' }],
content: [{ required: true, message: '攻略内容不能为空', trigger: 'blur' }],
cover: [{ required: true, message: '笔记封面不能为空', trigger: 'blur' }],
// cover: [{ required: true, message: '', trigger: 'blur' }],
status: [{ required: true, message: '帐号状态不能为空', trigger: 'change' }],
tagId: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
location: [{ required: true, message: '标记地点不能为空', trigger: 'blur' }],
content: [{ required: true, message: '笔记内容不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/**
* 标签格式化
*/
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?.includes(element.id)) {
tagString += ',' + element.title;
}
}
return tagString.substring(1);
};
/**
* 标记地点格式化
*/
const formatlocation = (tagId: string | null) => {
let tagString = '';
let arrlist = tagId.split(',').map(Number);
for (let i = 0; i < sys_user_contentOptions.value.length; i++) {
const element = sys_user_contentOptions.value[i];
for (let j = 0; j < arrlist.length; j++) {
const conten = arrlist[j];
if (conten == element.id) {
tagString += ',' + element.name;
}
}
}
return tagString.substring(1);
};
/** 查询笔记列表 */
const getList = async () => {
loading.value = true;
@ -294,9 +336,25 @@ const handleUpdate = async (row?: NotebookVO) => {
const _id = row?.id || ids.value[0];
const res = await getNotebook(_id);
Object.assign(form.value, res.data);
tagvalue.value = form.value.tagId.split(',').map(Number);
addressvalue.value = form.value.location.split(',');
dialog.visible = true;
dialog.title = '修改笔记';
};
//
const fabudata = async (row?: NotebookVO) => {
const _id = row?.id || ids.value[0];
const res = await getNotebook(_id);
Object.assign(form.value, res.data);
form.value.status = row.status == 2 ? 0 : 2;
const text = row.status == 2 ? '撤销发布' : '发布';
const textmessage = row.status == 2 ? '撤销发布成功' : '发布成功';
await proxy?.$modal.confirm('是否确认' + text + '笔记编号为' + _id + '"的数据项?').finally(() => (loading.value = false));
await updateNotebook(form.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess(`${textmessage}`);
await getList();
};
const contenttext = async (row?: NotebookVO) => {
const _id = row?.id;
const res = await getNotebook(_id);
@ -305,6 +363,11 @@ const contenttext = async (row?: NotebookVO) => {
};
/** 提交按钮 */
const submitForm = () => {
form.value.tagId = tagvalue.value.join(',');
form.value.location = addressvalue.value.join(',');
form.value.cover = '';
form.value.status = 1;
notebookFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
@ -316,7 +379,7 @@ const submitForm = () => {
console.log(form.value.cover);
proxy?.$modal.msgSuccess('操作成功');
// dialog.visible = false;
dialog.visible = false;
await getList();
}
});
@ -330,6 +393,10 @@ const handleDelete = async (row?: NotebookVO) => {
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
//
const yulansave = () => {
concentdialog.visible = true;
};
/** 导出按钮操作 */
const handleExport = () => {