diff --git a/src/api/deviceAccess.ts b/src/api/deviceAccess.ts index fefb849..e7722e6 100644 --- a/src/api/deviceAccess.ts +++ b/src/api/deviceAccess.ts @@ -28,6 +28,17 @@ export function updateDeviceModel(data) { }); } +//产品增加 + + +export function addProduct(data) { + return request({ + url: '/system/product/add', + method: 'post', + data + }); +} + diff --git a/src/components/SystemSetting/BasicSettings.tsx b/src/components/SystemSetting/BasicSettings.tsx new file mode 100644 index 0000000..0cdba2d --- /dev/null +++ b/src/components/SystemSetting/BasicSettings.tsx @@ -0,0 +1,397 @@ +import React, { useState } from 'react'; +import { + Form, + Input, + Select, + Switch, + Button, + Row, + Col, + Card as AntdCard, + Tag, + Table, + message, + Typography, + Space, + Modal, +} from 'antd'; +import { + CloudOutlined, + TeamOutlined, + BellOutlined, + DatabaseOutlined, + CalendarOutlined, + CheckCircleOutlined, + SyncOutlined, + DownloadOutlined, + FileTextOutlined, + DeleteOutlined, + RestOutlined, +} from '@ant-design/icons'; + +const { Text } = Typography; + +const BasicSettings = () => { + const [form] = Form.useForm(); + const handleSave = () => { + message.success('设置已保存'); + }; + + // 设备接入状态数据 + const deviceStatusData = [ + { name: '逆变器', count: '5/5', status: '正常', color: '#52c41a' }, + { name: '汇流箱', count: '20/20', status: '正常', color: '#52c41a' }, + { name: '摄像头', count: '12/12', status: '正常', color: '#52c41a' }, + { name: '无人机', count: '2/2', status: '正常', color: '#52c41a' }, + { name: 'API接口', count: '正常', status: '正常', color: '#52c41a' }, + { name: 'Modbus', count: '正常', status: '正常', color: '#52c41a' }, + ]; + + // 服务配置数据 + const serviceConfigData = [ + { name: 'MQTT配置', value: 'tcp://localhost:1883', status: '离线', statusColor: '#8c8c8c' }, + { name: '视频服务配置', value: '待接入 RTSP / WebRTC 服务', status: '待处理', statusColor: '#fa8c16' }, + { name: 'AI服务配置', value: 'http://ai-service.local', status: '待处理', statusColor: '#fa8c16' }, + { name: 'API密钥管理', value: '正常', status: '正常', statusColor: '#52c41a' }, + ]; + + // 视频服务配置数据 + const videoServiceData = [ + { name: '视频服务数', value: '1' }, + { name: '启用服务数', value: '1' }, + { name: '摄像头总数', value: '3' }, + { name: '离线摄像头', value: '3' }, + { name: '在线流数量', value: '0' }, + { name: '服务状态', value: 'ONLINE', statusColor: '#52c41a' }, + { name: 'API地址', value: 'http://127.0.0.1:9997' }, + { name: 'HLS地址', value: 'http://127.0.0.1:8888' }, + { name: 'WebRTC地址', value: 'http://127.0.0.1:8889' }, + { name: '检测结果', value: 'HTTP 401 - http://127.0.0.1...' }, + ]; + + // MQTT接入状态数据 + const mqttStatusData = [ + { name: '启用状态', value: '已启用', statusColor: '#52c41a' }, + { name: '连接状态', value: '已连接', statusColor: '#52c41a' }, + { name: 'Broker', value: 'tcp://localhost:1883' }, + { name: '客户端ID', value: 'solar-platform-backend' }, + { name: '遥测主题', value: 'pv/+/device/+/telemetry' }, + { name: '状态主题', value: 'pv/+/device/+/status' }, + { name: '最近连接', value: '2026-05-07 18:30:40' }, + { name: '最近错误', value: '-' }, + ]; + + // MQTT消息日志数据 + const mqttLogData = [ + { topic: 'pv/1/device/ROBOT-01/ack', device: 'ROBOT-01', type: 'ACK', parse: 'SUCCESS' }, + { topic: 'pv/1/device/ROBOT-01/ack', device: 'ROBOT-01', type: 'ACK', parse: 'SUCCESS' }, + { topic: 'pv/1/device/CAM-02/status', device: 'CAM-02', type: 'STATUS', parse: 'SUCCESS' }, + { topic: 'pv/1/device/INV-A02/telemetry', device: 'INV-A02', type: 'TELEMETRY', parse: 'SUCCESS' }, + ]; + + // WebSocket状态数据 + const wsStatusData = [ + { name: '服务状态', value: '已启用', statusColor: '#52c41a' }, + { name: '前端连接', value: '已连接', statusColor: '#52c41a' }, + { name: 'Endpoint', value: '/ws/pv' }, + { name: '在线连接数', value: '2' }, + { name: '最近推送', value: '-' }, + { name: '推送时间', value: '-' }, + { name: '前端端点', value: 'ws://47.100.102.7:10469/de...' }, + { name: '最近错误', value: '-' }, + ]; + + return ( +
+ {/* 顶部卡片 */} + + + + +
+ +
+
+
当前版本
+
v2.8.1 最新版
+
+
+
+ + + + +
+ +
+
+
在线用户
+
12 ↑ 2
+
+
+
+ + + + +
+ +
+
+
告警通道
+
3 / 4 正常
+
+
+
+ + + + +
+ +
+
+
数据备份状态
+
正常 ●
+
+
+
+ + + + +
+ +
+
+
最近更新
+
2025-05-20
+
+
+
+ +
+ + + {/* 左侧主内容 */} + + {/* 平台参数 */} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + {/* 通知与告警策略 */} + + + +
+ 短信 + +
+ + +
+ 邮件 + +
+ + +
+ 企业微信 + +
+ +
+ + +
+ 系统通知 + +
+ + +
+ 严重告警立即通知 + +
+ + +
+ 通信中断通知 + +
+ +
+
+ + {/* 用户与权限预览 */} + + {text} }, + ]} + dataSource={[ + { name: '张运维', role: '超级管理员', phone: '138****0001', status: '在线' }, + { name: '李工程师', role: '运维工程师', phone: '139****0002', status: '在线' }, + { name: '王班长', role: '巡检主管', phone: '137****0003', status: '在线' }, + { name: '赵分析师', role: '数据分析师', phone: '136****0004', status: '在线' }, + ]} + /> + + + + {/* 右侧边栏 */} + + {/* 设备接入状态 */} + + + {deviceStatusData.map((item, index) => ( + +
+
{item.name}
+
{item.count}
+
{item.status}
+
+ + ))} + + + + {/* 服务配置展示 */} + + {serviceConfigData.map((item, index) => ( +
+
+
{item.name}
+
{item.value}
+
+ {item.status} +
+ ))} +
+ + {/* 视频服务配置状态 */} + +
来自 /pv/video/summary 与 /pv/video/media-server/list
+ + {videoServiceData.map((item, index) => ( +
+
+
{item.name}
+
{item.value}
+
+ + ))} + + + + + {/* MQTT接入状态 */} + +
来自 /pv/mqtt/status,后端未登录时显示预览兜底数据
+ + {mqttStatusData.map((item, index) => ( +
+
+
{item.name}
+
{item.value}
+
+ + ))} + + + + {/* MQTT消息日志 */} + +
阶段3A用于验证遥测原始消息落库
+
+ + + {/* WebSocket实时推送 */} + +
来自 /pv/ws/status,并显示前端本地连接状态
+ + {wsStatusData.map((item, index) => ( +
+
+
{item.name}
+
{item.value}
+
+ + ))} + + + + {/* 系统维护 */} + + + + + + + + + + + + + + + + + + + + ); +}; + +export default BasicSettings; diff --git a/src/components/SystemSetting/DeviceAccessPage.tsx b/src/components/SystemSetting/DeviceAccessPage.tsx index a477ec4..230d9aa 100644 --- a/src/components/SystemSetting/DeviceAccessPage.tsx +++ b/src/components/SystemSetting/DeviceAccessPage.tsx @@ -7,7 +7,7 @@ import { PlusOutlined, EditOutlined, DeleteOutlined, ProductOutlined, AppstoreOutlined, SwapOutlined, VideoCameraOutlined } from '@ant-design/icons'; -import { addDeviceModel, getDeviceModelList } from '../../api/deviceAccess.ts'; +import { addDeviceModel, getDeviceModelList, updateDeviceModel } from '../../api/deviceAccess.ts'; const { Option } = Select; const { TabPane } = Tabs; @@ -116,13 +116,26 @@ export default function DeviceAccessPage() { const [filterForm] = Form.useForm(); const [filteredModelList, setFilteredModelList] = useState(modelList); - // ========== 物模型分页(只加这里) ========== + // ========== 物模型分页 ========== const [pagination, setPagination] = useState({ current: 1, pageSize: 10, - total: modelList.length, + total: 0, }); + // 删除物模型 + const handleDeleteModel = (id) => { + // 这里替换成你的真实删除接口 + //deleteDeviceModel(id).then(res => { + // if (res.code === 200) { + // message.success('删除成功'); + // getModel(); // 删除后刷新列表 + // } else { + // message.error('删除失败:' + res.msg); + // } + //}).catch(() => message.error('删除请求异常')); + }; + // 打开弹窗 const openModal = (type: string, record?: any) => { setModalType(type); @@ -131,7 +144,25 @@ export default function DeviceAccessPage() { if (record) { form.setFieldsValue(record); - if (type === 'model') setModelDetail(modelDetailList[record.id] || { props: [], events: [], actions: [] }); + if (type === 'model') { + // 接口数据 → 前端格式转换 + const props = record.supportProperties?.map(p => ({ + id: p.id, + code: p.propertyKey, + name: p.propertyName, + type: p.dataType, + unit: p.unit, + required: p.required, + defaultValue: p.defaultValue, + isAlarm: p.isAlarm + })) || []; + const actions = record.supportActions?.map(a => ({ + actionId: a.actionId, + actionName: a.actionName, + params: a.params || {} + })) || []; + setModelDetail({ props, events: [], actions }); + } if (type === 'device') { setDeviceProtocol(record.protocolType); setModelDetail(modelDetailList[record.modelId] || { props: [] }); @@ -155,10 +186,9 @@ export default function DeviceAccessPage() { connectType: values.connectType || '', }; getDeviceModelList(params).then(res => { - // 接口返回格式自行替换:res.list / res.total if (res.code === 200) { - // setFilteredModelList(res.data.list); - // setPagination(prev => ({ ...prev, total: res.data.total })); + setFilteredModelList(res.rows); + setPagination(prev => ({ ...prev, total: res.total })); } }); }; @@ -166,14 +196,14 @@ export default function DeviceAccessPage() { // 筛选 const handleFilter = () => { setPagination(prev => ({ ...prev, current: 1 })); - setTimeout(() => getModel(), 0); + getModel(); }; // 重置 const handleReset = () => { filterForm.resetFields(); setPagination(prev => ({ ...prev, current: 1 })); - setTimeout(() => getModel(), 0); + getModel(); }; // 分页切换 @@ -187,6 +217,7 @@ export default function DeviceAccessPage() { form.validateFields().then(values => { if (modalType === 'model') { const submitData = { + id: editData?.id, name: values.name, connectType: values.connectType, version: '1.0', @@ -206,12 +237,25 @@ export default function DeviceAccessPage() { params: act.params || {} })) }; - addDeviceModel(submitData).then(res => { - if (res.code === 200) { - message.success('物模型保存成功'); - getModel(); // 保存后刷新列表 - } - }); + if (editData) { + // 编辑:调用 updateDeviceModel,自动带 id + updateDeviceModel(submitData).then(res => { + if (res.code === 200) { + message.success('编辑成功'); + getModel(); + setVisible(false); + } + }); + } else { + // 新增 + addDeviceModel(submitData).then(res => { + if (res.code === 200) { + message.success('新增成功'); + getModel(); + setVisible(false); + } + }); + } console.log('✅ 提交物模型', submitData); } setVisible(false); @@ -272,7 +316,7 @@ export default function DeviceAccessPage() { if (activeTab === 'model') { getModel(); } - }, [ pagination.pageSize, activeTab]); + }, [pagination.current, pagination.pageSize, activeTab]); // 表格列 const deviceColumns = [ @@ -301,11 +345,58 @@ export default function DeviceAccessPage() { } ]; + // ====================== 已增加属性列 + 指令列 ====================== const modelColumns = [ { title: '模型名称', dataIndex: 'name' }, { title: '连接协议', dataIndex: 'connectType' }, - { title: '操作', render: r => } - ]; + { + title: '属性列表', + width: 300, + render: (record) => { + const list = record.supportProperties || []; + if (list.length === 0) return 无属性; + return ( + + {list.map(item => ( + {item.propertyName} + ))} + + ); + } + }, + { + title: '指令列表', + width: 300, + render: (record) => { + const list = record.supportActions || []; + if (list.length === 0) return 无指令; + return ( + + {list.map(item => ( + {item.actionName} + ))} + + ); + } + }, + { + title: '操作', + render: r => ( + + + + {/* 增加删除按钮 + 确认框 */} + handleDeleteModel(r.id)} + okText="确定" + cancelText="取消" + > + + + + ) + }]; return (
diff --git a/src/components/SystemSetting/DeviceManagement.tsx b/src/components/SystemSetting/DeviceManagement.tsx new file mode 100644 index 0000000..546a50b --- /dev/null +++ b/src/components/SystemSetting/DeviceManagement.tsx @@ -0,0 +1,183 @@ +import React, { useState } from 'react'; +import { + Table, + Input, + Button, + Form, + Select, + Space, + Tag, + message, + Modal, + Tabs, +} from 'antd'; +import { + SearchOutlined, + ReloadOutlined, + PlusOutlined, + EditOutlined, + DeleteOutlined, +} from '@ant-design/icons'; + +// 模拟数据 +const allDeviceList = [ + { id: 1, code: 'CAM-01', name: '摄像头 CAM-01', type: 'CAMERA', online: 'ONLINE', status: 'NORMAL' }, + { id: 2, code: 'CAM-02', name: '摄像头 CAM-02', type: 'CAMERA', online: 'OFFLINE', status: 'FAULT' }, + { id: 3, code: 'CAM-03', name: '摄像头 CAM-03', type: 'CAMERA', online: 'ONLINE', status: 'NORMAL' }, + { id: 4, code: 'CLEAN-01', name: '清洗机器人 CLEAN-01', type: 'CLEANING_DEVICE', online: 'ONLINE', status: 'IDLE' }, + { id: 5, code: 'CMB-A01', name: '汇流箱 CMB-A01', type: 'COMBINER_BOX', online: 'ONLINE', status: 'WARNING' }, + { id: 6, code: 'CMB-A02', name: '汇流箱 CMB-A02', type: 'COMBINER_BOX', online: 'ONLINE', status: 'NORMAL' }, + { id: 7, code: 'INV-A01', name: '逆变器 INV-A01', type: 'INVERTER', online: 'ONLINE', status: 'NORMAL' }, + { id: 8, code: 'INV-A02', name: '逆变器 INV-A02', type: 'INVERTER', online: 'ONLINE', status: 'WARNING' }, + { id: 9, code: 'INV-B01', name: '逆变器 INV-B01', type: 'INVERTER', online: 'ONLINE', status: 'NORMAL' }, + { id: 10, code: 'METER-01', name: '电表 METER-01', type: 'METER', online: 'ONLINE', status: 'NORMAL' }, + { id: 11, code: 'ROBOT-01', name: '运维机器人 ROBOT-01', type: 'ROBOT', online: 'ONLINE', status: 'IDLE' }, + { id: 12, code: 'DRONE-01', name: '无人机 DRONE-01', type: 'DRONE', online: 'OFFLINE', status: 'FAULT' }, + { id: 13, code: 'WEATHER-01', name: '气象站 WEATHER-01', type: 'WEATHER_STATION', online: 'ONLINE', status: 'NORMAL' }, +]; + +// Tab 配置 +const tabs = [ + { key: 'all', label: '设备管理', filter: () => true }, + { key: 'camera', label: '摄像头管理', filter: (item) => item.type === 'CAMERA' }, + { key: 'smart', label: '智能装备', filter: (item) => ['CLEANING_DEVICE', 'ROBOT', 'DRONE'].includes(item.type) }, +]; + +export default function DeviceManagementPage() { + const [activeTab, setActiveTab] = useState('all'); + const [form] = Form.useForm(); + const [loading, setLoading] = useState(false); + const [deviceList, setDeviceList] = useState(allDeviceList); + + // 根据 Tab 过滤数据 + const filteredByTab = deviceList.filter(tabs.find(t => t.key === activeTab).filter); + + // 表格列定义 + const columns = [ + { title: '设备编码', dataIndex: 'code', key: 'code' }, + { title: '设备名称', dataIndex: 'name', key: 'name' }, + { title: '类型', dataIndex: 'type', key: 'type' }, + { + title: '在线', + dataIndex: 'online', + key: 'online', + render: (text) => ( + {text} + ), + }, + { + title: '运行', + dataIndex: 'status', + key: 'status', + render: (text) => { + const colorMap = { + NORMAL: 'green', + FAULT: 'red', + WARNING: 'orange', + IDLE: 'blue', + }; + return {text}; + }, + }, + { + title: '操作', + key: 'action', + render: (_, record) => ( + + + + + ), + }, + ]; + + // 查询 + const handleSearch = () => { + form.validateFields().then(values => { + const keyword = values.keyword?.toLowerCase() || ''; + setLoading(true); + setTimeout(() => { + const filtered = allDeviceList.filter(item => + item.name.toLowerCase().includes(keyword) || item.code.toLowerCase().includes(keyword) + ); + setDeviceList(filtered); + setLoading(false); + }, 300); + }); + }; + + // 重置 + const handleReset = () => { + form.resetFields(); + setDeviceList(allDeviceList); + }; + + // 新增 + const handleAdd = () => { + message.info('打开新增设备弹窗'); + }; + + // 编辑 + const handleEdit = (record) => { + message.info(`编辑设备:${record.name}`); + }; + + // 删除 + const handleDelete = (record) => { + Modal.confirm({ + title: '确认删除', + content: `确定要删除设备 ${record.name} 吗?`, + onOk: () => { + message.success(`设备 ${record.name} 已删除`); + setDeviceList(prev => prev.filter(item => item.id !== record.id)); + }, + }); + }; + + return ( +
+ + + + + + + {/* 筛选栏 */} +
+
+ + + + + + + + + + + + + +
+ + {/* 表格 */} +
`共 ${total} 条`, + }} + /> + + ); +} diff --git a/src/pages/ReportCenter.tsx b/src/pages/ReportCenter.tsx index fc45678..68bd6d3 100644 --- a/src/pages/ReportCenter.tsx +++ b/src/pages/ReportCenter.tsx @@ -129,10 +129,10 @@ export default function ReportCenterPage() { value={overviewData.powerToday} precision={1} suffix="kWh" - valueStyle={{ color: '#52c41a', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#52c41a', fontSize: 24, fontWeight: 700 }} prefix={} /> -
遥测与 latest 聚合
+
遥测与 latest 聚合
@@ -150,10 +150,10 @@ export default function ReportCenterPage() { value={overviewData.currentPower} precision={1} suffix="kW" - valueStyle={{ color: '#1890ff', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#1890ff', fontSize: 24, fontWeight: 700 }} prefix={} /> -
实时功率汇总
+
实时功率汇总
@@ -170,10 +170,10 @@ export default function ReportCenterPage() { title="当前告警" value={overviewData.currentAlarm} suffix="条" - valueStyle={{ color: '#ff4d4f', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#ff4d4f', fontSize: 24, fontWeight: 700 }} prefix={} /> -
累计 5 条
+
累计 5 条
@@ -190,10 +190,10 @@ export default function ReportCenterPage() { title="处理中工单" value={overviewData.processingOrder} suffix="单" - valueStyle={{ color: '#faad14', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#faad14', fontSize: 24, fontWeight: 700 }} prefix={} /> -
全部 3 单
+
全部 3 单
@@ -211,10 +211,10 @@ export default function ReportCenterPage() { value={overviewData.deviceOnlineRate} precision={1} suffix="%" - valueStyle={{ color: '#52c41a', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#52c41a', fontSize: 24, fontWeight: 700 }} prefix={} /> -
来自设备主数据
+
来自设备主数据
@@ -231,10 +231,10 @@ export default function ReportCenterPage() { title="已生成报表" value={overviewData.generatedReport} suffix="份" - valueStyle={{ color: '#722ed1', fontSize: 28, fontWeight: 700 }} + valueStyle={{ color: '#722ed1', fontSize: 24, fontWeight: 700 }} prefix={} /> -
SUCCESS 文件记录
+
SUCCESS 文件记录
diff --git a/src/pages/SystemSetting.tsx b/src/pages/SystemSetting.tsx index 9f35e2c..bd8aee9 100644 --- a/src/pages/SystemSetting.tsx +++ b/src/pages/SystemSetting.tsx @@ -18,6 +18,8 @@ import StationManage from '../components/SystemSetting/StationManage'; import { getMenuList } from '../api/mune'; import DeviceAccessPage from '../components/SystemSetting/DeviceAccessPage'; import OnlineUserPage from '../components/SystemSetting/OnlineUser'; +import DeviceManagementPage from '../components/SystemSetting/DeviceManagement'; +import BasicSettings from '../components/SystemSetting/BasicSettings'; const { Header, Content } = Layout; const { Text } = Typography; @@ -25,56 +27,7 @@ const { Option } = Select; const AntdCard = Card as any; // 基础设置 -const BasicSettings = () => { - const [form] = Form.useForm(); - const handleSave = () => { message.success('设置已保存'); }; - return ( -
- -
当前版本
v2.8.1 最新版
-
在线用户
12 ↑ 2
-
告警通道
3 / 4 正常
-
数据备份状态
正常 ●
-
最近更新
2025-05-20
- - - -
-
- - - - - - - - - -
短信
已启用
-
邮件
已启用
-
Telegram
已启用
-
系统通知
已启用
- - - - - - -
管理员 }, - { title: '手机号', dataIndex: 'phone' }, - { title: '邮箱', dataIndex: 'email' }, - { title: '状态', render: () => ● 在线 }, - ]} dataSource={[ - { name: '张运维', phone: '138****0001', email: 'zhangyw@pvsrmart.com' }, - { name: '李工程师', phone: '139****0002', email: 'li.gongcheng@pvsrmart.com' }, - ]} /> - - - ); -}; // 右侧面板 const RightPanel = () => ( @@ -160,6 +113,9 @@ export default function SystemSettings() { if (item.path === '/systemSetting/monitor') { return { key: 'monitor', label: '系统监控', icon: }; } + if (item.path === '/systemSetting/devices') { + return { key: 'devices', label: '设备管理', icon: }; + } return null; }).filter(Boolean); @@ -172,7 +128,6 @@ export default function SystemSettings() { } }); }, []); - const BasicSettingsPage = () =>

基础设置页面

; const NoticePage = () =>

通知策略页面

; const DataSafetyPage = () =>

数据与安全页面

; const SystemMaintenancePage = () =>

系统维护页面

; @@ -180,7 +135,7 @@ export default function SystemSettings() { const renderTabContent = () => { switch (activeTab) { case 'basic': - return ; + return ; case 'user-role': return ; case 'menu': @@ -199,6 +154,8 @@ export default function SystemSettings() { return ; case 'monitor': return ; + case 'devices': + return ; default: return ; }