2 Commits

Author SHA1 Message Date
Du Wenbo
ec3aab28c1 feat: energy flow, weather, comparison, PWA, alarm subs (v1.5.0)
7 new features inspired by iSolarCloud:

1. Animated Energy Flow Diagram — SVG/CSS animated power flow
   between PV, Load, Grid, HeatPump with real-time values
2. Weather Widget — temperature/condition on dashboard header
3. Curve Template Library — save/load Data Query presets
4. Enhanced Device Comparison — multi-device power overlay chart
5. Dispersion Rate Analysis — statistical variation across inverters
   with outlier detection (new Analysis tab)
6. PWA Support — manifest.json + service worker for mobile install
7. Alarm Subscription UI — configurable notification preferences

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-07 10:35:50 +08:00
Du Wenbo
93af4bc16b feat: solar KPIs, version display, feature flags (v1.4.0)
New dashboard KPI cards:
- Performance Ratio (PR) with color thresholds
- Equivalent Utilization Hours
- Daily Revenue (¥)
- Self-Consumption Rate

Version display for field engineers:
- Login page footer: "v1.4.0 | Core: v1.4.0"
- Sidebar footer: version when expanded
- System Settings: full version breakdown

Backend (core sync):
- GET /api/v1/version (no auth) — reads VERSIONS.json
- GET /api/v1/kpi/solar — PR, revenue, equiv hours calculations
- Dashboard energy_today fallback from raw energy_data
- PV device filter includes sungrow_inverter type

Feature flags:
- Sidebar hides disabled features (charging, bigscreen_3d)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-06 22:37:09 +08:00
23 changed files with 1507 additions and 91 deletions

View File

@@ -1,9 +1,9 @@
{ {
"project": "zpark-ems", "project": "zpark-ems",
"project_version": "1.3.0", "project_version": "1.5.0",
"customer": "Z-Park 中关村医疗器械园", "customer": "Z-Park 中关村医疗器械园",
"core_version": "1.1.0", "core_version": "1.4.0",
"frontend_template_version": "1.1.0", "frontend_template_version": "1.4.0",
"last_updated": "2026-04-06", "last_updated": "2026-04-06",
"notes": "Z-Park branding, ps_id fix, feature flags, buyoff CONDITIONAL PASS" "notes": "Energy flow diagram, weather widget, curve templates, device comparison, dispersion analysis, PWA, alarm subscriptions"
} }

View File

@@ -0,0 +1,9 @@
{
"project": "zpark-ems",
"project_version": "1.3.0",
"customer": "Z-Park 中关村医疗器械园",
"core_version": "1.1.0",
"frontend_template_version": "1.1.0",
"last_updated": "2026-04-06",
"notes": "Z-Park branding, ps_id fix, feature flags, buyoff CONDITIONAL PASS"
}

View File

@@ -1,5 +1,5 @@
from fastapi import APIRouter from fastapi import APIRouter
from app.api.v1 import auth, users, devices, energy, monitoring, alarms, reports, carbon, dashboard, collectors, websocket, audit, settings, charging, quota, cost, maintenance, management, prediction, energy_strategy, weather, ai_ops, branding from app.api.v1 import auth, users, devices, energy, monitoring, alarms, reports, carbon, dashboard, collectors, websocket, audit, settings, charging, quota, cost, maintenance, management, prediction, energy_strategy, weather, ai_ops, branding, version, kpi
api_router = APIRouter(prefix="/api/v1") api_router = APIRouter(prefix="/api/v1")
@@ -26,3 +26,5 @@ api_router.include_router(energy_strategy.router)
api_router.include_router(weather.router) api_router.include_router(weather.router)
api_router.include_router(ai_ops.router) api_router.include_router(ai_ops.router)
api_router.include_router(branding.router) api_router.include_router(branding.router)
api_router.include_router(version.router)
api_router.include_router(kpi.router)

View File

