diff --git a/dbswitch-admin-ui/src/views/dashboard/index.vue b/dbswitch-admin-ui/src/views/dashboard/index.vue
index d9b8e3f2..38647dd0 100644
--- a/dbswitch-admin-ui/src/views/dashboard/index.vue
+++ b/dbswitch-admin-ui/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
:startVal="startVal"
:endVal="statistics.connectionStatistics.totalCount"
:duration="2000">
-
数据库连接数
+ 数据源连接数
@@ -22,7 +22,7 @@
:startVal="startVal"
:endVal="statistics.assignmentTaskStatistics.totalCount"
:duration="2000">
-
任务安排数
+
任务总数
@@ -57,6 +57,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ min-width="6%">
+ min-width="10%">
+
+
+
+ label="开始调度时间"
+ min-width="12%">
+ min-width="40%">
+ 调度日志
发布
+ round>启动
下线
+ round>停止
执行
+ round>手工调度
详情
修改
queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(AssignmentJobEntity::getStatus, status);
return assignmentJobMapper.selectCount(queryWrapper).intValue();
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/OverviewStatisticsResponse.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/OverviewStatisticsResponse.java
index 43802020..1f9d2879 100644
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/OverviewStatisticsResponse.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/response/OverviewStatisticsResponse.java
@@ -60,6 +60,9 @@ public class OverviewStatisticsResponse {
@ApiModelProperty("执行中的Job总数")
private Integer runningCount;
+ @ApiModelProperty("取消的Job总数")
+ private Integer cancelCount;
+
@ApiModelProperty("已经成功的总数")
private Integer successfulCount;
diff --git a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/OverviewService.java b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/OverviewService.java
index baec1837..603ee29a 100644
--- a/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/OverviewService.java
+++ b/dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/service/OverviewService.java
@@ -51,11 +51,11 @@ public class OverviewService {
AssignmentJobStatistics assignmentJobStatistics = new AssignmentJobStatistics();
assignmentJobStatistics.setTotalCount(assignmentJobDAO.getTotalCount());
assignmentJobStatistics
- .setRunningCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.RUNNING));
+ .setRunningCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.RUNNING.getValue()));
assignmentJobStatistics
- .setSuccessfulCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.PASS));
- assignmentJobStatistics.setFailedCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.FAIL));
-
+ .setSuccessfulCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.PASS.getValue()));
+ assignmentJobStatistics.setFailedCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.FAIL.getValue()));
+ assignmentJobStatistics.setCancelCount(assignmentJobDAO.getCountByStatus(JobStatusEnum.CANCEL.getValue()));
response.setAssignmentJobStatistics(assignmentJobStatistics);
return response;