diff --git a/admin/src/components/UserDetailDialog.vue b/admin/src/components/UserDetailDialog.vue index 78bea9d..f62979d 100644 --- a/admin/src/components/UserDetailDialog.vue +++ b/admin/src/components/UserDetailDialog.vue @@ -153,7 +153,7 @@ diff --git a/admin/src/layouts/SuperAdminLayout.vue b/admin/src/layouts/SuperAdminLayout.vue index 2c9bcbb..8062f6c 100644 --- a/admin/src/layouts/SuperAdminLayout.vue +++ b/admin/src/layouts/SuperAdminLayout.vue @@ -71,18 +71,6 @@
-
-
- - 核心职责：配置与监督各企业使用的 - 普通管理后台 - （用户运营、订单、分销等由企业管理员在日常后台完成）。 - - - 进入管理后台 - -
-
@@ -358,30 +346,4 @@ const handleLogout = async () => { padding-left: 240px; } } - -.mission-strip { - background: linear-gradient(90deg, #fef2f2 0%, #fff7ed 100%); - border-bottom: 1px solid #fecaca; -} - -.mission-inner { - max-width: 1400px; - margin: 0 auto; - padding: 10px 24px; - display: flex; - flex-wrap: wrap; - align-items: center; - justify-content: space-between; - gap: 12px; -} - -.mission-text { - font-size: 13px; - color: #44403c; - line-height: 1.5; - - strong { - color: #991b1b; - } -} diff --git a/admin/src/utils/faceResultDetail.ts b/admin/src/utils/faceResultDetail.ts index 837537a..190ae9a 100644 --- a/admin/src/utils/faceResultDetail.ts +++ b/admin/src/utils/faceResultDetail.ts @@ -40,6 +40,73 @@ export interface FaceDetailView { careers: string[] } +function collectPhotoUrls(parsed: Record): string[] { + const out: string[] = [] + const pushUrl = (s: string) => { + const t = s.trim() + if (t && (t.startsWith('http://') || t.startsWith('https://'))) out.push(t) + } + const pushArr = (v: unknown) => { + if (!Array.isArray(v)) return + for (const x of v) { + if (typeof x === 'string') pushUrl(x) + } + } + pushArr(parsed.photoUrls) + pushArr(parsed.photos) + pushArr(parsed.imageUrls) + for (const k of ['photoUrl', 'imageUrl', 'faceImageUrl'] as const) { + const u = parsed[k] + if (typeof u === 'string') pushUrl(u) + } + return [...new Set(out)] +} + +function isPlaceholderTitle(s: string): boolean { + return !s || s === '—' || s === '-' || s === '–' || s === '--' +} + +function normalizeMbtiBlock(parsed: Record): { type?: string; title?: string } | null { + const m = parsed.mbti + if (m && typeof m === 'object' && !Array.isArray(m)) { + const o = m as { type?: string; title?: string } + const type = o.type != null ? String(o.type).trim() : '' + let title = o.title != null ? String(o.title).trim() : '' + if (isPlaceholderTitle(title)) title = '' + if (!type) return null + return title ? { type, title } : { type } + } + const typeOnly = + (typeof m === 'string' && m.trim() ? m.trim() : '') || + String(parsed.mbtiType ?? parsed.mbti_type ?? '').trim() + if (!typeOnly) return null + let titleRaw = String(parsed.mbtiTitle ?? parsed.title ?? '').trim() + if (isPlaceholderTitle(titleRaw)) titleRaw = '' + return titleRaw ? { type: typeOnly, title: titleRaw } : { type: typeOnly } +} + +function normalizeDiscBlock(parsed: Record): { primary?: string; secondary?: string } | null { + const d = parsed.disc + if (d && typeof d === 'object' && !Array.isArray(d)) { + return d as { primary?: string; secondary?: string } + } + if (typeof d === 'string' && d.trim()) { + return { primary: d.trim() } + } + return null +} + +function normalizePdpBlock(parsed: Record): { primary?: string; secondary?: string } | null { + const p = parsed.pdp + if (p && typeof p === 'object' && !Array.isArray(p)) { + return p as { primary?: string; secondary?: string } + } + if (typeof p === 'string' && p.trim()) { + return { primary: p.trim() } + } + return null +} + function parseMaybeJsonObject(raw: unknown): Record | null { if (raw && typeof raw === 'object' && !Array.isArray(raw)) { return raw as Record @@ -113,10 +180,10 @@ export function buildFaceDetailFromParsed(parsed: Record | null | u Array.isArray(v) ? (v as unknown[]).map((x) => String(x)).filter(Boolean) : [] return { - photos: Array.isArray(parsed.photoUrls) ? (parsed.photoUrls as string[]) : [], - mbti: parsed.mbti && typeof parsed.mbti === 'object' ? parsed.mbti : null, - disc: parsed.disc && typeof parsed.disc === 'object' ? parsed.disc : null, - pdp: parsed.pdp && typeof parsed.pdp === 'object' ? parsed.pdp : null, + photos: collectPhotoUrls(parsed), + mbti: normalizeMbtiBlock(parsed), + disc: normalizeDiscBlock(parsed), + pdp: normalizePdpBlock(parsed), overview: String(parsed.overview ?? ''), personalitySummary: String(parsed.personalitySummary ?? ''), faceAnalysisText, diff --git a/admin/src/utils/testResultParse.ts b/admin/src/utils/testResultParse.ts new file mode 100644 index 0000000..a7d3f52 --- /dev/null +++ b/admin/src/utils/testResultParse.ts @@ -0,0 +1,17 @@ +/** + * 统一解析 test_results 单条的 result / resultData（字符串 JSON 或已解析对象） + */ +export function parseTestResultPayload(raw: unknown): Record | null { + if (raw == null || raw === '') return null + if (typeof raw === 'object' && !Array.isArray(raw)) { + return raw as Record + } + if (typeof raw !== 'string') return null + try { + const data = JSON.parse(raw) as unknown + if (!data || typeof data !== 'object' || Array.isArray(data)) return null + return data as Record + } catch { + return null + } +} diff --git a/admin/src/views/admin/Dashboard.vue b/admin/src/views/admin/Dashboard.vue index 34c6b7e..a36094b 100644 --- a/admin/src/views/admin/Dashboard.vue +++ b/admin/src/views/admin/Dashboard.vue @@ -15,6 +15,18 @@ +
+
+
企业余额
+ + + 企业充值 + +
+
+ +
+
@@ -75,19 +87,19 @@
-

测试 Top 10

+

测试 Top 20

按完成次数 · 本企业口径

全部用户
-
+
@@ -134,7 +146,7 @@