gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

通知公告名称修改

pull/1/head
李强 2021-03-10 20:55:33 +08:00
parent 1766f7cc04
commit 91d93e4bfd
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dvadmin-backend/apps/system/models/message_push.py
View File

@ -11,18 +11,18 @@ from apps.permission.models import UserProfile
class MessagePush(CoreModel):
title = CharField(max_length=128, verbose_name="消息标题")
content = TextField(verbose_name="消息内容")
message_type = CharField(max_length=8, verbose_name="消息类型")
title = CharField(max_length=128, verbose_name="通知标题")
content = TextField(verbose_name="通知内容")
message_type = CharField(max_length=8, verbose_name="通知类型")
is_reviewed = BooleanField(default=True, verbose_name="是否审核")
status = CharField(max_length=8, verbose_name="消息状态")
status = CharField(max_length=8, verbose_name="通知状态")
to_path = CharField(max_length=256, verbose_name="跳转路径", null=True, blank=True, )
user = ManyToManyField(to="permission.UserProfile",
related_name="user", related_query_name="user_query", through='MessagePushUser',
through_fields=('message_push', 'user'))
class Meta:
verbose_name = '消息通知'
verbose_name = '通知公告'
verbose_name_plural = verbose_name
def __str__(self):
@ -42,5 +42,5 @@ class MessagePushUser(models.Model):
create_datetime = CreateDateTimeField() # 创建时间
class Meta:
verbose_name = "消息通知与用户关系"
verbose_name = "通知公告与用户关系"
verbose_name_plural = verbose_name

12
dvadmin-backend/scripts/permission/permission_menu.sql
View File