@@ -26,7 +26,7 @@ async def get_overview(db: AsyncSession = Depends(get_db), user: User = Depends(
) )
device_stats = {row[0]: row[1] for row in device_stats_q.all()} device_stats = {row[0]: row[1] for row in device_stats_q.all()}
# 今日能耗汇总 # 今日能耗汇总 (from daily summary table)
daily_q = await db.execute( daily_q = await db.execute(
select( select(
EnergyDailySummary.energy_type, EnergyDailySummary.energy_type,
@@ -38,6 +38,35 @@ async def get_overview(db: AsyncSession = Depends(get_db), user: User = Depends(
for row in daily_q.all(): for row in daily_q.all():
energy_summary[row[0]] = {"consumption": row[1] or 0, "generation": row[2] or 0} energy_summary[row[0]] = {"consumption": row[1] or 0, "generation": row[2] or 0}
# Fallback: if daily summary is empty, compute from raw energy_data
if not energy_summary:
from sqlalchemy import distinct
fallback_q = await db.execute(
select(
func.sum(EnergyData.value),
).where(
and_(
EnergyData.timestamp >= today_start,
EnergyData.data_type == "daily_energy",
)
).group_by(EnergyData.device_id).order_by(EnergyData.device_id)
)
# Get the latest daily_energy per device (avoid double-counting)
latest_energy_q = await db.execute(
select(
EnergyData.device_id,
func.max(EnergyData.value).label("max_energy"),
).where(
and_(
EnergyData.timestamp >= today_start,
EnergyData.data_type == "daily_energy",
)
).group_by(EnergyData.device_id)
)
total_gen = sum(row[1] or 0 for row in latest_energy_q.all())
if total_gen > 0:
energy_summary["electricity"] = {"consumption": 0, "generation": round(total_gen, 2)}
# 今日碳排放 # 今日碳排放
carbon_q = await db.execute( carbon_q = await db.execute(
select(func.sum(CarbonEmission.emission), func.sum(CarbonEmission.reduction)) select(func.sum(CarbonEmission.emission), func.sum(CarbonEmission.reduction))
@@ -134,7 +163,10 @@ async def get_load_curve(
async def _get_pv_device_ids(db: AsyncSession): async def _get_pv_device_ids(db: AsyncSession):
result = await db.execute( result = await db.execute(
select(Device.id).where(Device.device_type == "pv_inverter", Device.is_active == True) select(Device.id).where(
Device.device_type.in_(["pv_inverter", "sungrow_inverter"]),
Device.is_active == True,
)
) )
return [r[0] for r in result.fetchall()] return [r[0] for r in result.fetchall()]

View File

@@ -0,0 +1,93 @@
from datetime import datetime, timezone
from fastapi import APIRouter, Depends
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy import select, func, and_
from app.core.database import get_db
from app.core.deps import get_current_user
from app.models.device import Device
from app.models.energy import EnergyData
from app.models.user import User
router = APIRouter(prefix="/kpi", tags=["关键指标"])
@router.get("/solar")
async def get_solar_kpis(db: AsyncSession = Depends(get_db), user: User = Depends(get_current_user)):
"""Solar performance KPIs - PR, self-consumption, equivalent hours, revenue"""
now = datetime.now(timezone.utc)
today_start = now.replace(hour=0, minute=0, second=0, microsecond=0)
# Get PV devices and their rated power
pv_q = await db.execute(
select(Device.id, Device.rated_power).where(
Device.device_type.in_(["pv_inverter", "sungrow_inverter"]),
Device.is_active == True,
)
)
pv_devices = pv_q.all()
pv_ids = [d[0] for d in pv_devices]
total_rated_kw = sum(d[1] or 0 for d in pv_devices) # kW
if not pv_ids or total_rated_kw == 0:
return {
"pr": 0, "self_consumption_rate": 0,
"equivalent_hours": 0, "revenue_today": 0,
"total_rated_kw": 0, "daily_generation_kwh": 0,
}
# Get latest daily_energy per PV device for today
daily_gen_q = await db.execute(
select(
EnergyData.device_id,
func.max(EnergyData.value).label("max_energy"),
).where(
and_(
EnergyData.timestamp >= today_start,
EnergyData.data_type == "daily_energy",
EnergyData.device_id.in_(pv_ids),
)
).group_by(EnergyData.device_id)
)
# Check if values are station-level (all identical) or device-level
daily_values = daily_gen_q.all()
if not daily_values:
daily_generation_kwh = 0
else:
values = [row[1] or 0 for row in daily_values]
# If all values are identical, it's station-level data — use max (not sum)
if len(set(values)) == 1 and len(values) > 1:
daily_generation_kwh = values[0]
else:
daily_generation_kwh = sum(values)
# Performance Ratio (PR) = actual output / (rated capacity * peak sun hours)
# Approximate peak sun hours from time of day (simplified)
hours_since_sunrise = max(0, min(12, (now.hour + now.minute / 60) - 6)) # approx 6am sunrise
theoretical_kwh = total_rated_kw * hours_since_sunrise * 0.8 # 0.8 = typical irradiance factor
pr = (daily_generation_kwh / theoretical_kwh * 100) if theoretical_kwh > 0 else 0
pr = min(100, round(pr, 1)) # Cap at 100%
# Self-consumption rate (without grid export meter, assume 100% self-consumed for now)
# TODO: integrate grid export meter data when available
self_consumption_rate = 100.0
# Equivalent utilization hours = daily generation / rated capacity
equivalent_hours = round(daily_generation_kwh / total_rated_kw, 2) if total_rated_kw > 0 else 0
# Revenue = daily generation * electricity price
# TODO: get actual price from electricity_pricing table
# Default industrial TOU average price in Beijing: ~0.65 CNY/kWh
avg_price = 0.65
revenue_today = round(daily_generation_kwh * avg_price, 2)
return {
"pr": pr,
"self_consumption_rate": round(self_consumption_rate, 1),
"equivalent_hours": equivalent_hours,
"revenue_today": revenue_today,
"total_rated_kw": total_rated_kw,
"daily_generation_kwh": round(daily_generation_kwh, 2),
"avg_price_per_kwh": avg_price,
"pv_device_count": len(pv_ids),
}

View File

@@ -0,0 +1,32 @@
import os
import json
from fastapi import APIRouter
router = APIRouter(prefix="/version", tags=["版本信息"])
@router.get("")
async def get_version():
"""Return platform version information for display on login/dashboard"""
# Read VERSIONS.json from project root (2 levels up from backend/)
backend_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
# Try multiple paths for VERSIONS.json
for path in [
os.path.join(backend_dir, "VERSIONS.json"), # standalone
os.path.join(backend_dir, "..", "VERSIONS.json"), # inside core/ subtree
os.path.join(backend_dir, "..", "..", "VERSIONS.json"), # customer project root
]:
if os.path.exists(path):
with open(path, 'r', encoding='utf-8') as f:
versions = json.load(f)
return versions
# Fallback: read VERSION file
version_file = os.path.join(backend_dir, "VERSION")
version = "unknown"
if os.path.exists(version_file):
with open(version_file, 'r') as f:
version = f.read().strip()
return {"project_version": version, "project": "ems-core"}

View File

@@ -3,7 +3,11 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" /> <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<link rel="manifest" href="/manifest.json">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="theme-color" content="#52c41a">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<title>中关村医疗器械园智慧能源管理平台</title> <title>中关村医疗器械园智慧能源管理平台</title>
</head> </head>
<body> <body>

View File

@@ -0,0 +1,18 @@
{
"name": "Z-Park EMS",
"short_name": "Z-Park EMS",
"description": "中关村医疗器械园智慧能源管理平台",
"start_url": "/",
"display": "standalone",
"background_color": "#0a1628",
"theme_color": "#52c41a",
"orientation": "any",
"icons": [
{
"src": "/favicon.svg",
"sizes": "any",
"type": "image/svg+xml",
"purpose": "any"
}
]
}

21
frontend/public/sw.js Normal file
View File

@@ -0,0 +1,21 @@
// Simple service worker for PWA installability
const CACHE_NAME = 'zpark-ems-v1';
self.addEventListener('install', (event) => {
self.skipWaiting();
});
self.addEventListener('activate', (event) => {
event.waitUntil(clients.claim());
});
self.addEventListener('fetch', (event) => {
// Network-first strategy for API calls, cache-first for static assets
if (event.request.url.includes('/api/')) {
event.respondWith(fetch(event.request));
} else {
event.respondWith(
caches.match(event.request).then(response => response || fetch(event.request))
);
}
});

View File

@@ -12,7 +12,7 @@ import {
import { Outlet, useNavigate, useLocation } from 'react-router-dom'; import { Outlet, useNavigate, useLocation } from 'react-router-dom';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { getUser, removeToken } from '../utils/auth'; import { getUser, removeToken } from '../utils/auth';
import { getAlarmStats, getAlarmEvents, getBranding } from '../services/api'; import { getAlarmStats, getAlarmEvents, getBranding, getVersion } from '../services/api';
import { useTheme } from '../contexts/ThemeContext'; import { useTheme } from '../contexts/ThemeContext';
const { Header, Sider, Content } = Layout; const { Header, Sider, Content } = Layout;
@@ -29,6 +29,7 @@ export default function MainLayout() {
const [alarmCount, setAlarmCount] = useState(0); const [alarmCount, setAlarmCount] = useState(0);
const [recentAlarms, setRecentAlarms] = useState<any[]>([]); const [recentAlarms, setRecentAlarms] = useState<any[]>([]);
const [features, setFeatures] = useState<Record<string, boolean>>({}); const [features, setFeatures] = useState<Record<string, boolean>>({});
const [versionInfo, setVersionInfo] = useState<any>(null);
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation(); const location = useLocation();
const user = getUser(); const user = getUser();
@@ -39,6 +40,7 @@ export default function MainLayout() {
getBranding().then((res: any) => { getBranding().then((res: any) => {
setFeatures(res?.features || {}); setFeatures(res?.features || {});
}).catch(() => {}); }).catch(() => {});
getVersion().then(setVersionInfo).catch(() => {});
}, []); }, []);
// Map feature flags to menu keys that should be hidden when the feature is disabled // Map feature flags to menu keys that should be hidden when the feature is disabled
@@ -172,6 +174,14 @@ export default function MainLayout() {
} }
}} }}
/> />
{!collapsed && versionInfo && (
<div style={{
padding: '8px 16px', fontSize: 11, color: 'rgba(255,255,255,0.3)',
borderTop: '1px solid rgba(255,255,255,0.06)', textAlign: 'center',
}}>
v{versionInfo.project_version}
</div>
)}
</Sider> </Sider>
<Layout> <Layout>
<Header style={{ <Header style={{

View File

@@ -8,3 +8,10 @@ createRoot(document.getElementById('root')!).render(
<App /> <App />
</StrictMode>, </StrictMode>,
) )
// Register PWA service worker
if ('serviceWorker' in navigator) {
window.addEventListener('load', () => {
navigator.serviceWorker.register('/sw.js').catch(() => {});
});
}

View File

@@ -0,0 +1,200 @@
import { useState, useEffect } from 'react';
import { Card, Table, Button, Modal, Form, Input, Select, Checkbox, Switch, Space, Tag, Popconfirm, message } from 'antd';
import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons';
interface AlarmSubscription {
id: string;
name: string;
severity: ('critical' | 'warning' | 'info')[];
deviceTypes: string[];
notifyMethod: ('email' | 'webhook')[];
email?: string;
webhookUrl?: string;
enabled: boolean;
}
const STORAGE_KEY = 'zpark-alarm-subscriptions';
const severityOptions = [
{ label: '紧急', value: 'critical' },
{ label: '一般', value: 'warning' },
{ label: '信息', value: 'info' },
];
const deviceTypeOptions = [
{ label: '全部设备', value: 'all' },
{ label: '逆变器 (Sungrow)', value: 'sungrow_inverter' },
{ label: '直流汇流箱', value: 'dc_combiner' },
];
const notifyMethodOptions = [
{ label: '邮件', value: 'email' },
{ label: 'Webhook', value: 'webhook' },
];
const severityColorMap: Record<string, string> = {
critical: 'red',
warning: 'gold',
info: 'blue',
};
const severityTextMap: Record<string, string> = {
critical: '紧急',
warning: '一般',
info: '信息',
};
const deviceTypeTextMap: Record<string, string> = {
all: '全部设备',
sungrow_inverter: '逆变器',
dc_combiner: '直流汇流箱',
};
function loadSubscriptions(): AlarmSubscription[] {
try {
const raw = localStorage.getItem(STORAGE_KEY);
return raw ? JSON.parse(raw) : [];
} catch {
return [];
}
}
function saveSubscriptions(subs: AlarmSubscription[]) {
localStorage.setItem(STORAGE_KEY, JSON.stringify(subs));
}
export default function AlarmSubscriptionTab() {
const [subscriptions, setSubscriptions] = useState<AlarmSubscription[]>([]);
const [modalOpen, setModalOpen] = useState(false);
const [editingId, setEditingId] = useState<string | null>(null);
const [form] = Form.useForm();
const notifyMethod = Form.useWatch('notifyMethod', form);
useEffect(() => {
setSubscriptions(loadSubscriptions());
}, []);
const persist = (next: AlarmSubscription[]) => {
setSubscriptions(next);
saveSubscriptions(next);
};
const openCreate = () => {
setEditingId(null);
form.resetFields();
setModalOpen(true);
};
const openEdit = (record: AlarmSubscription) => {
setEditingId(record.id);
form.setFieldsValue(record);
setModalOpen(true);
};
const handleDelete = (id: string) => {
persist(subscriptions.filter(s => s.id !== id));
message.success('已删除');
};
const handleToggle = (id: string) => {
persist(subscriptions.map(s => s.id === id ? { ...s, enabled: !s.enabled } : s));
};
const handleSubmit = (values: any) => {
if (editingId) {
persist(subscriptions.map(s => s.id === editingId ? { ...s, ...values } : s));
message.success('订阅已更新');
} else {
const newSub: AlarmSubscription = {
...values,
id: Date.now().toString(36) + Math.random().toString(36).slice(2, 6),
enabled: true,
};
persist([...subscriptions, newSub]);
message.success('订阅已创建');
}
setModalOpen(false);
form.resetFields();
};
const columns = [
{ title: '订阅名称', dataIndex: 'name' },
{
title: '告警级别', dataIndex: 'severity',
render: (vals: string[]) => vals?.map(v => (
<Tag key={v} color={severityColorMap[v]}>{severityTextMap[v] || v}</Tag>
)),
},
{
title: '设备类型', dataIndex: 'deviceTypes',
render: (vals: string[]) => vals?.map(v => deviceTypeTextMap[v] || v).join(', '),
},
{
title: '通知方式', dataIndex: 'notifyMethod',
render: (vals: string[]) => vals?.map(v => (
<Tag key={v}>{v === 'email' ? '邮件' : 'Webhook'}</Tag>
)),
},
{
title: '启用', dataIndex: 'enabled', width: 80,
render: (v: boolean, r: AlarmSubscription) => (
<Switch checked={v} onChange={() => handleToggle(r.id)} size="small" />
),
},
{
title: '操作', key: 'action', width: 120,
render: (_: any, r: AlarmSubscription) => (
<Space>
<Button size="small" icon={<EditOutlined />} onClick={() => openEdit(r)} />
<Popconfirm title="确认删除此订阅?" onConfirm={() => handleDelete(r.id)} okText="删除" cancelText="取消">
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</Space>
),
},
];
return (
<Card size="small" extra={
<Button type="primary" icon={<PlusOutlined />} onClick={openCreate}></Button>
}>
<Table columns={columns} dataSource={subscriptions} rowKey="id" size="small"
pagination={false} locale={{ emptyText: '暂无订阅,点击"新建订阅"开始配置' }} />
<Modal
title={editingId ? '编辑订阅' : '新建订阅'}
open={modalOpen}
onCancel={() => { setModalOpen(false); form.resetFields(); }}
onOk={() => form.submit()}
okText={editingId ? '保存' : '创建'}
cancelText="取消"
destroyOnClose
>
<Form form={form} layout="vertical" onFinish={handleSubmit}>
<Form.Item name="name" label="订阅名称" rules={[{ required: true, message: '请输入订阅名称' }]}>
<Input placeholder="例: 紧急告警通知" />
</Form.Item>
<Form.Item name="severity" label="告警级别" rules={[{ required: true, message: '请选择告警级别' }]}>
<Checkbox.Group options={severityOptions} />
</Form.Item>
<Form.Item name="deviceTypes" label="设备类型" rules={[{ required: true, message: '请选择设备类型' }]}>
<Select mode="multiple" options={deviceTypeOptions} placeholder="选择设备类型" />
</Form.Item>
<Form.Item name="notifyMethod" label="通知方式" rules={[{ required: true, message: '请选择通知方式' }]}>
<Checkbox.Group options={notifyMethodOptions} />
</Form.Item>
{notifyMethod?.includes('email') && (
<Form.Item name="email" label="邮箱地址" rules={[{ required: true, type: 'email', message: '请输入有效邮箱' }]}>
<Input placeholder="user@example.com" />
</Form.Item>
)}
{notifyMethod?.includes('webhook') && (
<Form.Item name="webhookUrl" label="Webhook URL" rules={[{ required: true, type: 'url', message: '请输入有效URL' }]}>
<Input placeholder="https://hooks.example.com/..." />
</Form.Item>
)}
</Form>
</Modal>
</Card>
);
}

View File

@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Card, Table, Tag, Button, Tabs, Modal, Form, Input, Select, InputNumber, Space, Switch, Drawer, Row, Col, Statistic, message } from 'antd'; import { Card, Table, Tag, Button, Tabs, Modal, Form, Input, Select, InputNumber, Space, Switch, Drawer, Row, Col, Statistic, message } from 'antd';
import { PlusOutlined, CheckOutlined, ToolOutlined, HistoryOutlined } from '@ant-design/icons'; import { PlusOutlined, CheckOutlined, ToolOutlined, HistoryOutlined, BellOutlined } from '@ant-design/icons';
import AlarmSubscriptionTab from './components/AlarmSubscription';
import ReactECharts from 'echarts-for-react'; import ReactECharts from 'echarts-for-react';
import { import {
getAlarmEvents, getAlarmRules, createAlarmRule, acknowledgeAlarm, resolveAlarm, getAlarmEvents, getAlarmRules, createAlarmRule, acknowledgeAlarm, resolveAlarm,
@@ -263,6 +264,7 @@ export default function Alarms() {
</Card> </Card>
)}, )},
{ key: 'analytics', label: '分析', children: <AlarmAnalyticsTab /> }, { key: 'analytics', label: '分析', children: <AlarmAnalyticsTab /> },
{ key: 'subscription', label: <span><BellOutlined /> </span>, children: <AlarmSubscriptionTab /> },
]} /> ]} />
<Modal title="新建告警规则" open={showRuleModal} onCancel={() => setShowRuleModal(false)} <Modal title="新建告警规则" open={showRuleModal} onCancel={() => setShowRuleModal(false)}

