设备接入 优化
This commit is contained in:
@@ -7,7 +7,7 @@ import {
|
||||
PlusOutlined, EditOutlined, DeleteOutlined, ProductOutlined,
|
||||
AppstoreOutlined, SwapOutlined, VideoCameraOutlined
|
||||
} from '@ant-design/icons';
|
||||
import { addDeviceModel, addProduct, deleteModel, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel, updateProduct } from '../../api/deviceAccess.ts';
|
||||
import { addDeviceModel, addProduct, deleteModel, deleteProduct, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel, updateProduct } from '../../api/deviceAccess.ts';
|
||||
|
||||
const { Option } = Select;
|
||||
const { TabPane } = Tabs;
|
||||
@@ -186,7 +186,7 @@ export default function DeviceAccessPage() {
|
||||
}
|
||||
} else {
|
||||
if (type === 'device') { setDeviceProtocol('onvif'); setModelDetail({ props: [] }); }
|
||||
else if (type === 'product') { setProductProtocol(''); setPropertyList([]); }
|
||||
else if (type === 'product') { setProductProtocol(''); setPropertyList([]); form.setFieldsValue({ status: 1 }) }
|
||||
else setModelDetail({ props: [], events: [], actions: [] });
|
||||
}
|
||||
setVisible(true);
|
||||
@@ -427,7 +427,14 @@ export default function DeviceAccessPage() {
|
||||
messageApi.success('删除成功');
|
||||
};
|
||||
const handleDeleteProduct = (data) => {
|
||||
|
||||
deleteProduct(data).then(res => {
|
||||
if (res.code === 200) {
|
||||
messageApi.success('删除成功');
|
||||
getProductList();
|
||||
} else {
|
||||
messageApi.error('删除失败:' + res.msg);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const getAlarmProps = () => modelDetail?.props?.filter(item => item.isAlarm) || [];
|
||||
@@ -456,21 +463,7 @@ export default function DeviceAccessPage() {
|
||||
{ title: '操作', render: r => <Button type="text" icon={<EditOutlined />} onClick={() => openModal('device', r)}>编辑</Button> }
|
||||
];
|
||||
|
||||
const productColumns = [
|
||||
{ title: '产品名称', dataIndex: 'name' },
|
||||
{ title: '厂商', dataIndex: 'manufacturer' },
|
||||
{ title: '协议', dataIndex: 'protocolType' },
|
||||
{ title: '上报Topic', dataIndex: 'publishTopic' },
|
||||
{ title: '订阅Topic', dataIndex: 'subscribeTopic' },
|
||||
{
|
||||
title: '操作', render: r => (
|
||||
<Space>
|
||||
<Button type="text" style={{ color: '#1677ff' }} icon={<EditOutlined />} onClick={() => openModal('product', r)}>编辑</Button>
|
||||
<Button type="text" icon={<SwapOutlined />} onClick={() => openMappingModal()}>字段映射</Button>
|
||||
</Space>
|
||||
)
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
const modelColumns = [
|
||||
{ title: '模型名称', dataIndex: 'name' },
|
||||
@@ -514,12 +507,12 @@ export default function DeviceAccessPage() {
|
||||
{activeTab === 'device' && <Card><Space className="mb-3"><Button type="primary" icon={<PlusOutlined />} onClick={() => openModal('device')}>新增设备</Button></Space><Table rowKey="id" columns={deviceColumns} dataSource={deviceList} /></Card>}
|
||||
{activeTab === 'product' && (
|
||||
<Card>
|
||||
<div style={{ marginBottom: 16, display: 'flex', justifyContent: 'space-between', alignItems: 'end' }}>
|
||||
<div style={{ marginBottom: 16, display: 'flex', justifyContent: 'space-between', alignItems: 'end', }}>
|
||||
<Form
|
||||
form={filterForm}
|
||||
layout="inline"
|
||||
initialValues={{ pageNum: 1, pageSize: 10 }}
|
||||
style={{ display: 'flex', gap: '16px', flexWrap: 'wrap', alignItems: 'center' }}
|
||||
style={{ display: 'flex', gap: '8px', flexWrap: 'wrap', alignItems: 'center' }}
|
||||
>
|
||||
<Form.Item name="code" label="产品编码">
|
||||
<Input placeholder="请输入编码" allowClear />
|
||||
@@ -544,7 +537,7 @@ export default function DeviceAccessPage() {
|
||||
<Option value="udp">UDP</Option>
|
||||
</Select>
|
||||
</Form.Item>
|
||||
<Form.Item name="status" label="状态">
|
||||
<Form.Item name="status" label="状态" initialValue={1}>
|
||||
<Select placeholder="状态" allowClear style={{ width: 100 }}>
|
||||
<Option value={1}>启用</Option>
|
||||
<Option value={0}>禁用</Option>
|
||||
@@ -568,7 +561,6 @@ export default function DeviceAccessPage() {
|
||||
{ title: '产品编码', dataIndex: 'code', width: 120 },
|
||||
{ title: '产品名称', dataIndex: 'name', width: 160 },
|
||||
{ title: '生产厂家', dataIndex: 'manufacturer', width: 130 },
|
||||
{ title: '分类ID', dataIndex: 'categoryId', width: 90 },
|
||||
{ title: '协议', dataIndex: 'protocolCode', width: 100 },
|
||||
{ title: '传输方式', dataIndex: 'transport', width: 100 },
|
||||
{ title: '上报Topic', dataIndex: 'uploadTopic', ellipsis: true },
|
||||
@@ -641,54 +633,129 @@ export default function DeviceAccessPage() {
|
||||
title={modalType === 'device' ? '设备配置' : modalType === 'product' ? '产品配置' : '物模型配置'}>
|
||||
<Form form={form} layout="vertical">
|
||||
{modalType === 'device' && (
|
||||
<Tabs defaultActiveKey="base">
|
||||
<TabPane tab="基础信息" key="base">
|
||||
<Form.Item label="设备名称" name="name" rules={[{ required: true }]}><Input /></Form.Item>
|
||||
<Form.Item label="设备SN" name="sn" rules={[{ required: true }]}><Input /></Form.Item>
|
||||
<Form.Item label="关联产品" name="productId" rules={[{ required: true }]}><Select>{productList.map(p => <Option key={p.id} value={p.id}>{p.name}</Option>)}</Select></Form.Item>
|
||||
</TabPane>
|
||||
<TabPane tab="协议配置" key="protocol">
|
||||
<Form.Item label="设备协议类型" name="protocolType" rules={[{ required: true }]}>
|
||||
<Select value={deviceProtocol} onChange={setDeviceProtocol}>
|
||||
{protocolList.map(p => (
|
||||
<Option key={p.code} value={p.code}>{p.name}</Option>
|
||||
))}
|
||||
</Select>
|
||||
<>
|
||||
<Form.Item
|
||||
label="设备名称"
|
||||
name="name"
|
||||
rules={[{ required: true, message: '请输入设备名称' }]}
|
||||
>
|
||||
<Input placeholder="请输入设备名称" />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
label="设备SN"
|
||||
name="sn"
|
||||
rules={[{ required: true, message: '请输入设备SN' }]}
|
||||
>
|
||||
<Input placeholder="请输入设备SN" />
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
label="关联产品"
|
||||
name="productId"
|
||||
rules={[{ required: true, message: '请选择关联产品' }]}
|
||||
>
|
||||
<Select placeholder="请选择关联产品">
|
||||
{productList.map(p => (
|
||||
<Option key={p.id} value={p.id}>
|
||||
{p.name}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
|
||||
<Form.Item
|
||||
label="设备协议类型"
|
||||
name="protocolType"
|
||||
rules={[{ required: true, message: '请选择协议类型' }]}
|
||||
>
|
||||
<Select
|
||||
value={deviceProtocol}
|
||||
onChange={setDeviceProtocol}
|
||||
placeholder="请选择协议类型"
|
||||
>
|
||||
{protocolList.map(p => (
|
||||
<Option key={p.code} value={p.code}>
|
||||
{p.name}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
</Form.Item>
|
||||
|
||||
<Divider />
|
||||
|
||||
{/* ONVIF 配置 */}
|
||||
{deviceProtocol === 'ONVIF' && (
|
||||
<>
|
||||
<Form.Item label="IP 地址" name="ip">
|
||||
<Input placeholder="例如:192.168.1.65" />
|
||||
</Form.Item>
|
||||
<Form.Item label="端口" name="port">
|
||||
<InputNumber className="w-full" placeholder="默认 80" />
|
||||
</Form.Item>
|
||||
<Form.Item label="登录账号" name="username">
|
||||
<Input placeholder="设备登录账号" />
|
||||
</Form.Item>
|
||||
<Form.Item label="登录密码" name="password">
|
||||
<Input.Password placeholder="设备登录密码" />
|
||||
</Form.Item>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* RTSP 配置 */}
|
||||
{deviceProtocol === 'RTSP' && (
|
||||
<Form.Item label="RTSP 地址" name="rtspUrl">
|
||||
<Input placeholder="rtsp://username:password@ip:port/stream" />
|
||||
</Form.Item>
|
||||
<Divider />
|
||||
{deviceProtocol === 'onvif' && (
|
||||
<>
|
||||
<Form.Item label="IP" name="ip"><Input /></Form.Item>
|
||||
<Form.Item label="端口" name="port"><InputNumber className="w-full" /></Form.Item>
|
||||
<Form.Item label="账号" name="username"><Input /></Form.Item>
|
||||
<Form.Item label="密码" name="password"><Input.Password /></Form.Item>
|
||||
</>
|
||||
)}
|
||||
{deviceProtocol === 'rtsp' && <Form.Item label="RTSP地址" name="rtspUrl"><Input /></Form.Item>}
|
||||
{deviceProtocol === 'mqtt' && (
|
||||
<>
|
||||
<Form.Item label="MQTT服务地址" name="mqttServer"><Input /></Form.Item>
|
||||
<Form.Item label="端口" name="mqttPort"><InputNumber defaultValue={1883} /></Form.Item>
|
||||
<Form.Item label="ClientID" name="clientId"><Input /></Form.Item>
|
||||
<Form.Item label="用户名" name="mqttUsername"><Input /></Form.Item>
|
||||
<Form.Item label="密码" name="mqttPassword"><Input.Password /></Form.Item>
|
||||
</>
|
||||
)}
|
||||
</TabPane>
|
||||
<TabPane tab="报警阈值" key="alarm">
|
||||
{getAlarmProps().map(item => (
|
||||
<div key={item.code} className="flex gap-2">
|
||||
<Form.Item label={`${item.name}上限`} name={['alarmConfig', `${item.code}Max`]} style={{ flex: 1 }}>
|
||||
<InputNumber className="w-full" />
|
||||
)}
|
||||
|
||||
{/* MQTT 配置 */}
|
||||
{deviceProtocol === 'MQTT' && (
|
||||
<>
|
||||
<Form.Item label="MQTT 服务地址" name="mqttServer">
|
||||
<Input placeholder="tcp://192.168.1.200" />
|
||||
</Form.Item>
|
||||
<Form.Item label="MQTT 端口" name="mqttPort">
|
||||
<InputNumber className="w-full" defaultValue={1883} />
|
||||
</Form.Item>
|
||||
<Form.Item label="ClientID" name="clientId">
|
||||
<Input placeholder="客户端唯一标识" />
|
||||
</Form.Item>
|
||||
<Form.Item label="MQTT 用户名" name="mqttUsername">
|
||||
<Input placeholder="MQTT 账号(选填)" />
|
||||
</Form.Item>
|
||||
<Form.Item label="MQTT 密码" name="mqttPassword">
|
||||
<Input.Password placeholder="MQTT 密码(选填)" />
|
||||
</Form.Item>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* 告警阈值配置 */}
|
||||
<Divider>告警阈值配置</Divider>
|
||||
|
||||
{getAlarmProps().length > 0 ? (
|
||||
getAlarmProps().map(item => (
|
||||
<div key={item.code} className="flex gap-3 items-end">
|
||||
<Form.Item
|
||||
label={`${item.name} 上限`}
|
||||
name={['alarmConfig', `${item.code}Max`]}
|
||||
style={{ flex: 1 }}
|
||||
>
|
||||
<InputNumber className="w-full" placeholder="上限值" />
|
||||
</Form.Item>
|
||||
<Form.Item label={`${item.name}下限`} name={['alarmConfig', `${item.code}Min`]} style={{ flex: 1 }}>
|
||||
<InputNumber className="w-full" />
|
||||
<Form.Item
|
||||
label={`${item.name} 下限`}
|
||||
name={['alarmConfig', `${item.code}Min`]}
|
||||
style={{ flex: 1 }}
|
||||
>
|
||||
<InputNumber className="w-full" placeholder="下限值" />
|
||||
</Form.Item>
|
||||
</div>
|
||||
))}
|
||||
{getAlarmProps().length === 0 && <Empty description="无告警参数" />}
|
||||
</TabPane>
|
||||
</Tabs>
|
||||
))
|
||||
) : (
|
||||
<Empty description="当前物模型未设置告警属性,无法配置阈值" />
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{modalType === 'product' && (
|
||||
@@ -703,9 +770,9 @@ export default function DeviceAccessPage() {
|
||||
<Form.Item label="厂商" name="manufacturer">
|
||||
<Input placeholder="迈步科技" />
|
||||
</Form.Item>
|
||||
<Form.Item label="分类ID" name="categoryId">
|
||||
{/*<Form.Item label="分类ID" name="categoryId">
|
||||
<InputNumber style={{ width: '100%' }} min={1} />
|
||||
</Form.Item>
|
||||
</Form.Item>*/}
|
||||
<Form.Item label="协议" name="protocolCode" rules={[{ required: true }]}>
|
||||
<Select placeholder="选择协议">
|
||||
{protocolList.map(p => (
|
||||
@@ -804,9 +871,9 @@ export default function DeviceAccessPage() {
|
||||
</Select>
|
||||
</Form.Item>
|
||||
</div>
|
||||
<div className="flex-1">
|
||||
{/*<div className="flex-1">
|
||||
<Form.Item label="设备类型" name="deviceType" initialValue={1}><InputNumber style={{ width: '100%' }} /></Form.Item>
|
||||
</div>
|
||||
</div>*/}
|
||||
</div>
|
||||
|
||||
<Divider>属性</Divider>
|
||||
|
||||
Reference in New Issue
Block a user