From 3fc8e1b5fd410fdc9e7e79752d6030403800d87a Mon Sep 17 00:00:00 2001
From: mmc <1556375442@qq.com>
Date: Thu, 6 Aug 2026 10:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=9C=B0=E6=96=B9=E7=9A=84?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=82=E6=95=B0=20=E7=BB=84=E4=BB=B6=20?=
=?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=8E=88=E6=9D=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/device.ts | 20 +
.../SystemSetting/DeviceManagement.tsx | 361 +++---------------
src/components/SystemSetting/UserPage.tsx | 4 +-
src/components/devices/DeviceOverviewPage.tsx | 54 ++-
src/components/devices/DeviceParamModal.tsx | 318 +++++++++++++++
5 files changed, 446 insertions(+), 311 deletions(-)
create mode 100644 src/components/devices/DeviceParamModal.tsx
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() {
} onClick={() => handleUnbindSmart([record.serialNumber], 3)}>组织
} onClick={() => openParamModal(record)}>参数
- {/*} onClick={() => openParamModal1(record)}>增益参数*/}
+ {userInfo?.userId == 1 && } onClick={() => openParamModal1(record)}>授权}
@@ -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' }}
>
-
>
) : 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() {