Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit 6aa82f7

Browse files
stedensteden
committed
更新fss接口
1 parent 694fe45 commit 6aa82f7

File tree

8 files changed

+73
-263
lines changed

8 files changed

+73
-263
lines changed

‎01_UserInterface（前端界面）/FOPS.Blazor/Pages/fss/tasks/AllList.razor‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<div class="layui-card">
1515
<div class="layui-card-header" id="anchor-play-header">
16-
全部任务列表
16+
当前任务
1717
<select style="display:inline;width: 200px;" @onchange="StatusChange">
1818
<option value="">全部</option>
1919
@foreach (var taskType in typeof(EumTaskType).ToList())
@@ -72,6 +72,11 @@
7272
<span>创建时间</span>
7373
</div>
7474
</th>
75+
<th data-field="Type">
76+
<div class="layui-table-cell laytable-cell-task-9">
77+
<span>操作</span>
78+
</div>
79+
</th>
7580
</tr>
7681
</thead>
7782
</table>
@@ -96,11 +101,11 @@
96101
@{
97102
if (info.Status == EumTaskType.Working)
98103
{
99-
@info.RunAt.ToString("yyyy-MM-dd HH:mm:ss")
104+
<strong class='layui-badge layui-bg-green'>@($"用时 {(DateTime.Now - info.RunAt).GetDateDesc()}")</strong>
100105
}
101106
else if ((DateTime.Now - info.StartAt).TotalSeconds > 1)
102107
{
103-
<strong class='layui-badge layui-bg-red'>@($"超时 {(DateTime.Now - info.StartAt).GetDateDesc()}")</strong>
108+
<strong class='layui-badge'>@($"超时 {(DateTime.Now - info.StartAt).GetDateDesc()}")</strong>
104109
}
105110
else
106111
{
@@ -146,6 +151,16 @@
146151
<td>
147152
<div class="layui-table-cell laytable-cell-task-8">@info.CreateAt.ToString("yyyy-MM-dd HH:mm:ss")</div>
148153
</td>
154+
<td data-field="Title">
155+
<div class="layui-table-cell laytable-cell-task-9">
156+
@if (info.Status is EumTaskType.Scheduler or EumTaskType.Working)
157+
{
158+
<button class="layui-btn layui-btn-radius layui-btn-xs" @onclick="() => Cancel(info)">
159+
<i class="layui-icon"></i>
160+
</button>
161+
}
162+
</div>
163+
</td>
149164
</tr>
150165
}
151166
</tbody>
@@ -165,6 +180,7 @@
165180
.laytable-cell-task-6 {width: 80px;}
166181
.laytable-cell-task-7 {width: 180px;}
167182
.laytable-cell-task-8 {width: 150px;}
183+
.laytable-cell-task-9 {width: 80px;}
168184
</style>
169185

170186
@code{
@@ -193,7 +209,7 @@
193209
{
194210
if (firstRender)
195211
{
196-
_timer = new Timer(5000);
212+
_timer = new Timer(1000);
197213
_timer.Elapsed += async (_, _) =>
198214
{
199215
try
@@ -213,7 +229,7 @@
213229

214230
private async Task GetList()
215231
{
216-
var page = await _iocManager.Resolve<IFssApi>().GetAllTaskListAsync(storage, _taskType, _pageSize, PageIndex);
232+
var page = await _iocManager.Resolve<IFssApi>().GetEnableTaskListAsync(storage, _taskType, _pageSize, PageIndex);
217233
_lst = page.List;
218234
_totalCount = page.TotalCount;
219235
}
@@ -230,6 +246,11 @@
230246
return GetList();
231247
}
232248

249+
private async Task Cancel(TaskVO info)
250+
{
251+
await _iocManager.Resolve<IFssApi>().CancelTask(storage, info.TaskGroupId);
252+
}
253+
233254
public void Dispose()
234255
{
235256
_timer?.Dispose();

01_UserInterface（前端界面）/FOPS.Blazor/Pages/fss/tasks/FailList.razor renamed to 01_UserInterface（前端界面）/FOPS.Blazor/Pages/fss/tasks/FinishList.razor

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@page "/fss/tasks/faillist/{pageIndex:int}"
2-
@page "/fss/tasks/faillist"
1+
@page "/fss/tasks/finishlist/{pageIndex:int}"
2+
@page "/fss/tasks/finishlist"
33
@using FOPS.Abstract.Fss.Server
44
@using FOPS.Abstract.Fss.Entity
55
@using FOPS.Abstract.Fss.Enum
@@ -13,7 +13,7 @@
1313

1414
<div class="layui-card">
1515
<div class="layui-card-header" id="anchor-play-header">
16-
任务执行失败列表
16+
完成的任务
1717
<div class="layui-right">
1818
<button class="layui-btn layui-btn-right" @onclick=GotoList><i class="am-icon-plus"></i>任务组列表</button>
1919
</div>
@@ -133,7 +133,7 @@
133133
</table>
134134
</div>
135135
</div>
136-
<PageSplit PageIndex="@PageIndex" PageSize="@_pageSize" TotalCount="@_totalCount" PageUrl="/fss/tasks/faillist/{index}"></PageSplit>
136+
<PageSplit PageIndex="@PageIndex" PageSize="@_pageSize" TotalCount="@_totalCount" PageUrl="/fss/tasks/finishlist/{index}"></PageSplit>
137137
</div>
138138
</div>
139139
</div>
@@ -166,7 +166,7 @@
166166
if (PageIndex < 1) PageIndex = 1;
167167
_lastIndex = PageIndex;
168168

169-
var page = await _iocManager.Resolve<IFssApi>().GetTaskFailListAsync(storage,_pageSize, PageIndex);
169+
var page = await _iocManager.Resolve<IFssApi>().GetTaskFinishListAsync(storage,_pageSize, PageIndex);
170170
_lst = page?.List;
171171
_totalCount = page.TotalCount;
172172
}
@@ -175,12 +175,12 @@
175175
{
176176
if (firstRender)
177177
{
178-
_timer = new Timer(5000);
178+
_timer = new Timer(1000);
179179
_timer.Elapsed += async (_, _) =>
180180
{
181181
try
182182
{
183-
var page = await _iocManager.Resolve<IFssApi>().GetTaskFailListAsync(storage,_pageSize, PageIndex);
183+
var page = await _iocManager.Resolve<IFssApi>().GetTaskFinishListAsync(storage,_pageSize, PageIndex);
184184
_lst = page?.List;
185185
_totalCount = page.TotalCount;
186186
// 刷新页面

‎01_UserInterface（前端界面）/FOPS.Blazor/Pages/fss/tasks/List.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
</td>
144144
<td data-field="Title">
145145
<div class="layui-table-cell laytable-cell-task-9">
146-
@if (info.Status is EumTaskType.None or EumTaskType.Scheduler or EumTaskType.Working)
146+
@if (info.Status is EumTaskType.Scheduler or EumTaskType.Working)
147147
{
148148
<button class="layui-btn layui-btn-radius layui-btn-xs" @onclick="() => Cancel(info)">
149149
<i class="layui-icon"></i>

‎01_UserInterface（前端界面）/FOPS.Blazor/Pages/fss/tasks/UnRunList.razor‎

Lines changed: 0 additions & 214 deletions
This file was deleted.

‎01_UserInterface（前端界面）/FOPS.Blazor/Shared/LeftMenu.razor‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,12 @@
4848
</dd>
4949
<dd data-name="grid">
5050
<NavLink class="nav-link" href="/fss/tasks/alllist" Match="NavLinkMatch.All">
51-
所有任务
51+
当前任务
5252
</NavLink>
5353
</dd>
5454
<dd data-name="grid">
55-
<NavLink class="nav-link" href="/fss/tasks/faillist" Match="NavLinkMatch.All">
56-
失败任务
57-
</NavLink>
58-
</dd>
59-
<dd data-name="grid">
60-
<NavLink class="nav-link" href="/fss/tasks/unrunlist" Match="NavLinkMatch.All">
61-
未执行任务
55+
<NavLink class="nav-link" href="/fss/tasks/finishlist" Match="NavLinkMatch.All">
56+
完成的任务
6257
</NavLink>
6358
</dd>
6459
<dd data-name="form">

0 commit comments

Comments
 (0)