diff --git a/src/components/SystemSetting/DeviceAccessPage.tsx b/src/components/SystemSetting/DeviceAccessPage.tsx index 8dd42a3..a6cee6e 100644 --- a/src/components/SystemSetting/DeviceAccessPage.tsx +++ b/src/components/SystemSetting/DeviceAccessPage.tsx @@ -7,14 +7,11 @@ import { PlusOutlined, EditOutlined, DeleteOutlined, ProductOutlined, AppstoreOutlined, SwapOutlined, VideoCameraOutlined } from '@ant-design/icons'; -import { addDeviceModel, addProduct, deleteModel, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel } from '../../api/deviceAccess.ts'; +import { addDeviceModel, addProduct, deleteModel, getConnectTypes, getDataTypesApi, getDeviceModelList, getProductPage, updateDeviceModel, updateProduct } from '../../api/deviceAccess.ts'; const { Option } = Select; const { TabPane } = Tabs; - - - const modelDetailList: Record([]); const [dataTypeList, setDataTypeList] = useState([]); - // 字段映射 const [mappingList, setMappingList] = useState(mappingInitList); const [mappingModal, setMappingModal] = useState(false); const [mappingForm] = Form.useForm(); const [protocolList, setProtocolList] = useState([]); - const [propertyList, setPropertyList] = useState([]); // 物模型属性列表 - const [selectedModelId, setSelectedModelId] = useState(''); // 选中的模型ID + const [propertyList, setPropertyList] = useState([]); + const [selectedModelId, setSelectedModelId] = useState(''); // 筛选条件 const [filterForm] = Form.useForm(); @@ -124,11 +119,10 @@ export default function DeviceAccessPage() { // 删除物模型 const handleDeleteModel = (id) => { - // 这里替换成你的真实删除接口 deleteModel(id).then(res => { if (res.code === 200) { messageApi.success('删除成功'); - getModel(); // 删除后刷新列表 + getModel(); } else { messageApi.error('删除失败:' + res.msg); } @@ -140,11 +134,12 @@ export default function DeviceAccessPage() { setModalType(type); setEditData(record); form.resetFields(); + setSelectedModelId(''); + setPropertyList([]); if (record) { form.setFieldsValue(record); if (type === 'model') { - // 接口数据 → 前端格式转换 const props = record.supportProperties?.map(p => ({ id: p.id, code: p.propertyKey, @@ -168,27 +163,36 @@ export default function DeviceAccessPage() { } if (type === 'product') { setProductProtocol(record?.protocolCode || ''); - // 编辑回显 - const modelId = Object.keys(record?.thingsModels || {})[0] || ''; - const limitConfig = record?.thingsModels?.[modelId] || {}; - const targetModel = filteredModelList.find(m => m.id == modelId); - form.setFieldsValue({ - ...record, - modelId: modelId, - limitConfig: limitConfig, - propertyList: targetModel?.supportProperties || [] - }); - setVisible(true); + const modelId = record.thingsModels ? Object.keys(record.thingsModels)[0] : null; + const limitConfig = modelId ? record.thingsModels[modelId] : {}; + if (modelId) { + const targetModel = thinsModelList.find(m => m.id == modelId); + setSelectedModelId(Number(modelId)); // 让选中值生效 + setPropertyList(targetModel?.supportProperties || []); + + form.setFieldsValue({ + ...record, + modelId: modelId, + limitConfig: limitConfig + }); + setTimeout(() => { + form.setFieldsValue({ modelId }); + }, 100); + } else { + form.setFieldsValue(record); + setSelectedModelId(''); + setPropertyList([]); + } } } else { if (type === 'device') { setDeviceProtocol('onvif'); setModelDetail({ props: [] }); } - else if (type === 'product') { setProductProtocol(''); setPropertyList([]) } + else if (type === 'product') { setProductProtocol(''); setPropertyList([]); } else setModelDetail({ props: [], events: [], actions: [] }); } setVisible(true); }; - // 获取物模型列表(带分页 + 筛选) + // 获取物模型列表 const getModel = () => { const values = filterForm.getFieldsValue(); const params = { @@ -206,15 +210,10 @@ export default function DeviceAccessPage() { }; const getModelAll = () => { - const params = { - pageNum: 1, - pageSize: 999999, - - }; + const params = { pageNum: 1, pageSize: 999999 }; getDeviceModelList(params).then(res => { if (res.code === 200) { setThingsModelList(res.rows); - } }); }; @@ -223,7 +222,7 @@ export default function DeviceAccessPage() { const handleFilter = () => { setPagination(prev => ({ ...prev, current: 1 })); if (activeTab === 'model') getModel(); - if (activeTab === 'product') getProductList(); // 产品列表 + if (activeTab === 'product') getProductList(); }; // 重置 @@ -233,13 +232,14 @@ export default function DeviceAccessPage() { if (activeTab === 'model') getModel(); if (activeTab === 'product') getProductList(); }; + const getDataTypes = () => { getDataTypesApi("").then(res => { if (res.code === 200) { setDataTypeList(res.data || []); } }) - } + }; // 分页切换 const handleTableChange = (pag) => { @@ -247,7 +247,8 @@ export default function DeviceAccessPage() { if (activeTab === 'model') getModel(); if (activeTab === 'product') getProductList(); }; - // ====================== 获取产品列表 ====================== + + // 获取产品列表 const getProductList = () => { const values = filterForm.getFieldsValue(); const params = { @@ -264,7 +265,6 @@ export default function DeviceAccessPage() { status: values.status ?? '', }; - // 这里调用你的【产品列表接口】 getProductPage(params).then(res => { if (res.code === 200) { setProductList(res.rows); @@ -273,7 +273,7 @@ export default function DeviceAccessPage() { }); }; - // ===================== 物模型提交 ===================== + // 提交 const handleSubmit = () => { form.validateFields().then(values => { if (modalType === 'model') { @@ -299,21 +299,24 @@ export default function DeviceAccessPage() { })) }; if (editData) { - // 编辑:调用 updateDeviceModel,自动带 id updateDeviceModel(submitData).then(res => { if (res.code === 200) { messageApi.success('编辑成功'); getModel(); setVisible(false); + } else { + messageApi.error(res.msg); + } }); } else { - // 新增 addDeviceModel(submitData).then(res => { if (res.code === 200) { messageApi.success('新增成功'); getModel(); setVisible(false); + } else { + messageApi.error(res.msg); } }); } @@ -324,9 +327,6 @@ export default function DeviceAccessPage() { const newValues = form.getFieldsValue(); const { modelId, limitConfig, ...params } = newValues; - // ====================== - // 👇 强制给默认值 0 ~ 100 - // ====================== const finalLimitConfig = {}; if (limitConfig) { Object.keys(limitConfig).forEach(key => { @@ -339,26 +339,47 @@ export default function DeviceAccessPage() { const thingsModels = {}; if (modelId) { - thingsModels[modelId] = finalLimitConfig; // 👈 用处理后的 + thingsModels[modelId] = finalLimitConfig; } const submitData = { ...params, thingsModels: thingsModels, + id: editData?.id, }; - addProduct(submitData).then(res => { - if (res.code == 200) { - messageApi.success('新增产品成功'); - getProductList() - } - }) + // ====================== + // 产品:判断新增 / 编辑 + // ====================== + if (editData) { + // 编辑 + updateProduct(submitData).then(res => { + if (res.code === 200) { + messageApi.success('产品编辑成功'); + getProductList(); + setVisible(false); + } else { + messageApi.error(res.msg); + } + }); + } else { + // 新增 + addProduct(submitData).then(res => { + if (res.code === 200) { + messageApi.success('产品新增成功'); + getProductList(); + setVisible(false); + } else { + messageApi.error(res.msg); + } + }); + } } - setVisible(false); + }); }; - // 属性编辑 + // 属性 const openItemModal = (type: 'props' | 'events' | 'actions', record?: any) => { setItemType(type); itemForm.resetFields(); @@ -405,6 +426,9 @@ export default function DeviceAccessPage() { setMappingList(newList); messageApi.success('删除成功'); }; + const handleDeleteProduct = (data) => { + + } const getAlarmProps = () => modelDetail?.props?.filter(item => item.isAlarm) || []; @@ -441,60 +465,35 @@ export default function DeviceAccessPage() { { title: '操作', render: r => ( - - + + ) } ]; - // ====================== 已增加属性列 + 指令列 ====================== const modelColumns = [ { title: '模型名称', dataIndex: 'name' }, { title: '连接协议', dataIndex: 'connectType' }, { - title: '属性列表', - width: 300, - render: (record) => { + title: '属性列表', width: 300, render: (record) => { const list = record.supportProperties || []; if (list.length === 0) return 无属性; - return ( - - {list.map(item => ( - {item.propertyName} - ))} - - ); + return {list.map(item => {item.propertyName})}; } }, { - title: '指令列表', - width: 300, - render: (record) => { + title: '指令列表', width: 300, render: (record) => { const list = record.supportActions || []; if (list.length === 0) return 无指令; - return ( - - {list.map(item => ( - {item.actionName} - ))} - - ); + return {list.map(item => {item.actionName})}; } }, { - title: '操作', - render: r => ( + title: '操作', render: r => ( - - {/* 增加删除按钮 + 确认框 */} - handleDeleteModel(r.id)} - okText="确定" - cancelText="取消" - > + handleDeleteModel(r.id)} okText="确定" cancelText="取消"> @@ -515,7 +514,6 @@ export default function DeviceAccessPage() { {activeTab === 'device' && } {activeTab === 'product' && ( - {/* ====================== 产品筛选表单 ====================== */}
- {/* ====================== 产品表格 ====================== */} -
{s === 1 ? '启用' : '禁用'} - }, - { - title: '操作', - width: 120, - render: (r) => ( - - - - ) - } - ]} - dataSource={productList} - pagination={{ - current: pagination.current, - pageSize: pagination.pageSize, - total: pagination.total, - showSizeChanger: true, - showTotal: (total) => `共 ${total} 条` - }} - onChange={handleTableChange} - /> + {/* 包一层横向滚动容器 */} +
+
{s === 1 ? '启用' : '禁用'} + }, + { + title: '操作', width: 180, render: (r) => ( + + + + handleDeleteProduct(r.id)} + okText="确定" + cancelText="取消" + > + + + + ) + } + ]} + dataSource={productList} + pagination={{ + current: pagination.current, + pageSize: pagination.pageSize, + total: pagination.total, + showSizeChanger: true, + showTotal: (total) => `共 ${total} 条` + }} + onChange={handleTableChange} + scroll={{ x: 'max-content' }} + /> + )} - {/* 物模型 + 筛选 + 分页 */} + {activeTab === 'model' && (
@@ -625,13 +633,7 @@ export default function DeviceAccessPage() {
-
+
)} @@ -644,7 +646,6 @@ export default function DeviceAccessPage() { - {/**/} @@ -691,7 +692,6 @@ export default function DeviceAccessPage() { )} {modalType === 'product' && ( - <>
@@ -733,18 +733,22 @@ export default function DeviceAccessPage() {
- {/* ============ 物模型选择(直接放在基础信息里) ============ */} 物模型属性配置 - {/* 隐藏字段存储数据 */} - - - {/* ============ 自动渲染属性 + min/max输入框 ============ */} - {/* ============ 自动渲染属性 + min/max输入框 ============ */}
- {/* 👇 这里从 state 取,同步秒刷新 */} {propertyList?.map((item) => ( -
+
{item.propertyName}({item.propertyKey})
- - + + - - + +
))} - {(!propertyList || propertyList.length === 0) && (
请选择物模型以显示属性 @@ -805,7 +787,6 @@ export default function DeviceAccessPage() { )}
- )} {modalType === 'model' && ( @@ -900,9 +881,7 @@ export default function DeviceAccessPage() { @@ -933,40 +912,16 @@ export default function DeviceAccessPage() { setCurrentAction({ ...currentAction, actionName: e.target.value })} style={{ flex: 1 }} />
指令参数 -
- setParamList([{ ...paramList[0], paramKey: e.target.value }])} - /> - setParamList([{ ...paramList[0], paramKey: e.target.value }])} /> + - setParamList([{ ...paramList[0], desc: e.target.value }])} - /> - setParamList([{ ...paramList[0], defaultValue: e.target.value }])} - /> - setParamList([{ ...paramList[0], enum: e.target.value.split(',').map(s => s.trim()) }])} - /> + setParamList([{ ...paramList[0], desc: e.target.value }])} /> + setParamList([{ ...paramList[0], defaultValue: e.target.value }])} /> + setParamList([{ ...paramList[0], enum: e.target.value.split(',').map(s => s.trim()) }])} />