View File

@@ -0,0 +1,207 @@
import { useEffect, useState } from 'react';
import { Card, Row, Col, DatePicker, Select, Button, Table, Space, Spin, message, Empty } from 'antd';
import { LineChartOutlined } from '@ant-design/icons';
import ReactECharts from 'echarts-for-react';
import dayjs, { type Dayjs } from 'dayjs';
import { getDevices, getEnergyHistory } from '../../../services/api';
const COLORS = ['#1890ff', '#52c41a', '#faad14', '#f5222d', '#722ed1'];
interface DeviceOption {
id: number;
name: string;
}
interface DevicePowerData {
device_id: number;
device_name: string;
records: { time: string; value: number }[];
daily_total: number;
}
export default function DeviceComparison() {
const [devices, setDevices] = useState<DeviceOption[]>([]);
const [selectedIds, setSelectedIds] = useState<number[]>([]);
const [date, setDate] = useState<Dayjs>(dayjs().subtract(1, 'day'));
const [loading, setLoading] = useState(false);
const [deviceData, setDeviceData] = useState<DevicePowerData[]>([]);
useEffect(() => {
loadDevices();
}, []);
const loadDevices = async () => {
try {
const resp = await getDevices({ device_type: 'inverter' }) as any;
const list = Array.isArray(resp) ? resp : resp?.items || resp?.devices || [];
setDevices(list.map((d: any) => ({
id: d.id,
name: d.name || d.device_name || `Inverter ${d.id}`,
})));
} catch (e) {
console.error(e);
}
};
const loadComparison = async () => {
if (selectedIds.length < 2) {
message.warning('请至少选择2台设备进行对比');
return;
}
setLoading(true);
try {
const dateStr = date.format('YYYY-MM-DD');
const nextDay = date.add(1, 'day').format('YYYY-MM-DD');
const promises = selectedIds.map(id => {
const dev = devices.find(d => d.id === id);
return getEnergyHistory({
device_id: id,
data_type: 'power',
granularity: 'hour',
start_time: dateStr,
end_time: nextDay,
}).then((data: any) => {
const records = Array.isArray(data) ? data : [];
const mapped = records.map((r: any) => ({
time: r.time,
value: r.avg || r.value || 0,
}));
return {
device_id: id,
device_name: dev?.name || `Device ${id}`,
records: mapped,
daily_total: mapped.reduce((sum: number, r: any) => sum + r.value, 0),
};
}).catch(() => ({
device_id: id,
device_name: dev?.name || `Device ${id}`,
records: [],
daily_total: 0,
}));
});
const results = await Promise.all(promises);
setDeviceData(results);
} catch (e) {
console.error(e);
message.error('加载对比数据失败');
} finally {
setLoading(false);
}
};
// Build unified time axis from all devices
const allTimes = Array.from(new Set(
deviceData.flatMap(d => d.records.map(r => r.time))
)).sort();
const timeLabels = allTimes.map(t => {
const d = new Date(t);
return `${d.getHours().toString().padStart(2, '0')}:00`;
});
const chartOption = deviceData.length > 0 ? {
tooltip: {
trigger: 'axis',
formatter: (params: any) => {
let tip = params[0]?.axisValueLabel || '';
params.forEach((p: any) => {
tip += `<br/><span style="display:inline-block;width:10px;height:10px;border-radius:50%;background:${p.color};margin-right:4px"></span>${p.seriesName}: ${(p.value ?? '-')} kW`;
});
return tip;
},
},
legend: {
data: deviceData.map(d => d.device_name),
bottom: 0,
},
grid: { top: 30, right: 20, bottom: 50, left: 60 },
xAxis: {
type: 'category',
data: timeLabels,
axisLabel: { fontSize: 11 },
},
yAxis: { type: 'value', name: 'kW' },
series: deviceData.map((d, i) => {
const timeMap = new Map(d.records.map(r => [r.time, r.value]));
return {
name: d.device_name,
type: 'line',
smooth: true,
data: allTimes.map(t => timeMap.get(t) ?? null),
lineStyle: { color: COLORS[i % COLORS.length] },
itemStyle: { color: COLORS[i % COLORS.length] },
connectNulls: true,
};
}),
} : {};
const tableData = deviceData.length > 0 ? [{
key: 'daily',
label: '日发电量 (kWh)',
...Object.fromEntries(deviceData.map(d => [d.device_name, d.daily_total.toFixed(1)])),
}] : [];
const tableColumns = [
{ title: '指标', dataIndex: 'label', fixed: 'left' as const, width: 150 },
...deviceData.map(d => ({
title: d.device_name,
dataIndex: d.device_name,
width: 120,
})),
];
return (
<Spin spinning={loading}>
<Card size="small" style={{ marginBottom: 16 }}>
<Space wrap>
<span> (2-5):</span>
<Select
mode="multiple"
style={{ minWidth: 300 }}
placeholder="选择逆变器"
value={selectedIds}
onChange={(vals: number[]) => {
if (vals.length <= 5) setSelectedIds(vals);
else message.warning('最多选择5台设备');
}}
options={devices.map(d => ({ label: d.name, value: d.id }))}
maxTagCount={3}
allowClear
/>
<span>:</span>
<DatePicker
value={date}
onChange={(d) => d && setDate(d)}
disabledDate={(current) => current && current > dayjs()}
/>
<Button type="primary" icon={<LineChartOutlined />} onClick={loadComparison}
disabled={selectedIds.length < 2}>
</Button>
</Space>
</Card>
{deviceData.length > 0 ? (
<>
<Card title="功率曲线对比" size="small" style={{ marginBottom: 16 }}>
<ReactECharts option={chartOption} style={{ height: 400 }} />
</Card>
<Card title="日发电量对比" size="small">
<Table
columns={tableColumns}
dataSource={tableData}
size="small"
pagination={false}
scroll={{ x: 'max-content' }}
/>
</Card>
</>
) : (
!loading && selectedIds.length >= 2 && <Empty description="点击「对比」加载数据" />
)}
</Spin>
);
}

