wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改权限分配

Browse Source
This commit is contained in:
不做码农 2021-10-10 21:31:23 +08:00
parent 7271442f6b
commit 818cc1d6fb
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@ -40,7 +40,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
[ActionPermissionFilter(Permission = "system:task:list")] [ActionPermissionFilter(Permission = "monitor:job:list")]
public IActionResult Query([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager) public IActionResult Query([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
{ {
//开始拼装查询条件 //开始拼装查询条件
@ -71,13 +71,12 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(_tasksQzService.GetAll()); return SUCCESS(_tasksQzService.GetAll());
} }
/// <summary> /// <summary>
/// 添加任务 /// 添加任务
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("create")] [HttpPost("create")]
[ActionPermissionFilter(Permission = "system:task:add")] [ActionPermissionFilter(Permission = "monitor:job:add")]
[Log(Title = "添加任务", BusinessType = BusinessType.INSERT)] [Log(Title = "添加任务", BusinessType = BusinessType.INSERT)]
public IActionResult Create([FromBody] TasksCreateDto parm) public IActionResult Create([FromBody] TasksCreateDto parm)
{ {
@ -104,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost("update")] [HttpPost("update")]
[ActionPermissionFilter(Permission = "system:task:edit")] [ActionPermissionFilter(Permission = "monitor:job:edit")]
[Log(Title = "修改任务", BusinessType = BusinessType.UPDATE)] [Log(Title = "修改任务", BusinessType = BusinessType.UPDATE)]
public async Task<IActionResult> Update([FromBody] TasksUpdateDto parm) public async Task<IActionResult> Update([FromBody] TasksUpdateDto parm)
{ {
@ -156,7 +155,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpDelete("delete")] [HttpDelete("delete")]
[ActionPermissionFilter(Permission = "system:task:delete")] [ActionPermissionFilter(Permission = "monitor:job:delete")]
[Log(Title = "删除任务", BusinessType = BusinessType.DELETE)] [Log(Title = "删除任务", BusinessType = BusinessType.DELETE)]
public async Task<IActionResult> Delete(string id) public async Task<IActionResult> Delete(string id)
{ {
@ -185,7 +184,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("start")] [HttpGet("start")]
[ActionPermissionFilter(Permission = "system:task:start")] [ActionPermissionFilter(Permission = "monitor:job:start")]
[Log(Title = "启动任务", BusinessType = BusinessType.OTHER)] [Log(Title = "启动任务", BusinessType = BusinessType.OTHER)]
public async Task<IActionResult> Start(string id) public async Task<IActionResult> Start(string id)
{ {
@ -216,7 +215,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("stop")] [HttpGet("stop")]
[ActionPermissionFilter(Permission = "system:task:stop")] [ActionPermissionFilter(Permission = "monitor:job:stop")]
[Log(Title = "停止任务", BusinessType = BusinessType.OTHER)] [Log(Title = "停止任务", BusinessType = BusinessType.OTHER)]
public async Task<IActionResult> Stop(string id) public async Task<IActionResult> Stop(string id)
{ {
@ -248,7 +247,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("run")] [HttpGet("run")]
[ActionPermissionFilter(Permission = "system:task:run")] [ActionPermissionFilter(Permission = "monitor:job:run")]
[Log(Title = "执行任务", BusinessType = BusinessType.OTHER)] [Log(Title = "执行任务", BusinessType = BusinessType.OTHER)]
public async Task<IActionResult> Run(string id) public async Task<IActionResult> Run(string id)
{ {

17
ZR.Vue/src/views/monitor/job/index.vue
View File

@ -15,13 +15,13 @@
</el-row> </el-row>
<el-row class="mb8" :gutter="20"> <el-row class="mb8" :gutter="20">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:task:add']" plain type="primary" icon="el-icon-plus" size="mini" @click="handleCreate">新增</el-button> <el-button v-hasPermi="['monitor:job:add']" plain type="primary" icon="el-icon-plus" size="mini" @click="handleCreate">新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button v-hasPermi="['PRIV_TASKS_UPDATE']" plain type="success" icon="el-icon-edit" size="mini" @click="handleRun(null)" :disabled="single">运行一次</el-button> <el-button v-hasPermi="['monitor:job:edit']" plain type="success" icon="el-icon-edit" size="mini" @click="handleRun(null)" :disabled="single">运行一次</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:task:delete']" plain type="danger" icon="el-icon-remove" size="mini" @click="handleDelete(null)" :disabled="single">删除</el-button> <el-button v-hasPermi="['monitor:job:delete']" plain type="danger" icon="el-icon-remove" size="mini" @click="handleDelete(null)" :disabled="single">删除</el-button>
</el-col>--> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['monitor:job:query']" type="info" icon="el-icon-s-operation" size="mini" @click="handleJobLog({id: 1})">日志</el-button> <el-button v-hasPermi="['monitor:job:query']" type="info" icon="el-icon-s-operation" size="mini" @click="handleJobLog({id: 1})">日志</el-button>
@ -36,7 +36,6 @@
<el-table-column prop="jobGroup" :show-overflow-tooltip="true" align="center" label="任务分组" /> <el-table-column prop="jobGroup" :show-overflow-tooltip="true" align="center" label="任务分组" />
<el-table-column prop="assemblyName" align="center" label="程序集名称" :show-overflow-tooltip="true" /> <el-table-column prop="assemblyName" align="center" label="程序集名称" :show-overflow-tooltip="true" />
<el-table-column prop="className" align="center" label="任务类名" :show-overflow-tooltip="true" /> <el-table-column prop="className" align="center" label="任务类名" :show-overflow-tooltip="true" />
<!-- <el-table-column prop="runTimes" align="center" label="执行次数" width="120" /> -->
<el-table-column prop="cron" align="center" label="运行表达式" /> <el-table-column prop="cron" align="center" label="运行表达式" />
<el-table-column sortable prop="isStart" align="center" label="状态" width="90"> <el-table-column sortable prop="isStart" align="center" label="状态" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
@ -50,12 +49,12 @@
<router-link :to="{path: '/job/log', query: {jobId: scope.row.id}}">日志</router-link> <router-link :to="{path: '/job/log', query: {jobId: scope.row.id}}">日志</router-link>
</el-button> </el-button>
<el-button type="text" v-if="scope.row.isStart" v-hasPermi="['system:task:run']" size="mini" icon="el-icon-remove" title="运行" @click="handleRun(scope.row)">运行</el-button> <el-button type="text" v-if="scope.row.isStart" v-hasPermi="['monitor:job:run']" size="mini" icon="el-icon-remove" title="运行" @click="handleRun(scope.row)">运行</el-button>
<el-button type="text" v-if="scope.row.isStart" v-hasPermi="['system:task:stop']" size="mini" icon="el-icon-video-pause" style="color:red" title="停止" @click="handleStop(scope.row)">停止</el-button> <el-button type="text" v-if="scope.row.isStart" v-hasPermi="['monitor:job:stop']" size="mini" icon="el-icon-video-pause" style="color:red" title="停止" @click="handleStop(scope.row)">停止</el-button>
<el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['system:task:start']" size="mini" icon="el-icon-video-play" title="启动" @click="handleStart(scope.row)">启动</el-button> <el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['monitor:job:start']" size="mini" icon="el-icon-video-play" title="启动" @click="handleStart(scope.row)">启动</el-button>
<el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['system:task:edit']" size="mini" icon="el-icon-edit" style="color:gray" title="编辑" @click="handleUpdate(scope.row)">编辑</el-button> <el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['monitor:job:edit']" size="mini" icon="el-icon-edit" style="color:gray" title="编辑" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['system:task:delete']" size="mini" icon="el-icon-delete" style="color:red" title="删除" @click="handleDelete(scope.row)">删除</el-button> <el-button type="text" v-if="!scope.row.isStart" v-hasPermi="['monitor:job:delete']" size="mini" icon="el-icon-delete" style="color:red" title="删除" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

26
ZR.Vue/src/views/monitor/operlog/index.vue
View File

@ -119,7 +119,7 @@ import {
list, list,
delOperlog, delOperlog,
cleanOperlog, cleanOperlog,
exportOperlog, // exportOperlog,
} from "@/api/monitor/operlog"; } from "@/api/monitor/operlog";
import DateRangePicker from '@/components/DateRangePicker' import DateRangePicker from '@/components/DateRangePicker'
@ -253,18 +253,18 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
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 exportOperlog(queryParams); // return exportOperlog(queryParams);
}) // })
.then((response) => { // .then((response) => {
this.download(response.msg); // this.download(response.msg);
}); // });
}, },
}, },
}; };