绑定解绑无人机成功
This commit is contained in:
@@ -30,7 +30,7 @@ import {
|
||||
import SerialNumGenerate from "./SerialNumGenerate"
|
||||
import { getPlaneDeviceList, bindDrone, unbindDrone } from '@/api/device';
|
||||
import { getOrgList } from '@/api/organization/index';
|
||||
import { getSiteByOrgId } from '@/api/stationManage/index';
|
||||
import { getSiteByOrgId, getStationList } from '@/api/stationManage/index';
|
||||
import { getUser } from '@/api/user/index';
|
||||
import { useSelector } from 'react-redux';
|
||||
import { RootState } from '@/src/store';
|
||||
@@ -82,6 +82,11 @@ export default function DeviceManagementPage() {
|
||||
const [siteOptions, setSiteOptions] = useState([]);
|
||||
const [userOptions, setUserOptions] = useState([]);
|
||||
|
||||
// ✅ 新增:全局匹配用的全量数据状态
|
||||
const [allOrgOptions, setAllOrgOptions] = useState([]);
|
||||
const [allSiteOptions, setAllSiteOptions] = useState([]);
|
||||
const [allUserOptions, setAllUserOptions] = useState([]);
|
||||
|
||||
const fetchDroneList = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
@@ -121,7 +126,7 @@ export default function DeviceManagementPage() {
|
||||
}
|
||||
};
|
||||
|
||||
// 根据场站获取用户
|
||||
// 获取用户列表
|
||||
const fetchUsers = async (siteId) => {
|
||||
try {
|
||||
const res: any = await getUser({ siteId, pageNum: 1, pageSize: 1000 });
|
||||
@@ -133,23 +138,48 @@ export default function DeviceManagementPage() {
|
||||
}
|
||||
};
|
||||
|
||||
// ✅ 新增:初始化时获取全量数据用于列表匹配
|
||||
const fetchAllDataForMapping = async () => {
|
||||
try {
|
||||
const [orgRes, siteRes, userRes]: any = await Promise.all([
|
||||
getOrgList({ pageNum: 1, pageSize: 1000 }),
|
||||
getStationList({ pageNum: 1, pageSize: 1000 }),
|
||||
getUser({ pageNum: 1, pageSize: 10000 })
|
||||
]);
|
||||
|
||||
if (orgRes.code === 200) setAllOrgOptions(orgRes.rows || []);
|
||||
if (siteRes.code === 200) setAllSiteOptions(siteRes.rows || []);
|
||||
if (userRes.code === 200) setAllUserOptions(userRes.rows || []);
|
||||
} catch (err) {
|
||||
console.error('初始化全量数据失败', err);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (activeTab === 'drone') {
|
||||
fetchDroneList();
|
||||
fetchAllDataForMapping(); // 进入无人机管理时获取全量匹配数据
|
||||
}
|
||||
}, [activeTab]);
|
||||
|
||||
// 打开绑定弹窗
|
||||
const openBindModal = () => {
|
||||
const openBindModal = async () => {
|
||||
if (selectedDroneKeys.length === 0) {
|
||||
return utils.message.warning('请先在列表中选中需要绑定的无人机');
|
||||
}
|
||||
|
||||
setBindModalVisible(true);
|
||||
fetchOrgs();
|
||||
await fetchOrgs();
|
||||
|
||||
// ✅ 修改:不再回显,仅填入已选 SN
|
||||
bindForm.setFieldsValue({
|
||||
sns: selectedDroneKeys.join(', '),
|
||||
userId: userInfo?.userId
|
||||
orgId: undefined,
|
||||
siteId: undefined,
|
||||
userId: undefined,
|
||||
});
|
||||
setSiteOptions([]);
|
||||
setUserOptions([]);
|
||||
};
|
||||
|
||||
const handleBind = async (values) => {
|
||||
@@ -164,6 +194,7 @@ export default function DeviceManagementPage() {
|
||||
if (res.code === 200 && res.data == true) {
|
||||
utils.message.success('绑定成功');
|
||||
setBindModalVisible(false);
|
||||
setSelectedDroneKeys([]);
|
||||
bindForm.resetFields();
|
||||
fetchDroneList();
|
||||
} else {
|
||||
@@ -215,23 +246,55 @@ export default function DeviceManagementPage() {
|
||||
};
|
||||
|
||||
const droneColumns = [
|
||||
{ title: '设备名称', dataIndex: 'drone_callsign', key: 'name' },
|
||||
{ title: 'SN码', dataIndex: 'device_sn', key: 'sn' },
|
||||
{ title: '网关SN', dataIndex: 'gateway_sn', key: 'gsn' },
|
||||
{ title: '状态', dataIndex: 'onlineStatus', key: 'status', render: s => <Tag color={s === 1 ? 'green' : 'default'}>{s === 1 ? '在线' : '离线'}</Tag> },
|
||||
{
|
||||
title: '设备名称', width: 150, dataIndex: 'drone_callsign', key: 'name'
|
||||
},
|
||||
//{ title: 'SN码', dataIndex: 'device_sn', key: 'sn' },
|
||||
//{ title: '网关SN', dataIndex: 'gateway_sn', key: 'gsn' },
|
||||
{
|
||||
title: '所属组织',
|
||||
key: 'orgName',
|
||||
width: 150,
|
||||
render: (_, record) => {
|
||||
const org = allOrgOptions.find(o => o.id == record.orgId);
|
||||
return (org?.orgName || org?.name || "未绑定");
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '所属场站',
|
||||
key: 'siteName',
|
||||
width: 150,
|
||||
render: (_, record) => {
|
||||
const site = allSiteOptions.find(s => s.id == record.siteId);
|
||||
return (site?.siteName || site?.name || "未绑定");
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '负责人',
|
||||
key: 'userName',
|
||||
width: 150,
|
||||
render: (_, record) => {
|
||||
const user = allUserOptions.find(u => u.userId == record.userId);
|
||||
return (user?.nickName || user?.userName || "未绑定")
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '状态', width: 150,
|
||||
dataIndex: 'onlineStatus', key: 'status', render: s => <Tag color={s === 1 ? 'green' : 'default'}>{s === 1 ? '在线' : '离线'}</Tag>
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
key: 'action',
|
||||
fixed: 'right',
|
||||
render: (_, record) => (
|
||||
<Space>
|
||||
<Tooltip title="清除人员绑定">
|
||||
<Tooltip title="人员解绑">
|
||||
<Button size="small" icon={<DisconnectOutlined />} onClick={() => handleUnbind([record.gateway_sn], 1)}>用户</Button>
|
||||
</Tooltip>
|
||||
<Tooltip title="清除场站绑定">
|
||||
<Tooltip title="场站解绑">
|
||||
<Button size="small" icon={<DisconnectOutlined />} onClick={() => handleUnbind([record.gateway_sn], 2)}>场站</Button>
|
||||
</Tooltip>
|
||||
<Tooltip title="清除组织绑定">
|
||||
<Tooltip title="组织解绑">
|
||||
<Button size="small" icon={<DisconnectOutlined />} onClick={() => handleUnbind([record.gateway_sn], 3)}>组织</Button>
|
||||
</Tooltip>
|
||||
</Space>
|
||||
@@ -347,8 +410,8 @@ export default function DeviceManagementPage() {
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<Space>
|
||||
<Button type="primary" icon={<LinkOutlined />} onClick={openBindModal}>绑定无人机</Button>
|
||||
<Button disabled={selectedDroneKeys.length === 0} onClick={() => handleUnbind(selectedDroneKeys, 1)}>批量解绑(人)</Button>
|
||||
<Button disabled={selectedDroneKeys.length === 0} onClick={() => handleUnbind(selectedDroneKeys, 2)}>批量解绑(场)</Button>
|
||||
<Button disabled={selectedDroneKeys.length === 0} onClick={() => handleUnbind(selectedDroneKeys, 1)}>批量解绑(用户)</Button>
|
||||
<Button disabled={selectedDroneKeys.length === 0} onClick={() => handleUnbind(selectedDroneKeys, 2)}>批量解绑(场站)</Button>
|
||||
<Button disabled={selectedDroneKeys.length === 0} onClick={() => handleUnbind(selectedDroneKeys, 3)}>批量解绑(组)</Button>
|
||||
</Space>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user