vehicle
/
system-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通知公告

master
DongZeLiang 2024-04-13 09:59:50 +08:00
parent 6c189e557c
commit 0c36d34f5d
8 changed files with 251 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/components/MessageNotify/index.vue 100644
View File

@ -0,0 +1,148 @@
<template>
<div>
<svg-icon :icon-class="'email'" @click="click"/>
<!-- <i class="el-icon-s-comment" @click="click"></i>-->
<el-drawer
title="消息通知"
:visible.sync="drawer">
<el-row style="margin: 10px">
<el-col>
<el-radio-group v-model="radio1">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="通知"></el-radio-button>
<el-radio-button label="公告"></el-radio-button>
</el-radio-group>
</el-col>
<el-col>
<el-radio-group v-model="radio2">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="已读"></el-radio-button>
<el-radio-button label="未读"></el-radio-button>
</el-radio-group>
</el-col>
</el-row>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>消息名称消息名称消息名称消息名称</span>
<el-button style="float: right;">阅读消息</el-button>
</div>
<el-descriptions class="margin-top" :column="2" :size="size" border>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-time"></i>
消息发布时间
</template>
2024-4-13 09:30:57
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
消息发布人
</template>
张三（研发部/部门经理）
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-place"></i>
消息类型
</template>
<el-tag size="small">通知</el-tag>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-tickets"></i>
当期状态
</template>
<el-tag size="small">未读</el-tag>
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>消息名称消息名称消息名称消息名称</span>
<el-button style="float: right;">阅读消息</el-button>
</div>
<el-descriptions class="margin-top" :column="2" :size="size" border>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-time"></i>
消息发布时间
</template>
2024-4-13 09:30:57
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
消息发布人
</template>
张三（研发部/部门经理）
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-place"></i>
消息类型
</template>
<el-tag size="small">通知</el-tag>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-tickets"></i>
当期状态
</template>
<el-tag size="small" type="success">已读</el-tag>
</el-descriptions-item>
</el-descriptions>
</el-card>
</el-drawer>
</div>
</template>
<script>
export default {
name: 'MessageNotify',
data() {
return {
drawer: false,
radio1: "全部",
radio2: "全部",
}
},
methods: {
click() {
this.drawer = true;
},
}
}
</script>
<style scoped>
.screenfull-svg {
display: inline-block;
cursor: pointer;
fill: #5a5e66;;
width: 20px;
height: 20px;
vertical-align: 10px;
}
.text {
font-size: 14px;
}
.item {
margin-bottom: 18px;
}
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both
}
.box-card{
margin: 10px;
}
</style>

4
src/layout/components/Navbar.vue
View File

