Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zhanglipeng 2021-01-18 23:06:52 +08:00
parent 14227961db
commit 53af5b12b5
5 changed files with 202 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ruoyi-ui/src/components/Editor/index.vue
View File

@ -10,12 +10,12 @@
:on-success="quillImgSuccess" :on-success="quillImgSuccess"
:on-error="uploadError" :on-error="uploadError"
:before-upload="quillImgBefore" :before-upload="quillImgBefore"
accept='.jpg,.jpeg,.png,.gif' accept=".jpg,.jpeg,.png,.gif"
></el-upload> ></el-upload>
<!-- 富文本组件 --> <!-- 富文本组件 -->
<quill-editor <quill-editor
class="editor" class="ql-editor"
v-model="content" v-model="content"
ref="quillEditor" ref="quillEditor"
:options="editorOption" :options="editorOption"
@ -27,20 +27,20 @@
</template> </template>
<script> <script>
import { getToken } from '@/utils/auth' import { getToken } from "@/utils/auth";
// 工具栏配置 // 工具栏配置
const toolbarOptions = [ const toolbarOptions = [
["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
["blockquote", "code-block"], // 引用 代码块 ["blockquote", "code-block"], // 引用 代码块
[{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
[{ indent: "-1" }, { indent: "+1" }], // 缩进 [{ indent: "-1" }, { indent: "+1" }], // 缩进
[{ size: ["small", false, "large", "huge"] }], // 字体大小 [{ size: ["small", false, "large", "huge"] }], // 字体大小
[{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
[{ align: [] }], // 对齐方式 [{ align: [] }], // 对齐方式
["clean"], // 清除文本格式 ["clean"], // 清除文本格式
["link", "image", "video"] // 链接、图片、视频 ["link", "image", "video"], // 链接、图片、视频
]; ];
import { quillEditor } from "vue-quill-editor"; import { quillEditor } from "vue-quill-editor";
@ -52,13 +52,13 @@ export default {
props: { props: {
/* 编辑器的内容 */ /* 编辑器的内容 */
value: { value: {
type: String type: String,
}, },
/* 图片大小 */ /* 图片大小 */
maxSize: { maxSize: {
type: Number, type: Number,
default: 4000 //kb default: 4000, //kb
} },
}, },
components: { quillEditor }, components: { quillEditor },
data() { data() {
@ -73,28 +73,28 @@ export default {
toolbar: { toolbar: {
container: toolbarOptions, container: toolbarOptions,
handlers: { handlers: {
image: function(value) { image: function (value) {
if (value) { if (value) {
// 触发input框选择图片文件 // 触发input框选择图片文件
document.querySelector(".quill-img input").click(); document.querySelector(".quill-img input").click();
} else { } else {
this.quill.format("image", false); this.quill.format("image", false);
} }
} },
} },
} },
} },
}, },
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
headers: { headers: {
Authorization: 'Bearer ' + getToken() Authorization: "Bearer " + getToken(),
} },
}; };
}, },
watch: { watch: {
value: function() { value: function () {
this.content = this.value; this.content = this.value;
} },
}, },
methods: { methods: {
onEditorBlur() { onEditorBlur() {
@ -111,12 +111,12 @@ export default {
// 富文本图片上传前 // 富文本图片上传前
quillImgBefore(file) { quillImgBefore(file) {
let fileType = file.type; let fileType = file.type;
if(fileType === 'image/jpeg' || fileType === 'image/png'){ if (fileType === "image/jpeg" || fileType === "image/png") {
return true; return true;
}else { } else {
this.$message.error('请插入图片类型文件(jpg/jpeg/png)'); this.$message.error("请插入图片类型文件(jpg/jpeg/png)");
return false; return false;
} }
}, },
quillImgSuccess(res, file) { quillImgSuccess(res, file) {
@ -139,16 +139,16 @@ export default {
uploadError() { uploadError() {
// loading动画消失 // loading动画消失
this.$message.error("图片插入失败"); this.$message.error("图片插入失败");
} },
} },
}; };
</script> </script>
<style> <style>
.editor { /* .editor {
line-height: normal !important; line-height: normal !important;
height: 192px; height: 192px;
} } */
.quill-img { .quill-img {
display: none; display: none;
} }

107
ruoyi-ui/src/views/benyi/news/index.vue
View File

@ -4,9 +4,9 @@
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
:inline="true" :inline="true"
label-width="68px" label-width="70px"
> >
<el-form-item label="类型" prop="type"> <el-form-item label="新闻类型" prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="请选择类型" placeholder="请选择类型"
@ -21,6 +21,13 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="新闻标题" prop="title">
<el-input
v-model="queryParams.title"
type="text"
placeholder="请输入新闻标题"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -68,7 +75,7 @@
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -77,7 +84,7 @@
v-hasPermi="['benyi:news:export']" v-hasPermi="['benyi:news:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col> -->
</el-row> </el-row>
<el-table <el-table
@ -86,20 +93,30 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" /> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="标题" align="center" prop="title" /> <el-table-column label="新闻标题" align="center" prop="title" />
<el-table-column <el-table-column
label="类型" label="新闻类型"
align="center" align="center"
prop="type" prop="type"
:formatter="typeFormat" :formatter="typeFormat"
/> />
<el-table-column label="内容" align="center" prop="content" :show-overflow-tooltip="true"> <!-- <el-table-column
label="内容"
align="center"
prop="content"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-html="scope.row.content"></div> <div class="ql-editor" v-html="scope.row.content"></div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="所属学校" align="center" prop="deptId" :formatter="deptFormat" /> <el-table-column
label="所属学校"
align="center"
prop="deptId"
:formatter="deptFormat"
/>
<el-table-column <el-table-column
label="是否审核" label="是否审核"
align="center" align="center"
@ -152,14 +169,15 @@
/> />
<!-- 添加或修改新闻中心对话框 --> <!-- 添加或修改新闻中心对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1024px" append-to-body> <el-dialog
:title="title"
:visible.sync="open"
width="1024px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="标题" prop="title"> <el-form-item label="新闻标题" prop="title">
<el-input <el-input v-model="form.title" type="text" placeholder="请输入新闻标题" />
v-model="form.title"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="类型"> <!-- <el-form-item label="类型">
<el-select v-model="form.type" placeholder="请选择类型"> <el-select v-model="form.type" placeholder="请选择类型">
@ -171,7 +189,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="内容" prop="content"> <el-form-item label="内容" class="ql-snow" prop="content">
<Editor v-model="form.content" placeholder="请输入内容" /> <Editor v-model="form.content" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -194,17 +212,16 @@ import {
} from "@/api/benyi/news"; } from "@/api/benyi/news";
import Editor from "@/components/Editor"; import Editor from "@/components/Editor";
import { listDept, getDept, } from "@/api/system/dept"; import { listDept, getDept } from "@/api/system/dept";
import { listUser, getUser, } from "@/api/system/user"; import { listUser, getUser } from "@/api/system/user";
export default { export default {
name: "News", name: "News",
components: { components: {
Editor Editor,
}, },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -254,19 +271,15 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
title: [ title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
{ required: true, message: "标题不能为空", trigger: "blur" }, content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
],
content: [
{ required: true, message: "内容不能为空", trigger: "blur" },
],
}, },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDeptList(); this.getDeptList();
this.getUserList() this.getUserList();
this.getDicts("sys_dm_newstype").then((response) => { this.getDicts("sys_dm_newstype").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
@ -435,7 +448,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm(
'是否确认删除新闻中心编号为"' + ids + '"的数据项?', '是否确认删除选中的新闻中心数据项?',
"警告", "警告",
{ {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -452,22 +465,22 @@ export default {
}) })
.catch(function () {}); .catch(function () {});
}, },
/** 导出按钮操作 */ // /** 导出按钮操作 */
handleExport() { // handleExport() {
const queryParams = this.queryParams; // const queryParams = this.queryParams;
this.$confirm("是否确认导出所有新闻中心数据项?", "警告", { // this.$confirm("是否确认导出所有新闻中心数据项?", "警告", {
confirmButtonText: "确定", // confirmButtonText: "确定",
cancelButtonText: "取消", // cancelButtonText: "取消",
type: "warning", // type: "warning",
}) // })
.then(function () { // .then(function () {
return exportNews(queryParams); // return exportNews(queryParams);
}) // })
.then((response) => { // .then((response) => {
this.download(response.msg); // this.download(response.msg);
}) // })
.catch(function () {}); // .catch(function () {});
}, // },
}, },
}; };
</script> </script>

23
ruoyi-ui/src/views/benyi/newsapproval/index.vue
View File

@ -6,7 +6,7 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="类型" prop="type"> <el-form-item label="新闻类型" prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="请选择类型" placeholder="请选择类型"
@ -20,6 +20,13 @@
:value="dict.dictValue" :value="dict.dictValue"
/> />
</el-select> </el-select>
</el-form-item>
<el-form-item label="新闻标题" prop="title">
<el-input
v-model="queryParams.title"
type="text"
placeholder="请输入新闻标题"
/>
</el-form-item> </el-form-item>
<el-form-item label="是否审核" prop="ischeck"> <el-form-item label="是否审核" prop="ischeck">
<el-select <el-select
@ -69,15 +76,15 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" /> <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="标题" align="center" prop="title" /> <el-table-column label="新闻标题" align="center" prop="title" />
<el-table-column <el-table-column
label="类型" label="新闻类型"
align="center" align="center"
prop="type" prop="type"
:formatter="typeFormat" :formatter="typeFormat"
/> />
<el-table-column <!-- <el-table-column
label="内容" label="内容"
align="center" align="center"
prop="content" prop="content"
@ -86,7 +93,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-html="scope.row.content"></div> <div v-html="scope.row.content"></div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
label="所属学校" label="所属学校"
align="center" align="center"
@ -152,10 +159,10 @@
append-to-body append-to-body
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="标题" prop="title"> <el-form-item label="新闻标题" prop="title">
<el-input <el-input
v-model="form.title" v-model="form.title"
type="textarea" type="text"
placeholder="请输入内容" placeholder="请输入内容"
/> />
</el-form-item> </el-form-item>

89
ruoyi-ui/src/views/system/teacher/index.vue
View File

@ -280,6 +280,89 @@ import {
export default { export default {
name: "Teacher", name: "Teacher",
data() { data() {
const idCardValidity = (rule, code, callback) => {
var city = {
11: "北京",
12: "天津",
13: "河北",
14: "山西",
15: "内蒙古",
21: "辽宁",
22: "吉林",
23: "黑龙江 ",
31: "上海",
32: "江苏",
33: "浙江",
34: "安徽",
35: "福建",
36: "江西",
37: "山东",
41: "河南",
42: "湖北 ",
43: "湖南",
44: "广东",
45: "广西",
46: "海南",
50: "重庆",
51: "四川",
52: "贵州",
53: "云南",
54: "西藏 ",
61: "陕西",
62: "甘肃",
63: "青海",
64: "宁夏",
65: "新疆",
71: "台湾",
81: "香港",
82: "澳门",
91: "国外 ",
};
var tip = "";
var pass = true;
if (
!code ||
!/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test(
code
)
) {
tip = "身份证号格式错误";
pass = false;
} else if (!city[code.substr(0, 2)]) {
// tip = "地址编码错误"
tip = "身份证输入错误";
pass = false;
} else {
// 18位身份证需要验证最后一位校验位
if (code.length === 18) {
code = code.split("");
// ∑(ai×Wi)(mod 11)
// 加权因子
var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
// 校验位
var parity = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2];
var sum = 0;
var ai = 0;
var wi = 0;
for (var i = 0; i < 17; i++) {
ai = code[i];
wi = factor[i];
sum += ai * wi;
}
var last = parity[sum % 11];
if (parity[sum % 11] != code[17]) {
// tip = "校验位错误"
tip = "身份证输入错误";
pass = false;
}
}
}
if (!pass) {
callback(new Error(tip));
} else {
callback();
}
};
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -336,12 +419,12 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
zjhm: [ zjhm: [
{ required: true, message: '请输入身份证号', trigger: 'blur' },
{ {
required: false, pattern: /(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/,
pattern: /^\d{18}$/,
message: "请输入正确的身份证号", message: "请输入正确的身份证号",
trigger: "blur",
}, },
{ validator: idCardValidity, trigger: "blur" },
], ],
}, },
}; };

2
ruoyi/src/main/resources/mybatis/benyi/BySchoolNewsMapper.xml
View File

@ -29,7 +29,7 @@
<include refid="selectBySchoolNewsVo"/> <include refid="selectBySchoolNewsVo"/>
<where> <where>
d.isdel = 'N' d.isdel = 'N'
<if test="title != null and title != ''">and d.title = #{title}</if> <if test="title != null and title != ''">and d.title like concat('%', #{title}, '%')</if>
<if test="imgurl != null and imgurl != ''">and d.imgurl = #{imgurl}</if> <if test="imgurl != null and imgurl != ''">and d.imgurl = #{imgurl}</if>
<if test="abstractcontent != null and abstractcontent != ''">and d.abstractcontent = #{abstractcontent}</if> <if test="abstractcontent != null and abstractcontent != ''">and d.abstractcontent = #{abstractcontent}</if>
<if test="type != null and type != ''">and d.type = #{type}</if> <if test="type != null and type != ''">and d.type = #{type}</if>