diff --git a/src/components/SystemSetting/DeviceManagement.tsx b/src/components/SystemSetting/DeviceManagement.tsx
index 8ee7a40..c116bb4 100644
--- a/src/components/SystemSetting/DeviceManagement.tsx
+++ b/src/components/SystemSetting/DeviceManagement.tsx
@@ -31,6 +31,60 @@ import {
LinkOutlined,
DisconnectOutlined,
} from '@ant-design/icons';
+
+const GainSliderInput = ({ value = 0.5, onChange, disabled, min = 0.1, max = 1, step = 0.01 }) => {
+ const handleSliderChange = (val) => {
+ onChange?.(val);
+ };
+ const handleInputChange = (val) => {
+ let num = Number(val);
+ if (isNaN(num)) num = min;
+ num = Math.max(min, Math.min(max, num));
+ onChange?.(Number(num.toFixed(2)));
+ };
+ return (
+
+ `${v?.toFixed(2)}` }}
+ marks={{
+ [min]: { style: { color: '#8c8c8c', fontSize: 10 }, label: min },
+ [(min + max) / 2]: { style: { color: '#8c8c8c', fontSize: 10 }, label: ((min + max) / 2).toFixed(2) },
+ [max]: { style: { color: '#8c8c8c', fontSize: 10 }, label: max },
+ }}
+ />
+
+
+ );
+};
import SerialNumGenerate from "./SerialNumGenerate"
import { getPlaneDeviceList, bindDrone, unbindDrone, bindSmartDevice, unbindSmartDevice, getAllDevice, deviceCommmand } from '@/api/device';
import { getOrgList } from '@/api/organization/index';
@@ -132,6 +186,58 @@ export default function DeviceManagementPage() {
const [paramData1, setParamData1] = useState(null);
const [paramForm1] = Form.useForm();
+ // 设备参数表单字段配置
+ const paramFieldConfigs = [
+ { key: 'leftForwardGain', label: '左轮前进增益', type: 'InputNumber', editable: true, min: 0, max: 1, step: 0.01 },
+ { key: 'leftBackwardGain', label: '左轮后退增益', type: 'InputNumber', editable: true, min: 0, max: 1, step: 0.01 },
+ { key: 'rightForwardGain', label: '右轮前进增益', type: 'InputNumber', editable: true, min: 0, max: 1, step: 0.01 },
+ { key: 'rightBackwardGain', label: '右轮后退增益', type: 'InputNumber', editable: true, min: 0, max: 1, step: 0.01 },
+ { key: 'runSpeed', label: '运行速度', type: 'InputNumber', editable: true },
+
+ { key: 'chipUidSign', label: '芯片UID固化标志位', type: 'InputNumber', editable: false },
+ { key: 'chipUid', label: '芯片UID', type: 'Input', editable: false },
+ { key: 'remoteConfig', label: '遥控器通道配置', type: 'InputNumber', editable: false },
+ { key: 'knifeMotorMode', label: '割刀电机模式', type: 'InputNumber', editable: false },
+ { key: 'walkMotorMode', label: '行走电机模式', type: 'InputNumber', editable: false },
+ { key: 'leftMotorReverse', label: '左轮电机方向极性', type: 'InputNumber', editable: false },
+ { key: 'rightMotorReverse', label: '右轮电机方向极性', type: 'InputNumber', editable: false },
+ { key: 'swapChannel', label: '左右轮通道互换标志', type: 'InputNumber', editable: false },
+ { key: 'use4G', label: '联网标志位', type: 'InputNumber', editable: false },
+ { key: 'forwardSpeedLimit', label: '前进速度限制', type: 'InputNumber', editable: false },
+ { key: 'turnSpeedLimit', label: '转向速度限制', type: 'InputNumber', editable: false },
+ { key: 'knifePolarity', label: '割刀通道极性', type: 'InputNumber', editable: false },
+ { key: 'fanPolarity', label: '风门通道极性', type: 'InputNumber', editable: false },
+ { key: 'throttlePolarity', label: '油门通道极性', type: 'InputNumber', editable: false },
+ { key: 'liftProtectTime', label: '底盘升降电机保护时间', type: 'InputNumber', editable: false },
+ { key: 'dualRtk', label: 'RTK配置', type: 'InputNumber', editable: false },
+ { key: 'knifeChannel', label: '割刀通道配置', type: 'InputNumber', editable: false },
+ { key: 'fanChannel', label: '风门通道配置', type: 'InputNumber', editable: false },
+ { key: 'throttleChannel', label: '油门通道配置', type: 'InputNumber', editable: false },
+ { key: 'remoteType', label: '遥控器类型', type: 'InputNumber', editable: false },
+ { key: 'relayBoard', label: '是否搭载继电器板', type: 'Checkbox', editable: false },
+ { key: 'liftChannel', label: '底盘升通道配置', type: 'InputNumber', editable: false },
+ { key: 'chassisChannel', label: '底盘降通道配置', type: 'InputNumber', editable: false },
+ { key: 'armChannel', label: '抱闸通道配置', type: 'InputNumber', editable: false },
+ { key: 'fuelPumpChannel', label: '燃油励磁通道配置', type: 'InputNumber', editable: false },
+ { key: 'wifiName', label: 'wifi名称', type: 'Input', editable: false },
+ { key: 'wifiPassword', label: 'wifi密码', type: 'Input', editable: false },
+ { key: 'batteryType', label: '电池类型', type: 'InputNumber', editable: false },
+ { key: 'driveType', label: '行走驱动配置', type: 'InputNumber', editable: false },
+ { key: 'gearRatio', label: '转速比', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'robotLength', label: '机器人长度', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'robotWidth', label: '机器人宽度', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'robotHeight', label: '机器人高度', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'knifeWidth', label: '割刀宽度', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'tyreSize', label: '轮胎尺寸', type: 'InputNumber', editable: false, step: 0.01 },
+ { key: 'firmwareVersion', label: '固件版本', type: 'Input', editable: false },
+ { key: 'crc16', label: 'CRC16', type: 'InputNumber', editable: false },
+ { key: 'tail1', label: 'tail1', type: 'InputNumber', editable: false },
+ { key: 'tail2', label: 'tail2', type: 'InputNumber', editable: false },
+ { key: 'remark', label: '备注', type: 'Input', editable: false },
+ { key: 'delFlag', label: '删除标志', type: 'Checkbox', editable: false },
+ ];
+
+
// 获取无人机列表(带分页 + 筛选)
const fetchDroneList = async () => {
setLoading(true);
@@ -191,20 +297,11 @@ export default function DeviceManagementPage() {
if (res.code == 200) {
if (res.data) {
setParamData(res.data);
- paramForm.setFieldsValue({
- runSpeed: res.data.runSpeed, leftForwardGain: res.data.leftForwardGain,
- leftBackwardGain: res.data.leftBackwardGain,
- rightForwardGain: res.data.rightForwardGain,
- rightBackwardGain: res.data.rightBackwardGain,
- });
+ // 一次性回填所有字段
+ paramForm.setFieldsValue({ ...res.data });
} else {
setParamData(null);
- paramForm.setFieldsValue({
- runSpeed: null, leftForwardGain: null,
- leftBackwardGain: null,
- rightForwardGain: null,
- rightBackwardGain: null,
- });
+ paramForm.resetFields();
}
} else {
utils.message.error(res.msg || '获取参数失败');
@@ -214,6 +311,7 @@ export default function DeviceManagementPage() {
}
};
+
// 保存参数
const saveParam = async (values) => {
console.log(values, currentParamDevice);
@@ -392,11 +490,14 @@ export default function DeviceManagementPage() {
await fetchOrgs();
bindForm.setFieldsValue({
sns: selectedDroneKeys.join(', '),
- orgId: undefined,
- siteId: undefined,
+ orgId: userInfo?.orgId || undefined,
+ siteId: userInfo?.siteId || undefined,
userId: undefined,
});
- setSiteOptions([]);
+
+ await fetchSites(userInfo?.orgId);
+
+ //setSiteOptions([]);
setUserOptions([]);
};
@@ -409,11 +510,12 @@ export default function DeviceManagementPage() {
await fetchOrgs();
bindSmartForm.setFieldsValue({
deviceIds: selectedSmartKeys.join(', '),
- orgId: undefined,
- siteId: undefined,
+ orgId: userInfo?.orgId || undefined,
+ siteId: userInfo?.siteId || undefined,
userId: undefined,
});
- setSiteOptions([]);
+ await fetchSites(userInfo?.orgId);
+ //setSiteOptions([]);
setUserOptions([]);
};
@@ -449,13 +551,13 @@ export default function DeviceManagementPage() {
deviceIds: values.deviceIds.split(',').map(s => s.trim()),
};
const res = await bindSmartDevice(payload);
- if (res.code === 200) {
+ if (res.code === 200 && res.data == true) {
utils.message.success('绑定成功');
setBindSmartModalVisible(false);
bindSmartForm.resetFields();
fetchSmartList();
} else {
- utils.message.error(res.msg || '绑定失败');
+ utils.message.error('绑定失败');
}
} catch (err) {
utils.message.error('操作异常');
@@ -530,7 +632,7 @@ export default function DeviceManagementPage() {
} onClick={() => handleUnbindSmart([record.serialNumber], 3)}>组织
} onClick={() => openParamModal(record)}>参数
- } onClick={() => openParamModal1(record)}>增益参数
+ {/*} onClick={() => openParamModal1(record)}>增益参数*/}
@@ -724,14 +826,14 @@ export default function DeviceManagementPage() {
/>
} onClick={() => setSmartParams({ pageNum: 1, pageSize: 10, serialNumber: '' })}>重置
} onClick={openBindSmartModal}>绑定装备
-
+ */}
@@ -778,6 +880,7 @@ export default function DeviceManagementPage() {