修复:查询局部刷新与智能分析会话交互,完善分析收尾和配置切换
This commit is contained in:
@@ -26,11 +26,13 @@ import {
|
||||
SettingOutlined,
|
||||
TeamOutlined,
|
||||
ToolOutlined,
|
||||
UserOutlined,
|
||||
} from '@ant-design/icons';
|
||||
import { ApiError, api } from './api';
|
||||
import type { AuthUser, QueryParams } from './types';
|
||||
import { workspaceThemes, type WorkspaceThemeId } from './ui-themes';
|
||||
import { readableSelectPopup } from './readableSelectPopup';
|
||||
import PersonalAccount, { type AccountTab } from './PersonalAccount';
|
||||
|
||||
const QueryPage = lazy(() => import('./QueryPage'));
|
||||
const ManagementPages = lazy(() => import('./ManagementPages'));
|
||||
@@ -112,6 +114,7 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
const [user, setUser] = useState<AuthUser | null>(null);
|
||||
const [sessionLoading, setSessionLoading] = useState(true);
|
||||
const [sessionError, setSessionError] = useState('');
|
||||
const [accountTab, setAccountTab] = useState<AccountTab | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const syncFromLocation = () => {
|
||||
@@ -173,7 +176,12 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
return false;
|
||||
}, []);
|
||||
|
||||
if (sessionLoading) return <div className="screen-state"><Spin indicator={<LoadingOutlined spin />} /> <span>正在连接质量中心…</span></div>;
|
||||
const logout = async () => {
|
||||
try { await api.logout(); setAccountTab(null); setUser(null); }
|
||||
catch (error) { if (!handleUnauthorized(error)) message.error(error instanceof Error ? error.message : '退出失败'); }
|
||||
};
|
||||
|
||||
if (sessionLoading) return <div className="screen-state"><Spin indicator={<LoadingOutlined spin />} /> <span>正在连接质量数据分析平台…</span></div>;
|
||||
if (sessionError) return <div className="screen-state"><div className="state-card"><strong>服务暂不可用</strong><p>{sessionError}</p><Button onClick={() => window.location.reload()}>重新连接</Button></div></div>;
|
||||
if (!user) return <LoginPage onSuccess={setUser} />;
|
||||
|
||||
@@ -182,9 +190,9 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
<aside className="sidebar">
|
||||
<button className="brand" onClick={() => navigate('overall')} aria-label="回到总体汇总">
|
||||
<span className="brand-mark" aria-hidden="true"><i /><i /><i /></span>
|
||||
<span>质量中心</span>
|
||||
<span>质量数据分析平台</span>
|
||||
</button>
|
||||
<div className="workspace-caption">质量中心 · 分析工作台</div>
|
||||
<div className="workspace-caption">分析工作台</div>
|
||||
<nav className="side-navigation" aria-label="主导航">
|
||||
{navGroups.map(group => (
|
||||
<div className="nav-group" key={group.label}>
|
||||
@@ -204,12 +212,11 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
))}
|
||||
</nav>
|
||||
<div className="user-block">
|
||||
<span className="avatar">{(user.displayName || user.username).slice(0, 1)}</span>
|
||||
<span className="user-copy"><strong>{user.displayName || user.username}</strong><small>{user.departments.length ? user.departments.map(shownDepartment).join('、') : '质量中心'}</small></span>
|
||||
<Tooltip title="退出登录"><Button type="text" icon={<LogoutOutlined />} aria-label="退出登录" onClick={async () => {
|
||||
try { await api.logout(); setUser(null); }
|
||||
catch (error) { if (!handleUnauthorized(error)) message.error(error instanceof Error ? error.message : '退出失败'); }
|
||||
}} /></Tooltip>
|
||||
<button type="button" className="user-profile-trigger" aria-label="打开个人账户" onClick={() => setAccountTab('profile')}>
|
||||
<span className="avatar">{(user.displayName || user.username).slice(0, 1)}</span>
|
||||
<span className="user-copy"><strong>{user.displayName || user.username}</strong><small>{user.departments.map(shownDepartment).join('、') || '个人账户'}</small></span>
|
||||
</button>
|
||||
<Tooltip title="退出登录"><Button type="text" icon={<LogoutOutlined />} aria-label="退出登录" onClick={() => void logout()} /></Tooltip>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
@@ -233,18 +240,23 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
<BgColorsOutlined /><span>{appearance.name}</span><DownOutlined />
|
||||
</Button>
|
||||
</Dropdown>
|
||||
<span className="top-organization"><TeamOutlined />质量中心</span>
|
||||
{user.departments.length > 0 && <span className="top-organization"><TeamOutlined />{user.departments.map(shownDepartment).join('、')}</span>}
|
||||
<Dropdown trigger={['click']} menu={{ items: [
|
||||
{ key: 'profile', icon: <UserOutlined />, label: '个人资料' },
|
||||
{ key: 'password', icon: <KeyOutlined />, label: '修改密码' },
|
||||
{ type: 'divider' },
|
||||
{ key: 'logout', icon: <LogoutOutlined />, label: '退出登录' },
|
||||
], onClick: ({ key }) => { if (key === 'logout') void logout(); else setAccountTab(key as AccountTab); } }}>
|
||||
<Button type="text" aria-label="个人账户菜单"><UserOutlined />{user.displayName || user.username}<DownOutlined /></Button>
|
||||
</Dropdown>
|
||||
</div>
|
||||
</header>
|
||||
<div className="mobile-brand">
|
||||
<span className="brand-mark" aria-hidden="true"><i /><i /><i /></span><strong>质量中心</strong>
|
||||
<span className="brand-mark" aria-hidden="true"><i /><i /><i /></span><strong>质量数据分析平台</strong>
|
||||
<Select<PageKey> {...readableSelectPopup} aria-label="页面导航" value={page} onChange={value => navigate(value)} options={[
|
||||
...navGroups.map(group => ({ label: group.label, options: group.items.map(([value, label]) => ({ value, label })) })),
|
||||
]} />
|
||||
<Button type="text" icon={<LogoutOutlined />} aria-label="退出登录" onClick={async () => {
|
||||
try { await api.logout(); setUser(null); }
|
||||
catch (error) { if (!handleUnauthorized(error)) message.error(error instanceof Error ? error.message : '退出失败'); }
|
||||
}} />
|
||||
<Button type="text" icon={<UserOutlined />} aria-label="打开个人账户" onClick={() => setAccountTab('profile')} />
|
||||
</div>
|
||||
<div className="page-content">
|
||||
<Suspense fallback={<div className="loading-panel"><Spin />正在打开页面…</div>}>
|
||||
@@ -256,6 +268,8 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
</Suspense>
|
||||
</div>
|
||||
</main>
|
||||
<PersonalAccount user={user} tab={accountTab} onClose={() => setAccountTab(null)} onUserChange={setUser}
|
||||
onUnauthorized={handleUnauthorized} onLogout={logout} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -279,13 +293,13 @@ function LoginPage({ onSuccess }: { onSuccess: (user: AuthUser) => void }) {
|
||||
|
||||
return (
|
||||
<div className="login-screen">
|
||||
<section className="login-art" aria-label="质量中心品牌介绍">
|
||||
<section className="login-art" aria-label="质量数据分析平台品牌介绍">
|
||||
<div className="login-orbit login-orbit-one" aria-hidden="true" />
|
||||
<div className="login-orbit login-orbit-two" aria-hidden="true" />
|
||||
<div className="login-brand-lockup">
|
||||
<img src="/yunsheng-logo.png" alt="宁波韵升" />
|
||||
<span className="login-brand-divider" />
|
||||
<strong>质量中心</strong>
|
||||
<strong>质量数据分析平台</strong>
|
||||
</div>
|
||||
<div className="login-art-copy">
|
||||
<span className="login-eyebrow">QUALITY DATA PLATFORM</span>
|
||||
@@ -304,7 +318,7 @@ function LoginPage({ onSuccess }: { onSuccess: (user: AuthUser) => void }) {
|
||||
<Input.Password autoComplete="current-password" placeholder="请输入密码" disabled={busy} />
|
||||
</Form.Item>
|
||||
{loginError && <Alert className="login-error" type="error" showIcon message={loginError} role="alert" />}
|
||||
<Button className="login-submit" type="primary" htmlType="submit" loading={busy} block>{busy ? '正在登录…' : '登录质量中心'}</Button>
|
||||
<Button className="login-submit" type="primary" htmlType="submit" loading={busy} block>{busy ? '正在登录…' : '登录'}</Button>
|
||||
</Form>
|
||||
</div>
|
||||
<footer className="login-footer">宁波韵升股份有限公司 <span>·</span> © 2026</footer>
|
||||
|
||||
Reference in New Issue
Block a user