@ -77,15 +77,15 @@ INSERT INTO `permission_menu` VALUES (43, '', 'admin', '2021-03-03 15:22:48.4926
INSERT INTO `permission_menu` VALUES (44, '', 'admin', '2021-03-03 15:23:58.219105', '2021-03-03 15:23:58.219155', '2', NULL, '文件删除', 2, '1', NULL, NULL, '/system/savefile/{id}/', 'DELETE', 'system:savefile:{id}:delete', '1', '1', '1', 1, 11);
INSERT INTO `permission_menu` VALUES (45, '', 'admin', '2021-03-03 15:25:15.224971', '2021-03-03 15:25:15.225018', '2', NULL, '清理废弃文件', 3, '1', NULL, NULL, '/system/clearsavefile/', 'POST', 'system:clearsavefile:post', '1', '1', '1', 1, 11);
INSERT INTO `permission_menu` VALUES (46, '', 'admin', '2021-03-03 15:28:30.061632', '2021-03-03 15:27:19.945663', '2', NULL, '文件下载', 4, '1', NULL, NULL, NULL, 'GET', 'system:clearsavefile:download:post', '1', '1', '1', 1, 11);
INSERT INTO `permission_menu` VALUES (47, '', 'admin', '2021-03-07 14:35:34.237127', '2021-03-07 14:32:06.754815', '1', 'message', '消息通知', 4, '1', 'system/message', 'system/message/index', '/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 1);
INSERT INTO `permission_menu` VALUES (48, '', 'admin', '2021-03-07 14:35:06.718432', '2021-03-07 14:35:06.718463', '2', NULL, '发布通知', 1, '1', NULL, NULL, '/system/message/', 'POST', 'system:message:post', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (49, '', 'admin', '2021-03-08 13:04:32.158707', '2021-03-07 14:36:47.675837', '2', NULL, '修改通知', 2, '1', NULL, NULL, '/system/message/{id}/', 'PUT', 'system:message:{id}:put', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (50, '', 'admin', '2021-03-08 13:04:58.206693', '2021-03-07 14:37:52.130567', '2', NULL, '删除通知', 3, '1', NULL, NULL, '/permission/menu/{id}/', 'DELETE', 'permission:menu:{id}:delete', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (51, '', 'admin', '2021-03-07 14:42:37.410336', '2021-03-07 14:42:37.410366', '2', NULL, '通知导出', 4, '1', NULL, NULL, '/system/message/export/', 'GET', 'system:message:export:get', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (47, '', 'admin', '2021-03-07 14:35:34.237127', '2021-03-07 14:32:06.754815', '1', 'message', '通知公告', 4, '1', 'system/message', 'system/message/index', '/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 1);
INSERT INTO `permission_menu` VALUES (48, '', 'admin', '2021-03-07 14:35:06.718432', '2021-03-07 14:35:06.718463', '2', NULL, '发布公告', 1, '1', NULL, NULL, '/system/message/', 'POST', 'system:message:post', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (49, '', 'admin', '2021-03-08 13:04:32.158707', '2021-03-07 14:36:47.675837', '2', NULL, '修改公告', 2, '1', NULL, NULL, '/system/message/{id}/', 'PUT', 'system:message:{id}:put', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (50, '', 'admin', '2021-03-08 13:04:58.206693', '2021-03-07 14:37:52.130567', '2', NULL, '删除公告', 3, '1', NULL, NULL, '/permission/menu/{id}/', 'DELETE', 'permission:menu:{id}:delete', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (51, '', 'admin', '2021-03-07 14:42:37.410336', '2021-03-07 14:42:37.410366', '2', NULL, '公告导出', 4, '1', NULL, NULL, '/system/message/export/', 'GET', 'system:message:export:get', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (52, '', 'admin', '2021-03-09 17:19:13.828166', '2021-03-09 17:18:14.976783', '2', NULL, '字典查询', 0, '1', NULL, NULL, '/system/dict/type/', 'GET', 'system:dict:type:get', '1', '1', '1', 1, 3);
INSERT INTO `permission_menu` VALUES (53, '', 'admin', '2021-03-09 17:19:46.963317', '2021-03-09 17:19:33.953559', '2', NULL, '参数查询', 0, '1', NULL, NULL, '/system/config/', 'GET', 'system:config:get', '1', '1', '1', 1, 4);
INSERT INTO `permission_menu` VALUES (54, '', 'admin', '2021-03-09 17:20:14.749627', '2021-03-09 17:20:02.783389', '2', NULL, '文件查询', 0, '1', NULL, NULL, '/system/savefile/', 'GET', 'system:savefile:get', '1', '1', '1', 1, 11);
INSERT INTO `permission_menu` VALUES (55, '', 'admin', '2021-03-09 17:20:44.604824', '2021-03-09 17:20:36.025364', '2', NULL, '通知查询', 0, '1', NULL, NULL, '/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (55, '', 'admin', '2021-03-09 17:20:44.604824', '2021-03-09 17:20:36.025364', '2', NULL, '公告查询', 0, '1', NULL, NULL, '/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 47);
INSERT INTO `permission_menu` VALUES (56, '', 'admin', '2021-03-09 17:21:06.429585', '2021-03-09 17:21:06.429629', '2', NULL, '岗位查询', 0, '1', NULL, NULL, '/permission/post/', 'GET', 'permission:post:get', '1', '1', '1', 1, 5);
INSERT INTO `permission_menu` VALUES (57, '', 'admin', '2021-03-09 17:21:29.013165', '2021-03-09 17:21:29.013210', '2', NULL, '部门查询', 0, '1', NULL, NULL, '/permission/dept/', 'GET', 'permission:dept:get', '1', '1', '1', 1, 6);
INSERT INTO `permission_menu` VALUES (58, '', 'admin', '2021-03-09 17:21:56.243957', '2021-03-09 17:21:47.358360', '2', NULL, '菜单查询', 0, '1', NULL, NULL, '/permission/menus/', 'GET', 'permission:menus:get', '1', '1', '1', 1, 7);

66
dvadmin-ui/src/views/system/message/index.vue
View File

@ -1,18 +1,18 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="消息标题" prop="title">
<el-form-item label="公告标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入消息标题"
placeholder="请输入公告标题"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="消息类型" prop="message_type">
<el-select v-model="queryParams.message_type" placeholder="消息类型" clearable size="small">
<el-form-item label="公告类型" prop="message_type">
<el-select v-model="queryParams.message_type" placeholder="公告类型" clearable size="small">
<el-option
v-for="dict in MessagePushTypeOptions"
:key="dict.dictValue"
@ -21,8 +21,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="消息状态" prop="status">
<el-select v-model="queryParams.status" placeholder="消息状态" clearable size="small">
<el-form-item label="公告状态" prop="status">
<el-select v-model="queryParams.status" placeholder="公告状态" clearable size="small">
<el-option
v-for="dict in MessagePushStatusOptions"
:key="dict.dictValue"
@ -52,7 +52,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:message:post']"
>发布通知
>发布公告
</el-button>
</el-col>
<el-col :span="1.5">
@ -64,7 +64,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:message:{id}:put']"
>修改通知
>修改公告
</el-button>
</el-col>
<el-col :span="1.5">
@ -76,7 +76,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['permission:menu:{id}:delete']"
>删除通知
>删除公告
</el-button>
</el-col>
<el-col :span="1.5">
@ -95,12 +95,12 @@
<el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="消息主键" align="center" prop="id"/>
<el-table-column label="消息标题" align="center" prop="title" :show-overflow-tooltip="true"/>
<el-table-column label="消息内容" align="center" prop="content" :show-overflow-tooltip="true"/>
<el-table-column label="消息类型" align="center" prop="message_type" :formatter="typeFormat"/>
<el-table-column label="公告主键" align="center" prop="id"/>
<el-table-column label="公告标题" align="center" prop="title" :show-overflow-tooltip="true"/>
<el-table-column label="公告内容" align="center" prop="content" :show-overflow-tooltip="true"/>
<el-table-column label="公告类型" align="center" prop="message_type" :formatter="typeFormat"/>
<!-- <el-table-column label="是否审核通过" align="center" prop="is_reviewed" :formatter="isReviewedFormat"/>-->
<el-table-column label="消息状态" align="center" prop="status" :formatter="statusFormat"/>
<el-table-column label="公告状态" align="center" prop="status" :formatter="statusFormat"/>
<el-table-column label="跳转路径" align="center" prop="to_path" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="create_datetime" width="180">
<template slot-scope="scope">
@ -141,13 +141,13 @@
@pagination="getList"
/>
<!-- 添加或修改通知配置对话框 -->
<!-- 添加或修改公告配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<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-col>
<el-col :span="12">
@ -168,7 +168,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="消息类型" prop="message_type">
<el-form-item label="公告类型" prop="message_type">
<el-select v-model="form.message_type" placeholder="请选择">
<el-option
v-for="dict in MessagePushTypeOptions"
@ -180,7 +180,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="消息内容" prop="content">
<el-form-item label="公告内容" prop="content">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
</el-col>
@ -224,19 +224,19 @@
showSearch: true,
// 总条数
total: 0,
// 通知表格数据
// 公告表格数据
configList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 消息类型字典
// 公告类型字典
MessagePushTypeOptions: [],
// 状态类型字典
StatusOptions: [],
// 消息类型字典
// 公告类型字典
MessagePushStatusOptions: [],
// 查询通知
// 查询公告
queryParams: {
pageNum: 1,
pageSize: 10,
@ -246,15 +246,15 @@
is_reviewed: undefined,
status: undefined
},
// 表单通知
// 表单公告
form: {},
// 表单校验
rules: {
title: [
{required: true, message: "消息标题不能为空", trigger: "blur"}
{required: true, message: "公告标题不能为空", trigger: "blur"}
],
content: [
{required: true, message: "消息内容不能为空", trigger: "blur"}
{required: true, message: "公告内容不能为空", trigger: "blur"}
],
to_path: [
{required: false, message: "跳转路径不能为空", trigger: "blur"}
@ -272,7 +272,7 @@
});
},
methods: {
/** 查询通知列表 */
/** 查询公告列表 */
getList() {
this.loading = true;
listMessage(this.addDateRange(this.queryParams)).then(response => {
@ -282,15 +282,15 @@
}
);
},
// 消息类型字典翻译
// 公告类型字典翻译
typeFormat(row, column) {
return this.selectDictLabel(this.MessagePushTypeOptions, row.message_type);
},
// 消息状态字典翻译
// 公告状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.MessagePushStatusOptions, row.status);
},
// 消息状态字典翻译
// 公告状态字典翻译
isReviewedFormat(row, column) {
return row.is_reviewed === true ? '是' : '否'
},
@ -326,7 +326,7 @@
handleAdd() {
this.reset();
this.open = true;
this.title = "发布通知";
this.title = "发布公告";
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -341,7 +341,7 @@
getMessage(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改通知";
this.title = "修改公告";
});
},
/** 提交按钮 */
@ -367,7 +367,7 @@
/** 删除按钮操作 */
handleDelete(row) {
const configIds = row.id || this.ids;
this.$confirm('是否确认删除通知编号为"' + configIds + '"的数据项?', "警告", {
this.$confirm('是否确认删除公告编号为"' + configIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"