View File

@@ -0,0 +1,237 @@
import { useEffect, useState } from 'react';
import { Card, Row, Col, Tag, Table, DatePicker, Space, Spin, Empty, message } from 'antd';
import ReactECharts from 'echarts-for-react';
import dayjs, { type Dayjs } from 'dayjs';
import { getDevices, getEnergyHistory } from '../../../services/api';
interface DeviceEnergy {
device_id: number;
device_name: string;
daily_energy: number;
}
interface DispersionStats {
mean: number;
stdDev: number;
dispersionRate: number;
outliers: DeviceEnergy[];
devices: DeviceEnergy[];
}
function computeDispersion(devices: DeviceEnergy[]): DispersionStats {
const values = devices.map(d => d.daily_energy);
if (values.length === 0) {
return { mean: 0, stdDev: 0, dispersionRate: 0, outliers: [], devices };
}
const mean = values.reduce((a, b) => a + b, 0) / values.length;
const variance = values.reduce((a, v) => a + (v - mean) ** 2, 0) / values.length;
const stdDev = Math.sqrt(variance);
const dispersionRate = mean > 0 ? (stdDev / mean) * 100 : 0;
const outliers = devices.filter(d => Math.abs(d.daily_energy - mean) > 2 * stdDev);
return { mean, stdDev, dispersionRate, outliers, devices };
}
export default function DispersionAnalysis() {
const [date, setDate] = useState<Dayjs>(dayjs().subtract(1, 'day'));
const [loading, setLoading] = useState(false);
const [stats, setStats] = useState<DispersionStats | null>(null);
const loadData = async () => {
setLoading(true);
try {
const devicesResp = await getDevices({ device_type: 'inverter' }) as any;
const deviceList = Array.isArray(devicesResp) ? devicesResp : devicesResp?.items || devicesResp?.devices || [];
if (deviceList.length === 0) {
setStats(null);
return;
}
const dateStr = date.format('YYYY-MM-DD');
const nextDay = date.add(1, 'day').format('YYYY-MM-DD');
const energyPromises = deviceList.map((dev: any) =>
getEnergyHistory({
device_id: dev.id,
data_type: 'power',
granularity: 'hour',
start_time: dateStr,
end_time: nextDay,
}).then((data: any) => {
const records = Array.isArray(data) ? data : [];
const totalEnergy = records.reduce((sum: number, r: any) => sum + (r.avg || r.value || 0), 0);
return {
device_id: dev.id,
device_name: dev.name || dev.device_name || `Inverter ${dev.id}`,
daily_energy: totalEnergy,
};
}).catch(() => ({
device_id: dev.id,
device_name: dev.name || dev.device_name || `Inverter ${dev.id}`,
daily_energy: 0,
}))
);
const deviceEnergies = await Promise.all(energyPromises);
setStats(computeDispersion(deviceEnergies));
} catch (e) {
console.error(e);
message.error('加载离散率数据失败');
} finally {
setLoading(false);
}
};
useEffect(() => {
loadData();
}, [date]);
const getDispersionColor = (rate: number) => {
if (rate < 10) return 'green';
if (rate < 20) return 'orange';
return 'red';
};
const getDispersionLabel = (rate: number) => {
if (rate < 10) return '优秀';
if (rate < 20) return '一般';
return '偏高';
};
const barChartOption = stats ? {
tooltip: {
trigger: 'axis',
formatter: (params: any) => {
const p = params[0];
const diff = p.value - stats.mean;
const pct = stats.mean > 0 ? ((diff / stats.mean) * 100).toFixed(1) : '0';
return `${p.name}<br/>发电量: ${p.value.toFixed(1)} kWh<br/>偏差: ${diff >= 0 ? '+' : ''}${diff.toFixed(1)} kWh (${pct}%)`;
},
},
grid: { top: 40, right: 20, bottom: 60, left: 60 },
xAxis: {
type: 'category',
data: stats.devices.map(d => d.device_name),
axisLabel: { rotate: 30, fontSize: 11 },
},
yAxis: { type: 'value', name: 'kWh' },
series: [
{
type: 'bar',
data: stats.devices.map(d => ({
value: d.daily_energy,
itemStyle: {
color: Math.abs(d.daily_energy - stats.mean) > 2 * stats.stdDev
? '#f5222d'
: d.daily_energy < stats.mean ? '#faad14' : '#52c41a',
},
})),
barMaxWidth: 50,
},
{
type: 'line',
markLine: {
silent: true,
symbol: 'none',
lineStyle: { color: '#1890ff', type: 'dashed', width: 2 },
data: [{ yAxis: stats.mean, label: { formatter: `均值: ${stats.mean.toFixed(1)} kWh` } }],
},
data: [],
},
],
} : {};
const outlierColumns = [
{ title: '设备名称', dataIndex: 'device_name' },
{
title: '发电量 (kWh)', dataIndex: 'daily_energy',
render: (v: number) => v.toFixed(1),
},
{
title: '偏差', key: 'deviation',
render: (_: any, record: DeviceEnergy) => {
if (!stats) return '-';
const diff = record.daily_energy - stats.mean;
const pct = stats.mean > 0 ? ((diff / stats.mean) * 100).toFixed(1) : '0';
return (
<span style={{ color: diff < 0 ? '#f5222d' : '#52c41a' }}>
{diff >= 0 ? '+' : ''}{diff.toFixed(1)} kWh ({pct}%)
</span>
);
},
},
{
title: '状态', key: 'status',
render: (_: any, record: DeviceEnergy) => {
if (!stats) return '-';
const diff = record.daily_energy - stats.mean;
return diff < 0
? <Tag color="red"></Tag>
: <Tag color="blue"></Tag>;
},
},
];
return (
<Spin spinning={loading}>
<Card size="small" style={{ marginBottom: 16 }}>
<Space>
<span>:</span>
<DatePicker
value={date}
onChange={(d) => d && setDate(d)}
disabledDate={(current) => current && current > dayjs()}
/>
</Space>
</Card>
{stats ? (
<>
<Row gutter={[16, 16]} style={{ marginBottom: 16 }}>
<Col xs={24} sm={8}>
<Card size="small">
<div style={{ color: '#666', marginBottom: 4 }}></div>
<div style={{ fontSize: 24, fontWeight: 600 }}>
{stats.dispersionRate.toFixed(1)}%
<Tag color={getDispersionColor(stats.dispersionRate)} style={{ marginLeft: 8, fontSize: 14 }}>
{getDispersionLabel(stats.dispersionRate)}
</Tag>
</div>
</Card>
</Col>
<Col xs={24} sm={8}>
<Card size="small">
<div style={{ color: '#666', marginBottom: 4 }}></div>
<div style={{ fontSize: 24, fontWeight: 600 }}>{stats.mean.toFixed(1)} <span style={{ fontSize: 14, color: '#999' }}>kWh</span></div>
</Card>
</Col>
<Col xs={24} sm={8}>
<Card size="small">
<div style={{ color: '#666', marginBottom: 4 }}></div>
<div style={{ fontSize: 24, fontWeight: 600 }}>{stats.stdDev.toFixed(2)} <span style={{ fontSize: 14, color: '#999' }}>kWh</span></div>
</Card>
</Col>
</Row>
<Card title="逆变器发电量对比" size="small" style={{ marginBottom: 16 }}>
<ReactECharts option={barChartOption} style={{ height: 350 }} />
</Card>
{stats.outliers.length > 0 && (
<Card title={`异常设备 (偏离>2σ) — ${stats.outliers.length}`} size="small">
<Table
columns={outlierColumns}
dataSource={stats.outliers}
rowKey="device_id"
size="small"
pagination={false}
/>
</Card>
)}
</>
) : (
!loading && <Empty description="暂无逆变器数据" />
)}
</Spin>
);
}

