- |
+ |
|
diff --git a/internal/web/ui/templates/task.html b/internal/web/ui/templates/task.html
index 8183729..5b9d985 100644
--- a/internal/web/ui/templates/task.html
+++ b/internal/web/ui/templates/task.html
@@ -1,18 +1,20 @@
{{define "task"}}
- 任务执行详情
-
-
- 任务标识
- {{.Task.ID}}
+ 任务详情
+
+
-
- 操作
-
+
+ 操作类型
+
{{if eq .Task.Type "config_apply"}}下发识别配置
{{else if eq .Task.Type "reload"}}重载识别服务
{{else if eq .Task.Type "rollback"}}回滚识别配置
@@ -22,9 +24,13 @@
{{else}}{{.Task.Type}}{{end}}
-
- 状态
-
+
+ 设备数量
+ {{len .Task.DeviceIDs}}
+
+
+ 当前状态
+
{{if eq .Task.Status "success"}}成功
{{else if eq .Task.Status "failed"}}失败
{{else if eq .Task.Status "running"}}执行中
@@ -35,24 +41,35 @@
- 节点执行情况
+ 设备结果表
- | 节点标识 | 状态 | 进度 | 失败原因 |
|---|
+ | 设备 | 状态 | 进度 | 失败原因 |
|---|
- {{range $id, $st := .Task.Devices}}
-
- | {{$id}} |
+ {{range .TaskDeviceRows}}
+
+
+
+ {{icon "device"}}
+
+ {{if .Device.DeviceName}}{{.Device.DeviceName}}{{else}}{{.Device.DeviceID}}{{end}}
+
+ {{.Device.DeviceID}}
+ {{if .Device.IP}}{{.Device.IP}}{{end}}
+
+
+ |
- {{if eq $st.Status "success"}}成功
- {{else if eq $st.Status "failed"}}失败
- {{else if eq $st.Status "running"}}执行中
+ {{if eq .Status "success"}}成功
+ {{else if eq .Status "failed"}}失败
+ {{else if eq .Status "running"}}执行中
{{else}}待执行{{end}}
|
- {{$st.Progress}} |
- {{$st.Error}} |
+ {{.Progress}} |
+ {{.Error}} |
{{end}}
@@ -62,8 +79,8 @@
实时进度
- 任务执行过程中会持续推送每台节点的状态变化。
-
+ 任务执行过程中会持续推送每台设备的状态变化。
+
未连接
@@ -73,12 +90,38 @@
{{end}}
diff --git a/internal/web/ui_test.go b/internal/web/ui_test.go
index 84b1b19..ace2e89 100644
--- a/internal/web/ui_test.go
+++ b/internal/web/ui_test.go
@@ -50,6 +50,61 @@ func TestUI_ActionDevicesBatchAction_RedirectsToTask(t *testing.T) {
}
}
+func TestUI_ActionDevicesBatchActionDeduplicatesKnownDevices(t *testing.T) {
+ ui := newTestUI(t)
+ ui.registry.UpdateDevice(&models.Device{DeviceID: "edge-02", DeviceName: "辅助节点", IP: "127.0.0.2", AgentPort: 9100, MediaPort: 9000, Online: true})
+
+ form := url.Values{}
+ form.Set("action", "reload")
+ form.Add("device_id", "edge-01")
+ form.Add("device_id", "edge-01")
+ form.Add("device_id", "edge-02")
+ form.Add("device_id", "missing")
+ req := httptest.NewRequest(http.MethodPost, "/ui/devices/batch-action", strings.NewReader(form.Encode()))
+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+ rr := httptest.NewRecorder()
+
+ ui.actionDevicesBatchAction(rr, req)
+ if rr.Code != http.StatusFound {
+ t.Fatalf("expected redirect, got %d: %s", rr.Code, rr.Body.String())
+ }
+
+ loc := rr.Header().Get("Location")
+ if !strings.HasPrefix(loc, "/ui/tasks/") {
+ t.Fatalf("expected redirect to task page, got %q", loc)
+ }
+
+ taskID := strings.TrimPrefix(loc, "/ui/tasks/")
+ items := ui.tasks.ListTasks()
+ var task *models.Task
+ for i := range items {
+ if items[i].ID == taskID {
+ t := items[i]
+ task = &t
+ break
+ }
+ }
+ if task == nil {
+ t.Fatalf("expected task %s to exist", taskID)
+ }
+ if got := len(task.DeviceIDs); got != 2 {
+ t.Fatalf("expected deduplicated device count 2, got %d: %#v", got, task.DeviceIDs)
+ }
+ if task.DeviceIDs[0] != "edge-01" || task.DeviceIDs[1] != "edge-02" {
+ t.Fatalf("expected selection order preserved, got %#v", task.DeviceIDs)
+ }
+}
+
+func TestUI_SelectedDeviceQueryHelpersStayStable(t *testing.T) {
+ ids := selectedIDsFromQuery([]string{" edge-02 ", "edge-01", "edge-02", ""})
+ if len(ids) != 2 || ids[0] != "edge-02" || ids[1] != "edge-01" {
+ t.Fatalf("selectedIDsFromQuery normalized to %#v", ids)
+ }
+ if got := selectedQueryString(ids); got != "selected=edge-02&selected=edge-01" {
+ t.Fatalf("selectedQueryString returned %q", got)
+ }
+}
+
func TestUI_DevicePageUsesEdgeVisionConsoleShell(t *testing.T) {
cfg := &config.Config{Concurrency: 1, OfflineAfterMs: 1000000}
reg := service.NewRegistryService(cfg, nil)
@@ -172,13 +227,56 @@ func TestUI_ActionDevicesBatchActionKeepsDevicesOnError(t *testing.T) {
t.Fatalf("expected 200, got %d: %s", rr.Code, rr.Body.String())
}
body := rr.Body.String()
- for _, want := range []string{"不支持的操作: nope", "入口识别节点", "辅助节点", "已选 2 台"} {
+ for _, want := range []string{"不支持的操作: nope", "入口识别节点", "辅助节点", "已选 2 台", `value="edge-01" checked`, `value="edge-02" checked`} {
if !strings.Contains(body, want) {
t.Fatalf("expected error render to contain %q, got:\n%s", want, body)
}
}
}
+func TestUI_TaskPageRendersBatchSummaryAndDeviceResults(t *testing.T) {
+ ui := newTestUI(t)
+ ui.registry.UpdateDevice(&models.Device{DeviceID: "edge-02", DeviceName: "辅助节点", IP: "127.0.0.2", AgentPort: 9100, MediaPort: 9000, Online: true})
+
+ form := url.Values{}
+ form.Set("action", "reload")
+ form.Add("device_id", "edge-01")
+ form.Add("device_id", "edge-02")
+ req := httptest.NewRequest(http.MethodPost, "/ui/devices/batch-action", strings.NewReader(form.Encode()))
+ req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+ rr := httptest.NewRecorder()
+
+ ui.actionDevicesBatchAction(rr, req)
+ if rr.Code != http.StatusFound {
+ t.Fatalf("expected redirect, got %d: %s", rr.Code, rr.Body.String())
+ }
+
+ loc := rr.Header().Get("Location")
+ if !strings.HasPrefix(loc, "/ui/tasks/") {
+ t.Fatalf("expected redirect to task page, got %q", loc)
+ }
+
+ rrTask := httptest.NewRecorder()
+ reqTask := httptest.NewRequest(http.MethodGet, loc, nil)
+ rctx := chi.NewRouteContext()
+ rctx.URLParams.Add("id", strings.TrimPrefix(loc, "/ui/tasks/"))
+ reqTask = reqTask.WithContext(context.WithValue(reqTask.Context(), chi.RouteCtxKey, rctx))
+ ui.pageTask(rrTask, reqTask)
+
+ if rrTask.Code != http.StatusOK {
+ t.Fatalf("expected task page 200, got %d: %s", rrTask.Code, rrTask.Body.String())
+ }
+ body := rrTask.Body.String()
+ for _, want := range []string{"任务详情", "返回操作审计", "设备结果表", "设备数量", "入口识别节点", "辅助节点", "edge-01", "edge-02", `id="task-status-value"`, "syncTaskStatus()"} {
+ if !strings.Contains(body, want) {
+ t.Fatalf("expected task page to contain %q, got:\n%s", want, body)
+ }
+ }
+ if strings.Index(body, "edge-01") > strings.Index(body, "edge-02") {
+ t.Fatalf("expected task devices to keep selection order, got:\n%s", body)
+ }
+}
+
func TestUI_DeviceOverviewRendersFleetOverview(t *testing.T) {
ui := newTestUI(t)
req := httptest.NewRequest(http.MethodGet, "/ui/devices", nil)
|