From 818cc1d6fbb4b51f9f65d2e802e6782e90efc424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 10 Oct 2021 21:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E5=88=86?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/System/TasksController.cs | 15 +++++------
ZR.Vue/src/views/monitor/job/index.vue | 17 ++++++------
ZR.Vue/src/views/monitor/operlog/index.vue | 26 +++++++++----------
3 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
index 0968dfb..8b8cf2d 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
@@ -40,7 +40,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("list")]
- [ActionPermissionFilter(Permission = "system:task:list")]
+ [ActionPermissionFilter(Permission = "monitor:job:list")]
public IActionResult Query([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
{
//开始拼装查询条件
@@ -71,13 +71,12 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(_tasksQzService.GetAll());
}
-
///
/// 添加任务
///
///
[HttpPost("create")]
- [ActionPermissionFilter(Permission = "system:task:add")]
+ [ActionPermissionFilter(Permission = "monitor:job:add")]
[Log(Title = "添加任务", BusinessType = BusinessType.INSERT)]
public IActionResult Create([FromBody] TasksCreateDto parm)
{
@@ -104,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpPost("update")]
- [ActionPermissionFilter(Permission = "system:task:edit")]
+ [ActionPermissionFilter(Permission = "monitor:job:edit")]
[Log(Title = "修改任务", BusinessType = BusinessType.UPDATE)]
public async Task Update([FromBody] TasksUpdateDto parm)
{
@@ -156,7 +155,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpDelete("delete")]
- [ActionPermissionFilter(Permission = "system:task:delete")]
+ [ActionPermissionFilter(Permission = "monitor:job:delete")]
[Log(Title = "删除任务", BusinessType = BusinessType.DELETE)]
public async Task Delete(string id)
{
@@ -185,7 +184,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("start")]
- [ActionPermissionFilter(Permission = "system:task:start")]
+ [ActionPermissionFilter(Permission = "monitor:job:start")]
[Log(Title = "启动任务", BusinessType = BusinessType.OTHER)]
public async Task Start(string id)
{
@@ -216,7 +215,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("stop")]
- [ActionPermissionFilter(Permission = "system:task:stop")]
+ [ActionPermissionFilter(Permission = "monitor:job:stop")]
[Log(Title = "停止任务", BusinessType = BusinessType.OTHER)]
public async Task Stop(string id)
{
@@ -248,7 +247,7 @@ namespace ZR.Admin.WebApi.Controllers
///
///
[HttpGet("run")]
- [ActionPermissionFilter(Permission = "system:task:run")]
+ [ActionPermissionFilter(Permission = "monitor:job:run")]
[Log(Title = "执行任务", BusinessType = BusinessType.OTHER)]
public async Task Run(string id)
{
diff --git a/ZR.Vue/src/views/monitor/job/index.vue b/ZR.Vue/src/views/monitor/job/index.vue
index 39b168a..3893b40 100644
--- a/ZR.Vue/src/views/monitor/job/index.vue
+++ b/ZR.Vue/src/views/monitor/job/index.vue
@@ -15,13 +15,13 @@
- 新增
+ 新增
日志
@@ -36,7 +36,6 @@
-
@@ -50,12 +49,12 @@
日志
- 运行
- 停止
+ 运行
+ 停止
- 启动
- 编辑
- 删除
+ 启动
+ 编辑
+ 删除
diff --git a/ZR.Vue/src/views/monitor/operlog/index.vue b/ZR.Vue/src/views/monitor/operlog/index.vue
index 37a6f87..f9d03f8 100644
--- a/ZR.Vue/src/views/monitor/operlog/index.vue
+++ b/ZR.Vue/src/views/monitor/operlog/index.vue
@@ -119,7 +119,7 @@ import {
list,
delOperlog,
cleanOperlog,
- exportOperlog,
+ // exportOperlog,
} from "@/api/monitor/operlog";
import DateRangePicker from '@/components/DateRangePicker'
@@ -253,18 +253,18 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
- const queryParams = this.queryParams;
- this.$confirm("是否确认导出所有操作日志数据项?", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(function () {
- return exportOperlog(queryParams);
- })
- .then((response) => {
- this.download(response.msg);
- });
+ // const queryParams = this.queryParams;
+ // this.$confirm("是否确认导出所有操作日志数据项?", "警告", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(function () {
+ // return exportOperlog(queryParams);
+ // })
+ // .then((response) => {
+ // this.download(response.msg);
+ // });
},
},
};