diff --git a/src/components/SystemSetting/DeviceAccessPage.tsx b/src/components/SystemSetting/DeviceAccessPage.tsx
index ee6b479..4e9ace6 100644
--- a/src/components/SystemSetting/DeviceAccessPage.tsx
+++ b/src/components/SystemSetting/DeviceAccessPage.tsx
@@ -136,6 +136,7 @@ export default function DeviceAccessPage() {
form.resetFields();
setSelectedModelId('');
setPropertyList([]);
+ getModelAll();
if (record) {
form.setFieldsValue(record);
@@ -447,7 +448,7 @@ export default function DeviceAccessPage() {
useEffect(() => {
getConnectList();
- getModelAll();
+
getProductList();
getDataTypes();
}, []);
@@ -770,37 +771,23 @@ export default function DeviceAccessPage() {
- {/*
-
- */}
-
-
-
+
-
-
-
-
-
-
+
-
- 物模型属性配置
+ 绑定物模型
{
const model = thinsModelList.find(item => item.id === modelId);
+ console.log('选中物模型:', model);
if (model) {
setSelectedModelId(Number(modelId));
setPropertyList(model.supportProperties || []);
+ // 自动获取物模型的协议
+ const protocol = model.connectType || '';
+ // 自动给表单设置 protocolCode
+ form.setFieldsValue({ protocolCode: protocol });
+
+ // 设置默认限值
const defaultLimit = {};
model.supportProperties?.forEach(attr => {
defaultLimit[attr.propertyKey] = { min: 0, max: 100 };
@@ -819,6 +813,7 @@ export default function DeviceAccessPage() {
} else {
setSelectedModelId('');
setPropertyList([]);
+ form.setFieldsValue({ protocolCode: '' });
}
}}
>
@@ -830,7 +825,72 @@ export default function DeviceAccessPage() {
-
+ {/* 隐藏字段:存储协议(从物模型自动获取) */}
+
+
+
+
+ {/* ======================
+ 根据【物模型协议】自动显示配置
+ ====================== */}
+ {selectedModelId && (
+ <>
+
+ {/* MQTT 协议配置 */}
+ {form.getFieldValue('protocolCode')?.toLowerCase() === 'mqtt' && (
+ <>
+ 协议自动配置项
+
+
+
+
+
+
+
+
+ >
+
+ )}
+
+ {/* ONVIF 协议配置 */}
+ {form.getFieldValue('protocolCode')?.toLowerCase() === 'onvif' && (
+ <>
+ 协议自动配置项
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
+ )}
+
+ {/* RTSP 协议配置 */}
+ {form.getFieldValue('protocolCode')?.toLowerCase() === 'rtsp' && (
+ <>
+ 协议自动配置项
+
+
+
+
+ >
+
+ )}
+ >
+ )}
+
+ 物模型属性配置
+
{propertyList?.map((item) => (
@@ -855,7 +915,6 @@ export default function DeviceAccessPage() {
>
)}
-
{modalType === 'model' && (
<>