@ -8,6 +8,8 @@
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device!=='mobile'">
<!-- <message-notify id="message-notify" class="right-menu-item">-->
<message-notify id="message-notify" class="right-menu-item"></message-notify>
<search id="header-search" class="right-menu-item"/> <search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/> <screenfull id="screenfull" class="right-menu-item hover-effect"/>
@ -46,9 +48,11 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull' import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect' import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch' import Search from '@/components/HeaderSearch'
import MessageNotify from '@/components/MessageNotify/index.vue'
export default { export default {
components: { components: {
MessageNotify,
Breadcrumb, Breadcrumb,
TopNav, TopNav,
Hamburger, Hamburger,

4
src/views/monitor/job/index.vue
View File

@ -397,7 +397,7 @@ export default {
"jobId": 2, "jobId": 2,
"jobName": "系统默认（有参）", "jobName": "系统默认（有参）",
"jobGroup": "DEFAULT", "jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtParams('ruiteng')", "invokeTarget": "rtTask.rtParams('muyu')",
"cronExpression": "0/15 * * * * ?", "cronExpression": "0/15 * * * * ?",
"misfirePolicy": "3", "misfirePolicy": "3",
"concurrent": "1", "concurrent": "1",
@ -413,7 +413,7 @@ export default {
"jobId": 3, "jobId": 3,
"jobName": "系统默认（多参）", "jobName": "系统默认（多参）",
"jobGroup": "DEFAULT", "jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtMultipleParams('ruiteng', true, 2000L, 316.50D, 100)", "invokeTarget": "rtTask.rtMultipleParams('muyu', true, 2000L, 316.50D, 100)",
"cronExpression": "0/20 * * * * ?", "cronExpression": "0/20 * * * * ?",
"misfirePolicy": "3", "misfirePolicy": "3",
"concurrent": "1", "concurrent": "1",

10
src/views/monitor/job/log.vue
View File

@ -254,7 +254,7 @@ export default {
"invokeTarget": "rtTask.rtNoParams", "invokeTarget": "rtTask.rtNoParams",
"jobMessage": "系统默认（无参） 总共耗时：1毫秒", "jobMessage": "系统默认（无参） 总共耗时：1毫秒",
"status": "1", "status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtNoParams()\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:52)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n", "exceptionInfo": "java.lang.NoSuchMethodException: com.muyu.quartz.task.RtTask.rtNoParams()\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:52)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.muyu.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.muyu.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null, "startTime": null,
"stopTime": null "stopTime": null
}, },
@ -266,10 +266,10 @@ export default {
"jobLogId": 2, "jobLogId": 2,
"jobName": "系统默认（有参）", "jobName": "系统默认（有参）",
"jobGroup": "DEFAULT", "jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtParams('ruiteng')", "invokeTarget": "rtTask.rtParams('muyu')",
"jobMessage": "系统默认（有参） 总共耗时：0毫秒", "jobMessage": "系统默认（有参） 总共耗时：0毫秒",
"status": "1", "status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtParams(java.lang.String)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n", "exceptionInfo": "java.lang.NoSuchMethodException: com.muyu.quartz.task.RtTask.rtParams(java.lang.String)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.muyu.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.muyu.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null, "startTime": null,
"stopTime": null "stopTime": null
}, },
@ -281,10 +281,10 @@ export default {
"jobLogId": 3, "jobLogId": 3,
"jobName": "系统默认（多参）", "jobName": "系统默认（多参）",
"jobGroup": "DEFAULT", "jobGroup": "DEFAULT",
"invokeTarget": "rtTask.rtMultipleParams('ruiteng', true, 2000L, 316.50D, 100)", "invokeTarget": "rtTask.rtMultipleParams('muyu', true, 2000L, 316.50D, 100)",
"jobMessage": "系统默认（多参） 总共耗时：0毫秒", "jobMessage": "系统默认（多参） 总共耗时：0毫秒",
"status": "1", "status": "1",
"exceptionInfo": "java.lang.NoSuchMethodException: com.ruiteng.quartz.task.RtTask.rtMultipleParams(java.lang.String,java.lang.Boolean,java.lang.Long,java.lang.Double,java.lang.Integer)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.ruiteng.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.ruiteng.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.ruiteng.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n", "exceptionInfo": "java.lang.NoSuchMethodException: com.muyu.quartz.task.RtTask.rtMultipleParams(java.lang.String,java.lang.Boolean,java.lang.Long,java.lang.Double,java.lang.Integer)\n\tat java.base/java.lang.Class.getMethod(Class.java:2227)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:49)\n\tat com.muyu.quartz.util.JobInvokeUtil.invokeMethod(JobInvokeUtil.java:31)\n\tat com.muyu.quartz.util.QuartzDisallowConcurrentExecution.doExecute(QuartzDisallowConcurrentExecution.java:16)\n\tat com.muyu.quartz.util.AbstractQuartzJob.execute(AbstractQuartzJob.java:40)\n\tat org.quartz.core.JobRunShell.run(JobRunShell.java:202)\n\tat org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573)\n",
"startTime": null, "startTime": null,
"stopTime": null "stopTime": null
} }

68
src/views/system/dept/index.vue
View File

@ -245,9 +245,9 @@ export default {
"deptId": 100, "deptId": 100,
"parentId": 0, "parentId": 0,
"ancestors": "0", "ancestors": "0",
"deptName": "锐腾科技", "deptName": "muyu牧鱼科技",
"orderNum": 0, "orderNum": 0,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -265,7 +265,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "深圳总公司", "deptName": "深圳总公司",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -283,7 +283,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "长沙分公司", "deptName": "长沙分公司",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -301,7 +301,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "研发部门", "deptName": "研发部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -319,7 +319,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -337,7 +337,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "测试部门", "deptName": "测试部门",
"orderNum": 3, "orderNum": 3,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -355,7 +355,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 4, "orderNum": 4,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -373,7 +373,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "运维部门", "deptName": "运维部门",
"orderNum": 5, "orderNum": 5,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -391,7 +391,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -409,7 +409,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -481,9 +481,9 @@ export default {
"deptId": 100, "deptId": 100,
"parentId": 0, "parentId": 0,
"ancestors": "0", "ancestors": "0",
"deptName": "锐腾科技", "deptName": "muyu牧鱼科技",
"orderNum": 0, "orderNum": 0,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -501,7 +501,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "深圳总公司", "deptName": "深圳总公司",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -519,7 +519,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "长沙分公司", "deptName": "长沙分公司",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -537,7 +537,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "研发部门", "deptName": "研发部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -555,7 +555,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -573,7 +573,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "测试部门", "deptName": "测试部门",
"orderNum": 3, "orderNum": 3,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -591,7 +591,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 4, "orderNum": 4,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -609,7 +609,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "运维部门", "deptName": "运维部门",
"orderNum": 5, "orderNum": 5,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -627,7 +627,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -645,7 +645,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -681,7 +681,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "深圳总公司", "deptName": "深圳总公司",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -705,9 +705,9 @@ export default {
"deptId": 100, "deptId": 100,
"parentId": 0, "parentId": 0,
"ancestors": "0", "ancestors": "0",
"deptName": "锐腾科技", "deptName": "muyu牧鱼科技",
"orderNum": 0, "orderNum": 0,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -725,7 +725,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "深圳总公司", "deptName": "深圳总公司",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -743,7 +743,7 @@ export default {
"ancestors": "0,100", "ancestors": "0,100",
"deptName": "长沙分公司", "deptName": "长沙分公司",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -761,7 +761,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "研发部门", "deptName": "研发部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -779,7 +779,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -797,7 +797,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "测试部门", "deptName": "测试部门",
"orderNum": 3, "orderNum": 3,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -815,7 +815,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 4, "orderNum": 4,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -833,7 +833,7 @@ export default {
"ancestors": "0,100,101", "ancestors": "0,100,101",
"deptName": "运维部门", "deptName": "运维部门",
"orderNum": 5, "orderNum": 5,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -851,7 +851,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "市场部门", "deptName": "市场部门",
"orderNum": 1, "orderNum": 1,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",
@ -869,7 +869,7 @@ export default {
"ancestors": "0,100,102", "ancestors": "0,100,102",
"deptName": "财务部门", "deptName": "财务部门",
"orderNum": 2, "orderNum": 2,
"leader": "锐腾", "leader": "muyu牧鱼",
"phone": "15888888888", "phone": "15888888888",
"email": "ry@qq.com", "email": "ry@qq.com",
"status": "0", "status": "0",

54
src/views/system/notice/index.vue
View File

@ -99,6 +99,14 @@
</el-table-column> </el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
v-hasPermi="['system:notice:edit']"
icon="el-icon-search"
size="mini"
type="text"
@click="notifyDetail(scope.row)"
>通知详情
</el-button>
<el-button <el-button
v-hasPermi="['system:notice:edit']" v-hasPermi="['system:notice:edit']"
icon="el-icon-edit" icon="el-icon-edit"
@ -133,13 +141,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公告标题" prop="noticeTitle"> <el-form-item label="公告标题" prop="noticeTitle">
<el-input v-model="form.noticeTitle" placeholder="请输入公告标题"/> <el-input v-model="form.noticeTitle" :disabled="isRead" placeholder="请输入公告标题"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公告类型" prop="noticeType"> <el-form-item label="公告类型" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="请选择公告类型"> <el-select v-model="form.noticeType" :disabled="isRead" placeholder="请选择公告类型">
<el-option <el-option :disabled="isRead"
v-for="dict in dict.type.sys_notice_type" v-for="dict in dict.type.sys_notice_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
@ -150,7 +158,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status" :disabled="isRead">
<el-radio <el-radio
v-for="dict in dict.type.sys_notice_status" v-for="dict in dict.type.sys_notice_status"
:key="dict.value" :key="dict.value"
@ -162,9 +170,32 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="内容"> <el-form-item label="内容">
<editor v-model="form.noticeContent" :min-height="192"/> <editor v-model="form.noticeContent" :min-height="192" :read-only="isRead"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-col :span="8">
<el-statistic
:value="1253"
title="总共通知数量"
></el-statistic>
</el-col>
<el-col :span="8">
<el-statistic
:value="1000"
title="已阅读通知数量"
></el-statistic>
</el-col>
<el-col :span="8">
<el-statistic
:value="253"
title="未阅读通知数量"
></el-statistic>
</el-col>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -219,13 +250,20 @@ export default {
noticeType: [ noticeType: [
{required: true, message: "公告类型不能为空", trigger: "change"} {required: true, message: "公告类型不能为空", trigger: "change"}
] ]
} },
isRead: false
}; };
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
notifyDetail(row){
this.reset();
this.form = row;
this.open = true;
this.isRead = true;
},
/** 查询公告列表 */ /** 查询公告列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -241,7 +279,7 @@ export default {
"updateBy": null, "updateBy": null,
"updateTime": null, "updateTime": null,
"noticeId": 1, "noticeId": 1,
"noticeTitle": "温馨提醒：2018-07-01 锐腾新版本发布啦", "noticeTitle": "温馨提醒：2018-07-01 muyu牧鱼新版本发布啦",
"noticeType": "2", "noticeType": "2",
"noticeContent": "新版本内容", "noticeContent": "新版本内容",
"status": "0", "status": "0",
@ -253,7 +291,7 @@ export default {
"updateBy": null, "updateBy": null,
"updateTime": null, "updateTime": null,
"noticeId": 2, "noticeId": 2,
"noticeTitle": "维护通知：2018-07-01 锐腾系统凌晨维护", "noticeTitle": "维护通知：2018-07-01 muyu牧鱼系统凌晨维护",
"noticeType": "1", "noticeType": "1",
"noticeContent": "维护内容", "noticeContent": "维护内容",
"status": "0", "status": "0",

22
src/views/system/operlog/index.vue
View File

@ -277,7 +277,7 @@ export default {
"title": "角色管理", "title": "角色管理",
"businessType": 4, "businessType": 4,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysRoleController.selectAuthUserAll()", "method": "com.muyu.web.controller.system.SysRoleController.selectAuthUserAll()",
"requestMethod": "PUT", "requestMethod": "PUT",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -288,7 +288,7 @@ export default {
"operParam": "{\"roleId\":\"2\",\"userIds\":\"1\"}", "operParam": "{\"roleId\":\"2\",\"userIds\":\"1\"}",
"jsonResult": null, "jsonResult": null,
"status": 1, "status": 1,
"errorMsg": "\n### Error updating database. Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n### The error may exist in URL [jar:file:/home/app.jar!/BOOT-INF/lib/ruiteng-system-1.0.0.jar!/mapper/system/SysUserRoleMapper.xml]\n### The error may involve defaultParameterMap\n### The error occurred while setting parameters\n### SQL: insert into sys_user_role(user_id, role_id) values (?,?)\n### Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n; Duplicate entry '1-2' for key 'PRIMARY'; nested exception is java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'", "errorMsg": "\n### Error updating database. Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n### The error may exist in URL [jar:file:/home/app.jar!/BOOT-INF/lib/muyu-system-1.0.0.jar!/mapper/system/SysUserRoleMapper.xml]\n### The error may involve defaultParameterMap\n### The error occurred while setting parameters\n### SQL: insert into sys_user_role(user_id, role_id) values (?,?)\n### Cause: java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'\n; Duplicate entry '1-2' for key 'PRIMARY'; nested exception is java.sql.SQLIntegrityConstraintViolationException: Duplicate entry '1-2' for key 'PRIMARY'",
"operTime": "2024-04-12 07:15:07", "operTime": "2024-04-12 07:15:07",
"costTime": 96 "costTime": 96
}, },
@ -301,7 +301,7 @@ export default {
"title": "角色管理", "title": "角色管理",
"businessType": 4, "businessType": 4,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysRoleController.selectAuthUserAll()", "method": "com.muyu.web.controller.system.SysRoleController.selectAuthUserAll()",
"requestMethod": "PUT", "requestMethod": "PUT",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -325,7 +325,7 @@ export default {
"title": "参数管理", "title": "参数管理",
"businessType": 5, "businessType": 5,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysConfigController.export()", "method": "com.muyu.web.controller.system.SysConfigController.export()",
"requestMethod": "POST", "requestMethod": "POST",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -349,7 +349,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 3, "businessType": 3,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()", "method": "com.muyu.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE", "requestMethod": "DELETE",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -373,7 +373,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 3, "businessType": 3,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()", "method": "com.muyu.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE", "requestMethod": "DELETE",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -397,7 +397,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 3, "businessType": 3,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()", "method": "com.muyu.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE", "requestMethod": "DELETE",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -421,7 +421,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 3, "businessType": 3,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.remove()", "method": "com.muyu.web.controller.system.SysMenuController.remove()",
"requestMethod": "DELETE", "requestMethod": "DELETE",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -445,7 +445,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 1, "businessType": 1,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.add()", "method": "com.muyu.web.controller.system.SysMenuController.add()",
"requestMethod": "POST", "requestMethod": "POST",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -469,7 +469,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 1, "businessType": 1,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.add()", "method": "com.muyu.web.controller.system.SysMenuController.add()",
"requestMethod": "POST", "requestMethod": "POST",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",
@ -493,7 +493,7 @@ export default {
"title": "菜单管理", "title": "菜单管理",
"businessType": 2, "businessType": 2,
"businessTypes": null, "businessTypes": null,
"method": "com.ruiteng.web.controller.system.SysMenuController.edit()", "method": "com.muyu.web.controller.system.SysMenuController.edit()",
"requestMethod": "PUT", "requestMethod": "PUT",
"operatorType": 1, "operatorType": 1,
"operName": "admin", "operName": "admin",

2
src/views/system/role/selectUser.vue
View File

@ -118,7 +118,7 @@ export default {
"userId": 1, "userId": 1,
"deptId": 103, "deptId": 103,
"userName": "admin", "userName": "admin",
"nickName": "锐腾", "nickName": "muyu牧鱼",
"email": "muyu@163.com", "email": "muyu@163.com",
"phonenumber": "15888888888", "phonenumber": "15888888888",
"sex": null, "sex": null,