diff --git a/src/api/device.ts b/src/api/device.ts index c788140..3d31df8 100644 --- a/src/api/device.ts +++ b/src/api/device.ts @@ -437,6 +437,26 @@ export function deviceCommmand(data) { }) } +///iot/device/paramModifyAuth +//设备前置授权 +export function getDeviceAuth(data) { + return request({ + url: '/iot/device/paramModifyAuth', + method: 'post', + data + }) +} +//查看当前是否有权限修改 +export function hasPermission(params) { + return request({ + url: '/iot/device/hasPermission', + method: 'get', + params + }) +} + + + diff --git a/src/components/SystemSetting/DeviceManagement.tsx b/src/components/SystemSetting/DeviceManagement.tsx index c116bb4..3da04bc 100644 --- a/src/components/SystemSetting/DeviceManagement.tsx +++ b/src/components/SystemSetting/DeviceManagement.tsx @@ -32,61 +32,10 @@ import { 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 DeviceParamModal from '../devices/DeviceParamModal'; +import { getPlaneDeviceList, bindDrone, unbindDrone, bindSmartDevice, unbindSmartDevice, getAllDevice, deviceCommmand, getDeviceAuth, hasPermission } from '@/api/device'; import { getOrgList } from '@/api/organization/index'; import { getSiteByOrgId, getStationList, deviceRunParamSelectByDeviceId, deviceRunParamSave, deviceRunParamDelete } from '@/api/stationManage/index'; import { getUser } from '@/api/user/index'; @@ -174,11 +123,9 @@ export default function DeviceManagementPage() { const [editSmartForm] = Form.useForm(); const [currentEditSmart, setCurrentEditSmart] = useState(null); - // 设备参数管理相关状态 + // 设备参数管理相关状态(由 DeviceParamModal 通用组件内部管理 API/表单逻辑) const [paramModalVisible, setParamModalVisible] = useState(false); const [currentParamDevice, setCurrentParamDevice] = useState(null); - const [paramData, setParamData] = useState(null); - const [paramForm] = Form.useForm(); const [paramModalVisible1, setParamModalVisible1] = useState(false); @@ -186,7 +133,7 @@ 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 }, @@ -279,89 +226,49 @@ export default function DeviceManagementPage() { setCurrentEditSmart(null); }; - // 打开设备参数管理弹窗 + // 打开设备参数管理弹窗(通用组件内部自动读取/保存参数) const openParamModal = async (record) => { - setCurrentParamDevice(record); - setParamModalVisible(true); - await fetchParamData(record.serialNumber); + getDevivePermisstion(record); + }; const openParamModal1 = async (record) => { setCurrentParamDevice1(record); setParamModalVisible1(true); }; + const getDevivePermisstion = (data) => { + const params = { + deviceId: data.serialNumber, + } - // 获取设备参数 - const fetchParamData = async (deviceId) => { - try { - const res = await deviceRunParamSelectByDeviceId({ deviceId }); + + hasPermission(params).then(res => { if (res.code == 200) { if (res.data) { - setParamData(res.data); - // 一次性回填所有字段 - paramForm.setFieldsValue({ ...res.data }); + setCurrentParamDevice(data); + setParamModalVisible(true); } else { - setParamData(null); - paramForm.resetFields(); + utils.message.error('无权限'); } - } else { - utils.message.error(res.msg || '获取参数失败'); } - } catch (err) { - utils.message.error('获取参数失败'); - } - }; + }) + } - // 保存参数 - const saveParam = async (values) => { - console.log(values, currentParamDevice); - try { - const payload = { - leftForwardGain: Math.max(0.1, Math.min(1, values.leftForwardGain >= 10 ? values.leftForwardGain / 10 : values.leftForwardGain)), - leftBackwardGain: Math.max(0.1, Math.min(1, values.leftBackwardGain >= 10 ? values.leftBackwardGain / 10 : values.leftBackwardGain)), - rightForwardGain: Math.max(0.1, Math.min(1, values.rightForwardGain >= 10 ? values.rightForwardGain / 10 : values.rightForwardGain)), - rightBackwardGain: Math.max(0.1, Math.min(1, values.rightBackwardGain >= 10 ? values.rightBackwardGain / 10 : values.rightBackwardGain)), - deviceId: currentParamDevice.serialNumber, - siteId: stationId, - orgId: currentStation?.orgId, - runSpeed: values.runSpeed, - id: paramData?.id, - }; - const res = await deviceRunParamSave(payload); - if (res.code === 200) { - utils.message.success('保存参数成功'); - setParamModalVisible(false); - //await fetchParamData(currentParamDevice.serialNumber); - } else { - utils.message.error(res.msg || '保存参数失败'); - } - } catch (err) { - utils.message.error('操作异常'); - } - }; - const saveParam1 = async (values) => { - console.log(values); try { const payload = { - params: { - leftForwardGain: Math.max(0.1, Math.min(1, values.leftForwardGain >= 10 ? values.leftForwardGain / 10 : values.leftForwardGain)), - leftBackwardGain: Math.max(0.1, Math.min(1, values.leftBackwardGain >= 10 ? values.leftBackwardGain / 10 : values.leftBackwardGain)), - rightForwardGain: Math.max(0.1, Math.min(1, values.rightForwardGain >= 10 ? values.rightForwardGain / 10 : values.rightForwardGain)), - rightBackwardGain: Math.max(0.1, Math.min(1, values.rightBackwardGain >= 10 ? values.rightBackwardGain / 10 : values.rightBackwardGain)), - }, - commandType: "WheelGainCoefficients", - deviceId: [currentParamDevice1.serialNumber], - + deviceId: currentParamDevice1.serialNumber, + duration: values?.minute, }; - console.log(values); - const res = await deviceCommmand(payload); - if (res.code === 200) { + console.log(payload, "payload"); + const res = await getDeviceAuth(payload); + console.log(res, "res"); + if (res.code === 200 && res.data == true) { utils.message.success('保存参数成功'); setParamModalVisible1(false); //await fetchParamData(currentParamDevice.serialNumber); } else { - utils.message.error(res.msg || '保存参数失败'); + utils.message.error(res.msg || '授权失败'); } } catch (err) { utils.message.error('操作异常'); @@ -632,7 +539,7 @@ export default function DeviceManagementPage() { - {/**/} + {userInfo?.userId == 1 && } @@ -960,7 +867,7 @@ export default function DeviceManagementPage() { background: 'linear-gradient(180deg, #1890ff 0%, #096dd9 100%)', borderRadius: 2, }}> - 增益参数管理 + 设备授权 - {currentParamDevice1?.deviceAlias || currentParamDevice1?.serialNumber} @@ -973,225 +880,69 @@ export default function DeviceManagementPage() { setParamData1(null); }} footer={null} - onOk={() => paramForm1.submit()} width={560} - bodyStyle={{ padding: '20px 24px 8px' }} >
-
+
💡 - 增益系数范围 0.10 ~ 1.00,拖动滑块或直接输入数值均可调节 + 设置设备操作授权,授权到期后设备将失去对应操作权限
- 左轮前进增益} name="leftForwardGain" rules={[{ required: true, message: '请设置左轮前进增益系数' }]}> - - - 左轮后退增益} name="leftBackwardGain" rules={[{ required: true, message: '请设置左轮后退增益系数' }]}> - - - 右轮前进增益} name="rightForwardGain" rules={[{ required: true, message: '请设置右轮前进增益系数' }]}> - - - 右轮后退增益} name="rightBackwardGain" rules={[{ required: true, message: '请设置右轮后退增益系数' }]}> - + 授权时间(min)} + name="minute" + rules={[ + { required: true, message: '请输入授权剩余时间' }, + { type: 'number', min: 0, message: '授权时间不能小于0' } + ]} + > + + + +
- +
+ {/* 设备参数管理弹窗 */} - - - 设备全部参数查看与增益修改 - - - {currentParamDevice?.deviceAlias || currentParamDevice?.serialNumber} - -
- } + { setParamModalVisible(false); setCurrentParamDevice(null); - setParamData(null); - paramForm.resetFields(); }} - onOk={() => paramForm.submit()} - width={780} - bodyStyle={{ padding: '16px 24px 0px' }} - > -
-
- - - {['leftForwardGain', 'leftBackwardGain', 'rightForwardGain', 'rightBackwardGain'].map((key) => { - const field = paramFieldConfigs.find(f => f.key === key); - if (!field) return null; - const isGainSliderField = ['leftForwardGain', 'leftBackwardGain', 'rightForwardGain', 'rightBackwardGain'].includes(key); - const disabled = !field.editable; - return ( - - {field.label}} - name={field.key} - > - {isGainSliderField ? ( - - ) : ( - - )} - - - ); - })} - - - - - {paramFieldConfigs.filter(f => !['leftForwardGain', 'leftBackwardGain', 'rightForwardGain', 'rightBackwardGain'].includes(f.key)).map((field) => { - const disabled = !field.editable; - return ( - - - {field.type === 'InputNumber' ? ( - - ) : field.type === 'Checkbox' ? ( - - ) : ( - - )} - - - ); - })} - - - -
- - -
-
-
-
- - - - {/* 批量修改增益参数弹窗 */} - - - 批量修改增益参数 - 已选 {selectedSmartKeys.length} 台 - - } - open={batchParamModalVisible} - onCancel={() => { - setBatchParamModalVisible(false); - batchParamForm.resetFields(); + onSuccess={() => { }} - footer={null} - width={560} - > -
+ + - > - -
- ⚠️ - 将为 {selectedSmartKeys.length} 台设备统一设置增益系数,范围 0.10 ~ 1.00 -
-
- 左轮前进增益系数} name="leftForwardGain" rules={[{ required: true, message: '请设置左轮前进增益系数' }]}> - - - 左轮后退增益系数} name="leftBackwardGain" rules={[{ required: true, message: '请设置左轮后退增益系数' }]}> - - - 右轮前进增益系数} name="rightForwardGain" rules={[{ required: true, message: '请设置右轮前进增益系数' }]}> - - - 右轮后退增益系数} name="rightBackwardGain" rules={[{ required: true, message: '请设置右轮后退增益系数' }]}> - - - -
- - -
-
-
-
) : activeTab === 'drone' ? ( diff --git a/src/components/SystemSetting/UserPage.tsx b/src/components/SystemSetting/UserPage.tsx index d038665..b973c43 100644 --- a/src/components/SystemSetting/UserPage.tsx +++ b/src/components/SystemSetting/UserPage.tsx @@ -128,7 +128,7 @@ export default function UserRolePage() { const params = { pageNum: userPagination.pageNum, pageSize: userPagination.pageSize, - orgId: currentStation?.orgId, + orgId: userInfo?.orgId, //siteId: stationId, }; getUser(params).then(res => { @@ -718,7 +718,7 @@ export default function UserRolePage() { + )} + + + ); + })} + + + +
+ + +
+
+ + + + ); +}; + +export default DeviceParamModal;