View File

@@ -9,6 +9,8 @@ import YoyAnalysis from './YoyAnalysis';
import MomAnalysis from './MomAnalysis'; import MomAnalysis from './MomAnalysis';
import CostAnalysis from './CostAnalysis'; import CostAnalysis from './CostAnalysis';
import SubitemAnalysis from './SubitemAnalysis'; import SubitemAnalysis from './SubitemAnalysis';
import DeviceComparison from './components/DeviceComparison';
import DispersionAnalysis from './components/DispersionAnalysis';
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
@@ -182,9 +184,13 @@ function ComparisonView() {
{renderMetricCard('碳排放', m1.carbonEmission, m2.carbonEmission, 'kg', 2)} {renderMetricCard('碳排放', m1.carbonEmission, m2.carbonEmission, 'kg', 2)}
</Row> </Row>
<Card title="能耗趋势对比" size="small"> <Card title="能耗趋势对比" size="small" style={{ marginBottom: 24 }}>
<ReactECharts option={comparisonChartOption} style={{ height: 350 }} /> <ReactECharts option={comparisonChartOption} style={{ height: 350 }} />
</Card> </Card>
<Card title="设备对比" size="small" style={{ marginBottom: 0 }}>
<DeviceComparison />
</Card>
</div> </div>
); );
} }
@@ -324,6 +330,7 @@ export default function Analysis() {
items={[ items={[
{ key: 'overview', label: '能耗概览', children: overviewContent }, { key: 'overview', label: '能耗概览', children: overviewContent },
{ key: 'comparison', label: '数据对比', children: <ComparisonView /> }, { key: 'comparison', label: '数据对比', children: <ComparisonView /> },
{ key: 'dispersion', label: '离散率分析', children: <DispersionAnalysis /> },
{ key: 'loss', label: '损耗分析', children: <LossAnalysis /> }, { key: 'loss', label: '损耗分析', children: <LossAnalysis /> },
{ key: 'yoy', label: '同比分析', children: <YoyAnalysis /> }, { key: 'yoy', label: '同比分析', children: <YoyAnalysis /> },
{ key: 'mom', label: '环比分析', children: <MomAnalysis /> }, { key: 'mom', label: '环比分析', children: <MomAnalysis /> },

View File

@@ -1,10 +1,4 @@
import ReactECharts from 'echarts-for-react'; import { useMemo } from 'react';
import { useEffect, useState } from 'react';
import { getEnergyFlow } from '../../../services/api';
import { Spin, Typography, Space } from 'antd';
import { FireOutlined } from '@ant-design/icons';
const { Text } = Typography;
interface Props { interface Props {
realtime?: { realtime?: {
@@ -16,81 +10,324 @@ interface Props {
} }
export default function EnergyFlow({ realtime }: Props) { export default function EnergyFlow({ realtime }: Props) {
const [flowData, setFlowData] = useState<any>(null);
const [loading, setLoading] = useState(true);
useEffect(() => {
getEnergyFlow()
.then((data: any) => setFlowData(data))
.catch(() => {})
.finally(() => setLoading(false));
}, []);
const pv = realtime?.pv_power || 0; const pv = realtime?.pv_power || 0;
const hp = realtime?.heatpump_power || 0;
const load = realtime?.total_load || 0; const load = realtime?.total_load || 0;
const grid = realtime?.grid_power || 0; const grid = realtime?.grid_power || 0;
const hp = realtime?.heatpump_power || 0;
// Build sankey from realtime data as fallback if API has no flow data // Calculate flows
const pvToBuilding = Math.min(pv, load); const pvToLoad = Math.min(pv, load);
const pvToGrid = Math.max(0, pv - load); const pvToGrid = Math.max(0, pv - load);
const gridToBuilding = Math.max(0, load - pv); const gridToLoad = Math.max(0, grid);
const gridToHeatPump = hp; const gridExport = Math.max(0, -grid);
const links = flowData?.links || [ const selfUseRate = load > 0 ? ((pvToLoad / load) * 100).toFixed(1) : '0.0';
{ source: '光伏发电', target: '建筑用电', value: pvToBuilding || 0.1 },
{ source: '光伏发电', target: '电网输出', value: pvToGrid || 0.1 },
{ source: '电网输入', target: '建筑用电', value: gridToBuilding || 0.1 },
{ source: '电网输入', target: '热泵系统', value: gridToHeatPump || 0.1 },
].filter((l: any) => l.value > 0.05);
const nodes = flowData?.nodes || [ // Determine which flows are active (> 0.1 kW threshold)
{ name: '光伏发电', itemStyle: { color: '#faad14' } }, const flows = useMemo(() => ({
{ name: '电网输入', itemStyle: { color: '#52c41a' } }, pvToLoad: pvToLoad > 0.1,
{ name: '建筑用电', itemStyle: { color: '#1890ff' } }, pvToGrid: pvToGrid > 0.1 || gridExport > 0.1,
{ name: '电网输出', itemStyle: { color: '#13c2c2' } }, gridToLoad: gridToLoad > 0.1,
{ name: '热泵系统', itemStyle: { color: '#f5222d' } }, gridToHp: hp > 0.1,
]; }), [pvToLoad, pvToGrid, gridExport, gridToLoad, hp]);
// Only show nodes that appear in links // SVG layout constants
const usedNames = new Set<string>(); const W = 560;
links.forEach((l: any) => { usedNames.add(l.source); usedNames.add(l.target); }); const H = 340;
const filteredNodes = nodes.filter((n: any) => usedNames.has(n.name));
const option = { // Node positions (center points)
tooltip: { trigger: 'item', triggerOn: 'mousemove' }, const nodes = {
series: [{ pv: { x: W / 2, y: 40 },
type: 'sankey', load: { x: 100, y: 200 },
layout: 'none', grid: { x: W - 100, y: 200 },
emphasis: { focus: 'adjacency' }, heatpump: { x: W / 2, y: 300 },
nodeAlign: 'left',
orient: 'horizontal',
top: 10,
bottom: 30,
left: 10,
right: 10,
nodeWidth: 20,
nodeGap: 16,
data: filteredNodes,
links: links,
label: { fontSize: 12 },
lineStyle: { color: 'gradient', curveness: 0.5 },
}],
}; };
if (loading) return <Spin style={{ display: 'block', margin: '80px auto' }} />;
return ( return (
<div> <div style={{ width: '100%', position: 'relative' }}>
<ReactECharts option={option} style={{ height: 240 }} /> <style>{`
<div style={{ textAlign: 'center', padding: '4px 8px', background: '#fafafa', borderRadius: 8 }}> @keyframes dashFlow {
<Space size={24}> to { stroke-dashoffset: -24; }
<span><FireOutlined style={{ color: '#f5222d' }} /> : <Text strong>{hp.toFixed(1)} kW</Text></span> }
<span>: <Text strong style={{ color: '#52c41a' }}> @keyframes dashFlowReverse {
{load > 0 ? ((Math.min(pv, load) / load) * 100).toFixed(1) : 0}% to { stroke-dashoffset: 24; }
</Text></span> }
</Space> @keyframes nodeGlow {
</div> 0%, 100% { filter: drop-shadow(0 0 4px var(--glow-color)); }
50% { filter: drop-shadow(0 0 12px var(--glow-color)); }
}
@keyframes pulseValue {
0%, 100% { opacity: 1; }
50% { opacity: 0.75; }
}
.ef-flow-line {
fill: none;
stroke-width: 3;
stroke-dasharray: 12 12;
animation: dashFlow 0.8s linear infinite;
}
.ef-flow-line-reverse {
fill: none;
stroke-width: 3;
stroke-dasharray: 12 12;
animation: dashFlowReverse 0.8s linear infinite;
}
.ef-flow-bg {
fill: none;
stroke-width: 6;
opacity: 0.1;
}
.ef-node-rect {
rx: 12;
ry: 12;
stroke-width: 2;
}
.ef-node-group {
animation: nodeGlow 3s ease-in-out infinite;
}
.ef-node-icon {
font-size: 22px;
text-anchor: middle;
dominant-baseline: central;
}
.ef-node-label {
fill: rgba(255,255,255,0.65);
font-size: 11px;
text-anchor: middle;
font-weight: 500;
}
.ef-node-value {
fill: #fff;
font-size: 15px;
text-anchor: middle;
font-weight: 700;
}
.ef-flow-value {
font-size: 11px;
font-weight: 600;
text-anchor: middle;
dominant-baseline: central;
}
.ef-active-value {
animation: pulseValue 2s ease-in-out infinite;
}
.ef-inactive {
opacity: 0.2;
}
`}</style>
<svg
viewBox={`0 0 ${W} ${H}`}
style={{ width: '100%', height: 'auto', maxHeight: 340 }}
xmlns="http://www.w3.org/2000/svg"
>
<defs>
{/* Glow filters */}
<filter id="glowGreen" x="-50%" y="-50%" width="200%" height="200%">
<feDropShadow dx="0" dy="0" stdDeviation="4" floodColor="#52c41a" floodOpacity="0.6" />
</filter>
<filter id="glowBlue" x="-50%" y="-50%" width="200%" height="200%">
<feDropShadow dx="0" dy="0" stdDeviation="4" floodColor="#1890ff" floodOpacity="0.6" />
</filter>
<filter id="glowOrange" x="-50%" y="-50%" width="200%" height="200%">
<feDropShadow dx="0" dy="0" stdDeviation="4" floodColor="#ff8c00" floodOpacity="0.6" />
</filter>
<filter id="glowCyan" x="-50%" y="-50%" width="200%" height="200%">
<feDropShadow dx="0" dy="0" stdDeviation="4" floodColor="#13c2c2" floodOpacity="0.6" />
</filter>
{/* Gradient for PV -> Load (green) */}
<linearGradient id="gradPvLoad" x1={nodes.pv.x} y1={nodes.pv.y} x2={nodes.load.x} y2={nodes.load.y} gradientUnits="userSpaceOnUse">
<stop offset="0%" stopColor="#52c41a" />
<stop offset="100%" stopColor="#1890ff" />
</linearGradient>
{/* Gradient for PV -> Grid (green to orange) */}
<linearGradient id="gradPvGrid" x1={nodes.pv.x} y1={nodes.pv.y} x2={nodes.grid.x} y2={nodes.grid.y} gradientUnits="userSpaceOnUse">
<stop offset="0%" stopColor="#52c41a" />
<stop offset="100%" stopColor="#ff8c00" />
</linearGradient>
{/* Gradient for Grid -> Load (orange to blue) */}
<linearGradient id="gradGridLoad" x1={nodes.grid.x} y1={nodes.grid.y} x2={nodes.load.x} y2={nodes.load.y} gradientUnits="userSpaceOnUse">
<stop offset="0%" stopColor="#ff8c00" />
<stop offset="100%" stopColor="#1890ff" />
</linearGradient>
{/* Gradient for Grid -> HeatPump (orange to cyan) */}
<linearGradient id="gradGridHp" x1={nodes.grid.x} y1={nodes.grid.y} x2={nodes.heatpump.x} y2={nodes.heatpump.y} gradientUnits="userSpaceOnUse">
<stop offset="0%" stopColor="#ff8c00" />
<stop offset="100%" stopColor="#13c2c2" />
</linearGradient>
</defs>
{/* ===== FLOW LINES ===== */}
{/* PV -> Load */}
<path
d={`M ${nodes.pv.x} ${nodes.pv.y + 30} C ${nodes.pv.x} ${nodes.pv.y + 80}, ${nodes.load.x} ${nodes.load.y - 80}, ${nodes.load.x} ${nodes.load.y - 30}`}
className="ef-flow-bg"
stroke="url(#gradPvLoad)"
/>
<path
d={`M ${nodes.pv.x} ${nodes.pv.y + 30} C ${nodes.pv.x} ${nodes.pv.y + 80}, ${nodes.load.x} ${nodes.load.y - 80}, ${nodes.load.x} ${nodes.load.y - 30}`}
className={flows.pvToLoad ? 'ef-flow-line' : 'ef-flow-line ef-inactive'}
stroke="url(#gradPvLoad)"
/>
{flows.pvToLoad && (
<text
x={(nodes.pv.x + nodes.load.x) / 2 - 40}
y={(nodes.pv.y + nodes.load.y) / 2 - 10}
className="ef-flow-value ef-active-value"
fill="#52c41a"
>
{pvToLoad.toFixed(1)} kW
</text>
)}
{/* PV -> Grid (export) */}
<path
d={`M ${nodes.pv.x} ${nodes.pv.y + 30} C ${nodes.pv.x} ${nodes.pv.y + 80}, ${nodes.grid.x} ${nodes.grid.y - 80}, ${nodes.grid.x} ${nodes.grid.y - 30}`}
className="ef-flow-bg"
stroke="url(#gradPvGrid)"
/>
<path
d={`M ${nodes.pv.x} ${nodes.pv.y + 30} C ${nodes.pv.x} ${nodes.pv.y + 80}, ${nodes.grid.x} ${nodes.grid.y - 80}, ${nodes.grid.x} ${nodes.grid.y - 30}`}
className={flows.pvToGrid ? 'ef-flow-line' : 'ef-flow-line ef-inactive'}
stroke="url(#gradPvGrid)"
/>
{flows.pvToGrid && (
<text
x={(nodes.pv.x + nodes.grid.x) / 2 + 40}
y={(nodes.pv.y + nodes.grid.y) / 2 - 10}
className="ef-flow-value ef-active-value"
fill="#ff8c00"
>
{(pvToGrid || gridExport).toFixed(1)} kW
</text>
)}
{/* Grid -> Load (import) */}
<path
d={`M ${nodes.grid.x} ${nodes.grid.y} L ${nodes.load.x + 70} ${nodes.load.y}`}
className="ef-flow-bg"
stroke="url(#gradGridLoad)"
/>
<path
d={`M ${nodes.grid.x} ${nodes.grid.y} L ${nodes.load.x + 70} ${nodes.load.y}`}
className={flows.gridToLoad ? 'ef-flow-line-reverse' : 'ef-flow-line-reverse ef-inactive'}
stroke="url(#gradGridLoad)"
/>
{flows.gridToLoad && (
<text
x={(nodes.grid.x + nodes.load.x + 70) / 2}
y={nodes.load.y - 14}
className="ef-flow-value ef-active-value"
fill="#ff8c00"
>
{gridToLoad.toFixed(1)} kW
</text>
)}
{/* Load -> HeatPump */}
<path
d={`M ${nodes.load.x} ${nodes.load.y + 30} C ${nodes.load.x} ${nodes.load.y + 70}, ${nodes.heatpump.x} ${nodes.heatpump.y - 40}, ${nodes.heatpump.x} ${nodes.heatpump.y - 20}`}
className="ef-flow-bg"
stroke="url(#gradGridHp)"
/>
<path
d={`M ${nodes.load.x} ${nodes.load.y + 30} C ${nodes.load.x} ${nodes.load.y + 70}, ${nodes.heatpump.x} ${nodes.heatpump.y - 40}, ${nodes.heatpump.x} ${nodes.heatpump.y - 20}`}
className={flows.gridToHp ? 'ef-flow-line' : 'ef-flow-line ef-inactive'}
stroke="#13c2c2"
/>
{flows.gridToHp && (
<text
x={(nodes.load.x + nodes.heatpump.x) / 2 - 20}
y={nodes.heatpump.y - 30}
className="ef-flow-value ef-active-value"
fill="#13c2c2"
>
{hp.toFixed(1)} kW
</text>
)}
{/* ===== NODES ===== */}
{/* PV Solar Node */}
<g className="ef-node-group" style={{ '--glow-color': '#52c41a' } as React.CSSProperties}>
<rect
x={nodes.pv.x - 55} y={nodes.pv.y - 28}
width={110} height={56}
className="ef-node-rect"
fill="rgba(82, 196, 26, 0.12)"
stroke="#52c41a"
filter="url(#glowGreen)"
/>
<text x={nodes.pv.x - 30} y={nodes.pv.y - 4} className="ef-node-icon"></text>
<text x={nodes.pv.x + 10} y={nodes.pv.y - 6} className="ef-node-label"></text>
<text x={nodes.pv.x} y={nodes.pv.y + 16} className="ef-node-value" fill="#52c41a">
{pv.toFixed(1)} kW
</text>
</g>
{/* Building Load Node */}
<g className="ef-node-group" style={{ '--glow-color': '#1890ff' } as React.CSSProperties}>
<rect
x={nodes.load.x - 55} y={nodes.load.y - 28}
width={110} height={56}
className="ef-node-rect"
fill="rgba(24, 144, 255, 0.12)"
stroke="#1890ff"
filter="url(#glowBlue)"
/>
<text x={nodes.load.x - 30} y={nodes.load.y - 4} className="ef-node-icon">🏢</text>
<text x={nodes.load.x + 10} y={nodes.load.y - 6} className="ef-node-label"></text>
<text x={nodes.load.x} y={nodes.load.y + 16} className="ef-node-value" fill="#1890ff">
{load.toFixed(1)} kW
</text>
</g>
{/* Grid Node */}
<g className="ef-node-group" style={{ '--glow-color': '#ff8c00' } as React.CSSProperties}>
<rect
x={nodes.grid.x - 55} y={nodes.grid.y - 28}
width={110} height={56}
className="ef-node-rect"
fill="rgba(255, 140, 0, 0.12)"
stroke="#ff8c00"
filter="url(#glowOrange)"
/>
<text x={nodes.grid.x - 30} y={nodes.grid.y - 4} className="ef-node-icon"></text>
<text x={nodes.grid.x + 10} y={nodes.grid.y - 6} className="ef-node-label">
{grid >= 0 ? '电网购入' : '电网输出'}
</text>
<text x={nodes.grid.x} y={nodes.grid.y + 16} className="ef-node-value" fill="#ff8c00">
{Math.abs(grid).toFixed(1)} kW
</text>
</g>
{/* HeatPump Node */}
<g className="ef-node-group" style={{ '--glow-color': '#13c2c2' } as React.CSSProperties}>
<rect
x={nodes.heatpump.x - 55} y={nodes.heatpump.y - 28}
width={110} height={56}
className="ef-node-rect"
fill="rgba(19, 194, 194, 0.12)"
stroke="#13c2c2"
filter="url(#glowCyan)"
/>
<text x={nodes.heatpump.x - 30} y={nodes.heatpump.y - 4} className="ef-node-icon">🔥</text>
<text x={nodes.heatpump.x + 10} y={nodes.heatpump.y - 6} className="ef-node-label"></text>
<text x={nodes.heatpump.x} y={nodes.heatpump.y + 16} className="ef-node-value" fill="#13c2c2">
{hp.toFixed(1)} kW
</text>
</g>
{/* Self-consumption badge */}
<rect x={W / 2 - 60} y={H / 2 - 14} width={120} height={28} rx={14}
fill="rgba(82, 196, 26, 0.15)" stroke="#52c41a" strokeWidth={1} />
<text x={W / 2} y={H / 2 + 4} textAnchor="middle" fill="#52c41a"
fontSize={12} fontWeight={600}>
{selfUseRate}%
</text>
</svg>
</div> </div>
); );
} }

View File

@@ -0,0 +1,94 @@
import { useEffect, useState } from 'react';
import { Card, Space, Typography } from 'antd';
import { getWeatherCurrent } from '../../../services/api';
const { Text } = Typography;
interface WeatherInfo {
temperature: number;
humidity: number;
condition: string;
icon: string;
}
function getTimeBasedWeather(): WeatherInfo {
const hour = new Date().getHours();
if (hour >= 6 && hour < 18) {
return {
temperature: Math.round(20 + Math.random() * 8),
humidity: Math.round(40 + Math.random() * 20),
condition: '晴',
icon: '\u2600\uFE0F',
};
}
return {
temperature: Math.round(12 + Math.random() * 6),
humidity: Math.round(50 + Math.random() * 20),
condition: '晴',
icon: '\uD83C\uDF19',
};
}
export default function WeatherWidget() {
const [weather, setWeather] = useState<WeatherInfo | null>(null);
useEffect(() => {
let mounted = true;
const fetchWeather = async () => {
try {
const res: any = await getWeatherCurrent();
if (!mounted) return;
const conditionMap: Record<string, { label: string; icon: string }> = {
sunny: { label: '晴', icon: '\u2600\uFE0F' },
cloudy: { label: '多云', icon: '\u26C5' },
overcast: { label: '阴', icon: '\u2601\uFE0F' },
rainy: { label: '雨', icon: '\uD83C\uDF27\uFE0F' },
clear: { label: '晴', icon: '\uD83C\uDF19' },
};
const cond = conditionMap[res?.condition] || conditionMap['sunny']!;
setWeather({
temperature: Math.round(res?.temperature ?? 22),
humidity: Math.round(res?.humidity ?? 50),
condition: cond.label,
icon: cond.icon,
});
} catch {
if (!mounted) return;
setWeather(getTimeBasedWeather());
}
};
fetchWeather();
const timer = setInterval(fetchWeather, 300000); // refresh every 5 min
return () => { mounted = false; clearInterval(timer); };
}, []);
if (!weather) return null;
return (
<Card
size="small"
bordered={false}
style={{
background: 'linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%)',
borderRadius: 8,
display: 'inline-flex',
alignItems: 'center',
padding: '0 4px',
}}
bodyStyle={{ padding: '8px 16px' }}
>
<Space size={16} align="center">
<span style={{ fontSize: 28, lineHeight: 1 }}>{weather.icon}</span>
<div>
<Text strong style={{ fontSize: 18 }}>{weather.temperature}°C</Text>
<Text type="secondary" style={{ marginLeft: 8 }}>{weather.condition}</Text>
</div>
<Text type="secondary" style={{ fontSize: 13 }}>
湿 {weather.humidity}%
</Text>
</Space>
</Card>
);
}

View File

@@ -4,12 +4,13 @@ import {
ThunderboltOutlined, FireOutlined, CloudOutlined, AlertOutlined, ThunderboltOutlined, FireOutlined, CloudOutlined, AlertOutlined,
WarningOutlined, CloseCircleOutlined, WarningOutlined, CloseCircleOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import { getDashboardOverview, getRealtimeData, getLoadCurve } from '../../services/api'; import { getDashboardOverview, getRealtimeData, getLoadCurve, getSolarKpis } from '../../services/api';
import EnergyOverview from './components/EnergyOverview'; import EnergyOverview from './components/EnergyOverview';
import PowerGeneration from './components/PowerGeneration'; import PowerGeneration from './components/PowerGeneration';
import LoadCurve from './components/LoadCurve'; import LoadCurve from './components/LoadCurve';
import DeviceStatus from './components/DeviceStatus'; import DeviceStatus from './components/DeviceStatus';
import EnergyFlow from './components/EnergyFlow'; import EnergyFlow from './components/EnergyFlow';
import WeatherWidget from './components/WeatherWidget';
const { Title } = Typography; const { Title } = Typography;
@@ -18,6 +19,7 @@ export default function Dashboard() {
const [realtime, setRealtime] = useState<any>(null); const [realtime, setRealtime] = useState<any>(null);
const [loadData, setLoadData] = useState<any[]>([]); const [loadData, setLoadData] = useState<any[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [kpis, setKpis] = useState<any>(null);
const fetchData = async () => { const fetchData = async () => {
try { try {
@@ -42,6 +44,14 @@ export default function Dashboard() {
return () => clearInterval(timer); return () => clearInterval(timer);
}, []); }, []);
useEffect(() => {
getSolarKpis().then(setKpis).catch(() => {});
const timer = setInterval(() => {
getSolarKpis().then(setKpis).catch(() => {});
}, 60000);
return () => clearInterval(timer);
}, []);
if (loading) return <Spin size="large" style={{ display: 'block', margin: '200px auto' }} />; if (loading) return <Spin size="large" style={{ display: 'block', margin: '200px auto' }} />;
const ds = overview?.device_stats || {}; const ds = overview?.device_stats || {};
@@ -50,10 +60,13 @@ export default function Dashboard() {
return ( return (
<div> <div>
<Title level={4} style={{ marginBottom: 16 }}> <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 16 }}>
<ThunderboltOutlined style={{ color: '#1890ff', marginRight: 8 }} /> <Title level={4} style={{ margin: 0 }}>
<ThunderboltOutlined style={{ color: '#1890ff', marginRight: 8 }} />
</Title>
</Title>
<WeatherWidget />
</div>
{/* 核心指标卡片 */} {/* 核心指标卡片 */}
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
@@ -84,6 +97,51 @@ export default function Dashboard() {
</Col> </Col>
</Row> </Row>
{/* 光伏 KPI */}
<Row gutter={[16, 16]} style={{ marginTop: 16 }}>
<Col xs={24} sm={12} lg={6}>
<Card size="small">
<Statistic
title="性能比 (PR)"
value={kpis?.pr || 0}
suffix="%"
valueStyle={{ color: (kpis?.pr || 0) > 75 ? '#52c41a' : (kpis?.pr || 0) > 50 ? '#faad14' : '#f5222d' }}
/>
</Card>
</Col>
<Col xs={24} sm={12} lg={6}>
<Card size="small">
<Statistic
title="等效利用小时"
value={kpis?.equivalent_hours || 0}
suffix="h"
precision={1}
/>
</Card>
</Col>
<Col xs={24} sm={12} lg={6}>
<Card size="small">
<Statistic
title="今日收益"
value={kpis?.revenue_today || 0}
prefix="¥"
precision={0}
valueStyle={{ color: '#52c41a' }}
/>
</Card>
</Col>
<Col xs={24} sm={12} lg={6}>
<Card size="small">
<Statistic
title="自消纳率"
value={kpis?.self_consumption_rate || 0}
suffix="%"
valueStyle={{ color: '#52c41a' }}
/>
</Card>
</Col>
</Row>
{/* 图表区域 */} {/* 图表区域 */}
<Row gutter={[16, 16]} style={{ marginTop: 16 }}> <Row gutter={[16, 16]} style={{ marginTop: 16 }}>
<Col xs={24} lg={16}> <Col xs={24} lg={16}>

View File

@@ -1,6 +1,6 @@
import { useEffect, useState, useCallback } from 'react'; import { useEffect, useState, useCallback } from 'react';
import { Card, Row, Col, Tree, Checkbox, DatePicker, Select, Button, Table, Space, message } from 'antd'; import { Card, Row, Col, Tree, Checkbox, DatePicker, Select, Button, Table, Space, message, Modal, Input, Popconfirm } from 'antd';
import { SearchOutlined, DownloadOutlined } from '@ant-design/icons'; import { SearchOutlined, DownloadOutlined, SaveOutlined, FolderOpenOutlined, DeleteOutlined } from '@ant-design/icons';
import ReactECharts from 'echarts-for-react'; import ReactECharts from 'echarts-for-react';
import dayjs, { type Dayjs } from 'dayjs'; import dayjs, { type Dayjs } from 'dayjs';
import { getDeviceGroups, getDevices, queryElectricalParams, exportEnergyData } from '../../services/api'; import { getDeviceGroups, getDevices, queryElectricalParams, exportEnergyData } from '../../services/api';
@@ -37,6 +37,30 @@ const GRANULARITY_OPTIONS = [
{ label: '按天', value: 'day' }, { label: '按天', value: 'day' },
]; ];
interface CurveTemplate {
id: string;
name: string;
deviceId: number | null;
dataTypes: string[];
timeRange: string;
granularity: string;
createdAt: string;
}
const STORAGE_KEY = 'zpark-curve-templates';
function loadTemplates(): CurveTemplate[] {
try {
return JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]');
} catch {
return [];
}
}
function saveTemplates(templates: CurveTemplate[]) {
localStorage.setItem(STORAGE_KEY, JSON.stringify(templates));
}
export default function DataQuery() { export default function DataQuery() {
const [treeData, setTreeData] = useState<DataNode[]>([]); const [treeData, setTreeData] = useState<DataNode[]>([]);
const [deviceMap, setDeviceMap] = useState<Record<number, any>>({}); const [deviceMap, setDeviceMap] = useState<Record<number, any>>({});
@@ -50,6 +74,9 @@ export default function DataQuery() {
const [chartData, setChartData] = useState<Record<string, any[]>>({}); const [chartData, setChartData] = useState<Record<string, any[]>>({});
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [exporting, setExporting] = useState(false); const [exporting, setExporting] = useState(false);
const [templates, setTemplates] = useState<CurveTemplate[]>(loadTemplates);
const [saveModalOpen, setSaveModalOpen] = useState(false);
const [templateName, setTemplateName] = useState('');
useEffect(() => { useEffect(() => {
loadTree(); loadTree();
@@ -132,6 +159,44 @@ export default function DataQuery() {
} }
}; };
const handleSaveTemplate = () => {
if (!templateName.trim()) {
message.warning('请输入模板名称');
return;
}
const newTemplate: CurveTemplate = {
id: Date.now().toString(),
name: templateName.trim(),
deviceId: selectedDeviceId,
dataTypes: selectedParams,
timeRange: granularity,
granularity,
createdAt: new Date().toISOString(),
};
const updated = [...templates, newTemplate];
setTemplates(updated);
saveTemplates(updated);
setSaveModalOpen(false);
setTemplateName('');
message.success('模板已保存');
};
const handleLoadTemplate = (templateId: string) => {
const tpl = templates.find(t => t.id === templateId);
if (!tpl) return;
if (tpl.deviceId) setSelectedDeviceId(tpl.deviceId);
if (tpl.dataTypes?.length) setSelectedParams(tpl.dataTypes);
if (tpl.granularity) setGranularity(tpl.granularity);
message.success(`已加载模板: ${tpl.name}`);
};
const handleDeleteTemplate = (templateId: string) => {
const updated = templates.filter(t => t.id !== templateId);
setTemplates(updated);
saveTemplates(updated);
message.success('模板已删除');
};
const handleQuery = useCallback(async () => { const handleQuery = useCallback(async () => {
if (!selectedDeviceId) { if (!selectedDeviceId) {
message.warning('请先选择设备'); message.warning('请先选择设备');
@@ -339,6 +404,37 @@ export default function DataQuery() {
<Button icon={<DownloadOutlined />} loading={exporting} onClick={() => handleExport('xlsx')}> <Button icon={<DownloadOutlined />} loading={exporting} onClick={() => handleExport('xlsx')}>
Excel Excel
</Button> </Button>
<Button icon={<SaveOutlined />} onClick={() => setSaveModalOpen(true)}>
</Button>
{templates.length > 0 && (
<Select
placeholder="我的模板"
style={{ width: 180 }}
value={undefined}
onChange={handleLoadTemplate}
suffixIcon={<FolderOpenOutlined />}
optionLabelProp="label"
>
{templates.map(t => (
<Select.Option key={t.id} value={t.id} label={t.name}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<span>{t.name}</span>
<Popconfirm
title="确定删除此模板?"
onConfirm={(e) => { e?.stopPropagation(); handleDeleteTemplate(t.id); }}
onCancel={(e) => e?.stopPropagation()}
>
<DeleteOutlined
style={{ color: '#ff4d4f', fontSize: 12 }}
onClick={(e) => e.stopPropagation()}
/>
</Popconfirm>
</div>
</Select.Option>
))}
</Select>
)}
</Space> </Space>
</Card> </Card>
@@ -360,6 +456,26 @@ export default function DataQuery() {
</> </>
)} )}
</Col> </Col>
<Modal
title="保存查询模板"
open={saveModalOpen}
onOk={handleSaveTemplate}
onCancel={() => { setSaveModalOpen(false); setTemplateName(''); }}
okText="保存"
cancelText="取消"
>
<Input
placeholder="请输入模板名称"
value={templateName}
onChange={(e) => setTemplateName(e.target.value)}
onPressEnter={handleSaveTemplate}
maxLength={30}
/>
<div style={{ marginTop: 12, color: '#999', fontSize: 13 }}>
将保存: 当前设备 {selectedDevice ? selectedDevice.name : '(未选择)'}
[{selectedParams.join(', ')}] {granularity}
</div>
</Modal>
</Row> </Row>
); );
} }

View File

@@ -1,8 +1,8 @@
import { useState } from 'react'; import { useState, useEffect } from 'react';
import { Form, Input, Button, Card, message, Typography } from 'antd'; import { Form, Input, Button, Card, message, Typography } from 'antd';
import { UserOutlined, LockOutlined, ThunderboltOutlined } from '@ant-design/icons'; import { UserOutlined, LockOutlined, ThunderboltOutlined } from '@ant-design/icons';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { login } from '../../services/api'; import { login, getVersion } from '../../services/api';
import { setToken, setUser } from '../../utils/auth'; import { setToken, setUser } from '../../utils/auth';
const { Title, Text } = Typography; const { Title, Text } = Typography;
@@ -10,8 +10,13 @@ const { Title, Text } = Typography;
export default function LoginPage() { export default function LoginPage() {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [guestLoading, setGuestLoading] = useState(false); const [guestLoading, setGuestLoading] = useState(false);
const [versionInfo, setVersionInfo] = useState<any>(null);
const navigate = useNavigate(); const navigate = useNavigate();
useEffect(() => {
getVersion().then(setVersionInfo).catch(() => {});
}, []);
const doLogin = async (username: string, password: string) => { const doLogin = async (username: string, password: string) => {
const res: any = await login(username, password); const res: any = await login(username, password);
setToken(res.access_token); setToken(res.access_token);
@@ -82,6 +87,11 @@ export default function LoginPage() {
</Text> </Text>
</div> </div>
</Form> </Form>
{versionInfo && (
<div style={{ textAlign: 'center', marginTop: 16, opacity: 0.4, fontSize: 11 }}>
v{versionInfo.project_version} | Core: v{versionInfo.core_version || '—'}
</div>
)}
</Card> </Card>
</div> </div>
); );

View File

@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Card, Form, Input, InputNumber, Switch, Select, Button, message, Spin, Row, Col } from 'antd'; import { Card, Form, Input, InputNumber, Switch, Select, Button, message, Spin, Row, Col, Descriptions } from 'antd';
import { SaveOutlined } from '@ant-design/icons'; import { SaveOutlined } from '@ant-design/icons';
import { getSettings, updateSettings } from '../../services/api'; import { getSettings, updateSettings, getVersion } from '../../services/api';
import { getUser } from '../../utils/auth'; import { getUser } from '../../utils/auth';
const TIMEZONE_OPTIONS = [ const TIMEZONE_OPTIONS = [
@@ -17,11 +17,13 @@ export default function SystemSettings() {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);
const [versionInfo, setVersionInfo] = useState<any>(null);
const user = getUser(); const user = getUser();
const isAdmin = user?.role === 'admin'; const isAdmin = user?.role === 'admin';
useEffect(() => { useEffect(() => {
loadSettings(); loadSettings();
getVersion().then(setVersionInfo).catch(() => {});
}, []); }, []);
const loadSettings = async () => { const loadSettings = async () => {
@@ -105,6 +107,18 @@ export default function SystemSettings() {
</Button> </Button>
</div> </div>
)} )}
{versionInfo && (
<Card title="平台版本信息" size="small" style={{ marginTop: 16 }}>
<Descriptions column={2} size="small">
<Descriptions.Item label="项目">zpark-ems</Descriptions.Item>
<Descriptions.Item label="版本">{versionInfo.project_version || '—'}</Descriptions.Item>
<Descriptions.Item label="Core 版本">{versionInfo.core_version || '—'}</Descriptions.Item>
<Descriptions.Item label="前端模板">{versionInfo.frontend_template_version || '—'}</Descriptions.Item>
<Descriptions.Item label="最后更新">{versionInfo.last_updated || '—'}</Descriptions.Item>
</Descriptions>
</Card>
)}
</Form> </Form>
); );
} }

View File

@@ -24,6 +24,12 @@ api.interceptors.response.use(
} }
); );
// Version info (no auth needed)
export const getVersion = () => api.get('/version');
// Solar KPIs
export const getSolarKpis = () => api.get('/kpi/solar');
// Branding // Branding
export const getBranding = () => api.get('/branding'); export const getBranding = () => api.get('/branding');