diff --git a/nkebao/package.json b/nkebao/package.json index 88746967..e2f14498 100644 --- a/nkebao/package.json +++ b/nkebao/package.json @@ -1,5 +1,6 @@ { "name": "nkebao-base", + "license": "MIT", "version": "0.1.0", "private": true, "dependencies": { diff --git a/nkebao/src/pages/scenarios/plan/list/data.ts b/nkebao/src/pages/scenarios/plan/list/data.ts index 0f36a6c9..737793e9 100644 --- a/nkebao/src/pages/scenarios/plan/list/data.ts +++ b/nkebao/src/pages/scenarios/plan/list/data.ts @@ -13,6 +13,13 @@ export interface Task { acquired?: number; added?: number; }; + reqConf?: { + device?: string[]; + selectedDevices?: string[]; + }; + acquiredCount?: number; + addedCount?: number; + passRate?: number; } export interface ApiSettings { diff --git a/nkebao/src/pages/scenarios/plan/list/index.module.scss b/nkebao/src/pages/scenarios/plan/list/index.module.scss index 50366c87..6b75834e 100644 --- a/nkebao/src/pages/scenarios/plan/list/index.module.scss +++ b/nkebao/src/pages/scenarios/plan/list/index.module.scss @@ -1,7 +1,5 @@ .scenario-list-page { - padding: 16px; - background: #f5f5f5; - min-height: 100vh; + padding:0 16px; } .nav-title { @@ -33,8 +31,8 @@ .search-bar { display: flex; gap: 12px; - margin-bottom: 16px; align-items: center; + padding: 16px; } .search-input-wrapper { diff --git a/nkebao/src/pages/scenarios/plan/list/index.tsx b/nkebao/src/pages/scenarios/plan/list/index.tsx index 9ec0f8df..18d18b5f 100644 --- a/nkebao/src/pages/scenarios/plan/list/index.tsx +++ b/nkebao/src/pages/scenarios/plan/list/index.tsx @@ -347,68 +347,59 @@ const ScenarioList: React.FC = () => { }, ]; - if (loading) { - return ( - -
场景详情
- - } - footer={} - > -
- -
加载场景数据中...
-
-
- ); - } + const deviceCount = (task: Task) => { + return Array.isArray(task.reqConf?.device) + ? task.reqConf!.device.length + : Array.isArray(task.reqConf?.selectedDevices) + ? task.reqConf!.selectedDevices.length + : 0; + }; return ( {pageTitle}} - right={ + <> + {pageTitle}} + right={ + + } + /> + {/* 搜索栏 */} +
+
+ setSearchTerm(e.target.value)} + prefix={} + allowClear + size="large" + /> +
- } - /> +
+ } - footer={} + loading={loading} >
- {/* 搜索栏 */} -
-
- setSearchTerm(e.target.value)} - prefix={} - allowClear - size="middle" - /> -
- -
- {/* 计划列表 */}
{filteredTasks.length === 0 ? ( @@ -450,19 +441,19 @@ const ScenarioList: React.FC = () => {
设备数
- {task.stats?.devices || 0} + {deviceCount(task)}
已获客
- {task.stats?.acquired || 0} + {task?.acquiredCount || 0}
已添加
- {task.stats?.added || 0} + {task.addedCount || 0}
@@ -475,9 +466,7 @@ const ScenarioList: React.FC = () => {
- - 上次执行: {formatTime(task.updated_at || task.created_at)} - + 上次执行: {task.lastUpdated || "--"}