diff --git a/src/api/deviceAccess.ts b/src/api/deviceAccess.ts index a5f33ba..e38e263 100644 --- a/src/api/deviceAccess.ts +++ b/src/api/deviceAccess.ts @@ -39,6 +39,16 @@ export function addProduct(data) { }); } +//编辑产品/system/product/update + +export function updateProduct(data) { + return request({ + url: '/system/product/update', + method: 'post', + data + }); +} + //协议查询 export function getConnectTypes(params) { @@ -68,6 +78,16 @@ export function getDataTypesApi(params) { }); } +//删除物模型system/devicemodel/delete/{id} + +export function deleteModel(id) { + return request({ + url: `/system/devicemodel/delete/${id}`, + method: 'delete', + + }); +} + diff --git a/src/components/SystemSetting/DeviceAccessPage.tsx b/src/components/SystemSetting/DeviceAccessPage.tsx index 32a390d..8dd42a3 100644 --- a/src/components/SystemSetting/DeviceAccessPage.tsx +++ b/src/components/SystemSetting/DeviceAccessPage.tsx @@ -7,13 +7,14 @@ import { PlusOutlined, EditOutlined, DeleteOutlined, ProductOutlined, AppstoreOutlined, SwapOutlined, VideoCameraOutlined } from '@ant-design/icons'; -import { addDeviceModel, addProduct, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel } from '../../api/deviceAccess.ts'; +import { addDeviceModel, addProduct, deleteModel, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel } from '../../api/deviceAccess.ts'; const { Option } = Select; const { TabPane } = Tabs; + const modelDetailList: Record(null); const [productList, setProductList] = useState([]); + const [messageApi, contextHolder] = message.useMessage(); const [deviceProtocol, setDeviceProtocol] = useState('onvif'); const [productProtocol, setProductProtocol] = useState(''); @@ -87,6 +89,8 @@ export default function DeviceAccessPage() { const [actionModal, setActionModal] = useState(false); const [currentAction, setCurrentAction] = useState(null); const [paramList, setParamList] = useState([]); + const [dataTypeList, setDataTypeList] = useState([]); + // 字段映射 const [mappingList, setMappingList] = useState(mappingInitList); @@ -121,14 +125,14 @@ export default function DeviceAccessPage() { // 删除物模型 const handleDeleteModel = (id) => { // 这里替换成你的真实删除接口 - //deleteDeviceModel(id).then(res => { - // if (res.code === 200) { - // message.success('删除成功'); - // getModel(); // 删除后刷新列表 - // } else { - // message.error('删除失败:' + res.msg); - // } - //}).catch(() => message.error('删除请求异常')); + deleteModel(id).then(res => { + if (res.code === 200) { + messageApi.success('删除成功'); + getModel(); // 删除后刷新列表 + } else { + messageApi.error('删除失败:' + res.msg); + } + }).catch(() => messageApi.error('删除请求异常')); }; // 打开弹窗 @@ -231,7 +235,9 @@ export default function DeviceAccessPage() { }; const getDataTypes = () => { getDataTypesApi("").then(res => { - + if (res.code === 200) { + setDataTypeList(res.data || []); + } }) } @@ -296,7 +302,7 @@ export default function DeviceAccessPage() { // 编辑:调用 updateDeviceModel,自动带 id updateDeviceModel(submitData).then(res => { if (res.code === 200) { - message.success('编辑成功'); + messageApi.success('编辑成功'); getModel(); setVisible(false); } @@ -305,7 +311,7 @@ export default function DeviceAccessPage() { // 新增 addDeviceModel(submitData).then(res => { if (res.code === 200) { - message.success('新增成功'); + messageApi.success('新增成功'); getModel(); setVisible(false); } @@ -343,7 +349,7 @@ export default function DeviceAccessPage() { addProduct(submitData).then(res => { if (res.code == 200) { - message.success('新增产品成功'); + messageApi.success('新增产品成功'); getProductList() } }) @@ -385,10 +391,10 @@ export default function DeviceAccessPage() { if (val.id) { const index = newList.findIndex(x => x.id === val.id); if (index >= 0) newList[index] = val; - message.success('修改成功'); + messageApi.success('修改成功'); } else { newList.push({ ...val, id: Date.now() }); - message.success('新增成功'); + messageApi.success('新增成功'); } setMappingList(newList); setMappingModal(false); @@ -397,7 +403,7 @@ export default function DeviceAccessPage() { const deleteMapping = (id: number) => { const newList = mappingList.filter(x => x.id !== id); setMappingList(newList); - message.success('删除成功'); + messageApi.success('删除成功'); }; const getAlarmProps = () => modelDetail?.props?.filter(item => item.isAlarm) || []; @@ -497,6 +503,7 @@ export default function DeviceAccessPage() { return (
+ {contextHolder} 设备管理} key="device" /> @@ -892,10 +899,11 @@ export default function DeviceAccessPage() { @@ -937,10 +945,12 @@ export default function DeviceAccessPage() { style={{ width: 100 }} onChange={v => setParamList([{ ...paramList[0], type: v }])} > - - - - + {/* 👇 接口数据渲染 */} + {dataTypeList.map(item => ( + + ))}