diff --git a/src/api/organization/index.tsx b/src/api/organization/index.tsx new file mode 100644 index 0000000..f782b92 --- /dev/null +++ b/src/api/organization/index.tsx @@ -0,0 +1,36 @@ +import request from '../request'; + +//获取组织列表 +export function getOrgList() { + return request({ + url: '/system/org/list', + method: 'get', + + }); +} + + +//获取组织列表 +export function addOrg(data) { + return request({ + url: '/system/org/save', + method: 'post', + data + + }); +} + + + + +export function deleteOrg(params) { + return request({ + url: '/system/org/delete', + method: 'get', + params + + }); +} + + + diff --git a/src/api/stationManage/index.ts b/src/api/stationManage/index.ts new file mode 100644 index 0000000..cfbf814 --- /dev/null +++ b/src/api/stationManage/index.ts @@ -0,0 +1,63 @@ +import request from '../request'; + +//获取组织列表 +export function getStationList() { + return request({ + url: '/system/site/list', + method: 'get', + + }); +} + +export function saveSite(data) { + return request({ + url: '/system/site/save', + method: 'post', + data + + }); +} + + +export function deleteSite(data) { + return request({ + url: '/system/site/delete', + method: 'post', + data + + }); +} + + +export function getStationRegions(params) { + return request({ + url: '/system/region/selectBySiteId', + method: 'get', + params + + }); +} + +//新增分区 +export function saveRegion(data) { + return request({ + url: '/system/region/save', + method: 'post', + data + + }); +} + +//删除分区 +export function deleteRegion(data) { + return request({ + url: '/system/region/delete', + method: 'post', + data + + }); +} + + + + diff --git a/src/pages/MenuList.tsx b/src/pages/MenuList.tsx index 865ce10..31e88d2 100644 --- a/src/pages/MenuList.tsx +++ b/src/pages/MenuList.tsx @@ -189,14 +189,14 @@ export default function MenuList() { return (
{contextHolder} - +
- + {/* - + */} : - + render: (s) => ( + + {s == 1 ? '正常' : '禁用'} + + ) }, { title: '操作', render: (_, r) => ( - - handleDelete(r.id)}> - + + handleDelete(r.id)}> + ) @@ -108,42 +130,71 @@ export default function Organization() { ]; return ( -
-
- 组织管理 - -
+
+ {contextHolder} - + {/* 统一卡片容器 */} + + {/* 顶部按钮 */} +
+ +
+ + {/* 表格 */} - + + {/* 新增/编辑弹窗 */} setModalVisible(false)} onOk={handleSave} - width={500} + width={550} + destroyOnClose >
- - + + - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index fe7b638..d0bdd88 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -4,7 +4,7 @@ import { Input, Popconfirm, Divider, InputNumber, Switch } from 'antd'; import { - PlusOutlined, SettingOutlined, EditOutlined, DeleteOutlined, CloseOutlined + PlusOutlined, EditOutlined, DeleteOutlined, CloseOutlined } from '@ant-design/icons'; import { getMenuList } from '../api/mune'; import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; @@ -18,9 +18,6 @@ export default function Roles() { const [roles, setRoles] = useState([]); const [menuTree, setMenuTree] = useState([]); const [checkedKeys, setCheckedKeys] = useState([]); - const [permVisible, setPermVisible] = useState(false); - const [currentRole, setCurrentRole] = useState(null); - const [roleModalVisible, setRoleModalVisible] = useState(false); const [roleForm] = Form.useForm(); const [editRole, setEditRole] = useState(null); @@ -52,8 +49,6 @@ export default function Roles() { getRole(); }, []); - - // 新增角色 const handleAddRole = () => { roleForm.resetFields(); @@ -62,7 +57,6 @@ export default function Roles() { roleForm.setFieldsValue({ status: true, roleSort: 1, - }); setRoleModalVisible(true); }; @@ -74,7 +68,6 @@ export default function Roles() { ...record, status: record.status == 1, }); - // 🔥 编辑时自动勾选菜单 setCheckedKeys((record.menuIds || []).map(Number)); setRoleModalVisible(true); }; @@ -96,17 +89,13 @@ export default function Roles() { // 提交保存角色 const handleSaveRole = () => { roleForm.validateFields().then(values => { - - if (editRole) { - const params = { ...values, menuIds: checkedKeys, status: values.status ? 1 : 0, roleSort: values.roleSort || 1, roleId: editRole.roleId - }; editRoleApi(params).then(res => { if (res.code == 200) { @@ -119,16 +108,13 @@ export default function Roles() { }).catch(() => { messageApi.error("编辑失败"); }); - } else { const params = { ...values, menuIds: checkedKeys, status: values.status ? 1 : 0, roleSort: values.roleSort || 1, - }; - // 新增 addRole(params).then(res => { if (res.code == 200) { messageApi.success('新增角色成功'); @@ -145,59 +131,76 @@ export default function Roles() { }; return ( -
+
{contextHolder} -
角色管理
+ {/* 统一卡片容器(和菜单管理一致) */} + + {/* 顶部操作栏(和菜单管理统一) */} +
+ +
-
- -
- - - {roles && roles.length > 0 ? ( - roles.map(role => ( -
- } onClick={() => handleEditRole(role)}> - 编辑 - , - handleDeleteRole(role.roleId)}> - - - ]} - > - {role.roleName}} - description={ - - 权限标识:{role.roleKey} - 状态:{role.status == 1 ? '正常' : '停用'} - - {role.admin && '【超级管理员】'} - {role.manager && '【机构管理员】'} - - - } - /> - + {/* 角色卡片列表 */} + + {roles && roles.length > 0 ? ( + roles.map(role => ( + + } + onClick={() => handleEditRole(role)} + > + 编辑 + , + handleDeleteRole(role.roleId)} + > + + + ]} + > + {role.roleName}} + description={ + + 权限标识:{role.roleKey} + 状态:{role.status == 1 ? '正常' : '停用'} + + {role.admin && '【超级管理员】'} + {role.manager && '【机构管理员】'} + + + } + /> + + + )) + ) : ( + + - )) - ) : ( - - - - )} - - - + )} + + {/* 新增/编辑弹窗 */} - {/* 三个 Switch 一行 */} + {/* 状态 Switch */} - 菜单权限配置 diff --git a/src/pages/StationManage.tsx b/src/pages/StationManage.tsx index 5b5a3f1..38f9a5d 100644 --- a/src/pages/StationManage.tsx +++ b/src/pages/StationManage.tsx @@ -1,149 +1,165 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { - Card, Table, Button, Typography, Space, Modal, Form, - Input, Popconfirm, Select, Switch, Divider, Upload, message, - Row, Col, Tag + Card, Table, Button, Space, Modal, Form, Input, Popconfirm, Select, + Switch, Divider, Row, Col, Tag, message } from 'antd'; import { - PlusOutlined, EditOutlined, DeleteOutlined, - BgColorsOutlined, UserOutlined, SettingOutlined + PlusOutlined, EditOutlined, DeleteOutlined, BgColorsOutlined } from '@ant-design/icons'; +import { + getStationList, saveSite, deleteSite, + getStationRegions, saveRegion, deleteRegion +} from '../api/stationManage'; -const { Title } = Typography; const { Option } = Select; -// 模拟场站数据 -const stationData = [ - { - id: 1, - name: '上海浦东光伏场站', - code: 'PD001', - address: '上海市浦东新区光伏大道', - status: 0, - contact: '张三', - phone: '13800138000', - maintainCompany: '上海新能源运维公司', - areaCount: 3, - hasMap: true, - }, - { - id: 2, - name: '苏州昆山储能电站', - code: 'KS001', - address: '苏州市昆山市能源路', - status: 1, - contact: '李四', - phone: '13900139000', - maintainCompany: '苏州智慧运维有限公司', - areaCount: 2, - hasMap: false, - }, -]; - -// 场站分区模拟 -const areaData = [ - { id: 1, stationId: 1, name: 'A区', type: '清扫区', status: 0 }, - { id: 2, stationId: 1, name: 'B区', type: '巡检区', status: 0 }, - { id: 3, stationId: 1, name: 'C区', type: '禁飞区', status: 1 }, -]; - export default function StationManage() { - const [stationList, setStationList] = useState(stationData); + const [stationList, setStationList] = useState([]); const [currentStation, setCurrentStation] = useState(null); + const [regionList, setRegionList] = useState([]); - // 主弹窗 + // 场站弹窗 const [modalVisible, setModalVisible] = useState(false); const [form] = Form.useForm(); const [editRecord, setEditRecord] = useState(null); // 分区弹窗 const [areaVisible, setAreaVisible] = useState(false); - // 边界绘制弹窗 + const [regionForm] = Form.useForm(); + const [editRegion, setEditRegion] = useState(null); + + // 地图弹窗 const [mapVisible, setMapVisible] = useState(false); + const [messageApi, contextHolder] = message.useMessage(); - // 打开新增 - const handleAdd = () => { - form.resetFields(); - setEditRecord(null); - setModalVisible(true); - }; - - // 打开编辑 - const handleEdit = (record) => { - form.setFieldsValue(record); - setEditRecord(record); - setModalVisible(true); - }; - - // 删除场站 - const handleDelete = (id) => { - setStationList(stationList.filter(s => s.id !== id)); - message.success('删除成功'); - }; - - // 保存场站 - const handleSave = () => { - form.validateFields().then(values => { - const data = { ...values, id: editRecord?.id || Date.now() }; - if (editRecord) { - setStationList(stationList.map(s => s.id === editRecord.id ? data : s)); - message.success('编辑成功'); - } else { - setStationList([...stationList, data]); - message.success('新增场站成功'); + // ====================== 获取场站列表 ====================== + const getStationData = () => { + getStationList().then(res => { + if (res.code === 200) { + setStationList(res.rows || []); } - setModalVisible(false); }); }; - // 打开分区 - const handleOpenArea = (record) => { - setCurrentStation(record); - setAreaVisible(true); + useEffect(() => { + getStationData(); + }, []); + + // ====================== 新增 / 编辑 场站 ====================== + const handleAdd = () => { + form.resetFields(); + setEditRecord(null); + form.setFieldsValue({ status: 1 }); + setModalVisible(true); }; - // 打开地图边界 + const handleEdit = (record) => { + setEditRecord(record); + form.setFieldsValue({ ...record, status: record.status === 1 }); + setModalVisible(true); + }; + + const handleSave = () => { + form.validateFields().then(values => { + const params = { + ...values, + status: values.status ? 1 : 0 + }; + if (editRecord) { + params.id = editRecord.id; + } + saveSite(params).then(res => { + if (res.code === 200) { + messageApi.success(editRecord ? '编辑成功' : '新增成功'); + getStationData(); + setModalVisible(false); + } else { + messageApi.error(res.msg || '保存失败'); + } + }); + }); + }; + + // ====================== 删除场站 ====================== + const handleDelete = (id) => { + deleteSite([id]).then(res => { + if (res.code === 200) { + messageApi.success('删除成功'); + getStationData(); + } else { + messageApi.error(res.msg || '删除失败'); + } + }); + }; + + // ====================== 分区管理 ====================== + const handleOpenArea = async (record) => { + setCurrentStation(record); + setAreaVisible(true); + setEditRegion(null); + regionForm.resetFields(); + + const res = await getStationRegions({ id: record.id }); + if (res.code === 200) setRegionList(res.data || []); + }; + + const handleSaveRegion = () => { + regionForm.validateFields().then(values => { + const params = { + ...values, + siteId: currentStation.id, + status: values.status ? 1 : 0 + }; + if (editRegion) params.id = editRegion.id; + + saveRegion(params).then(res => { + if (res.code === 200) { + messageApi.success('保存成功'); + getStationRegions({ id: currentStation.id }).then(r => { + setRegionList(r.data || []); + }); + setEditRegion(null); + regionForm.resetFields(); + } + }); + }); + }; + + const handleDeleteRegion = (id) => { + deleteRegion([id]).then(res => { + if (res.code === 200) { + messageApi.success('删除成功'); + setRegionList(regionList.filter(x => x.id !== id)); + } + }); + }; + + // ====================== 边界绘制 ====================== const handleOpenMap = (record) => { setCurrentStation(record); setMapVisible(true); }; + // ====================== 表格列 ====================== const columns = [ - { title: '场站名称', dataIndex: 'name' }, - { title: '场站编号', dataIndex: 'code' }, + { title: '场站名称', dataIndex: 'siteName' }, + { title: '场站编号', dataIndex: 'siteCode' }, { title: '地址', dataIndex: 'address' }, { title: '状态', dataIndex: 'status', - render: (s) => s === 0 ? - 启用 : - 停用 - }, - { title: '负责人', dataIndex: 'contact' }, - { title: '运维单位', dataIndex: 'maintainCompany' }, - { - title: '分区数量', - dataIndex: 'areaCount', - }, - { - title: '地图数据', - render: (_, r) => r.hasMap ? - 已维护 : - 未维护 + render: s => s === 1 ? 启用 : 停用 }, { title: '操作', width: 400, render: (_, record) => ( - - - - - - + + + handleDelete(record.id)}> - + ) @@ -151,137 +167,157 @@ export default function StationManage() { ]; return ( -
-
- 场站管理 - -
+
+ {contextHolder} + + {/* 统一卡片样式 */} + +
+
+ +
-
- {/* ====================== 1. 新增/编辑场站 ====================== */} + {/* ====================== 场站弹窗 ====================== */} setModalVisible(false)} onOk={handleSave} - width={700} destroyOnClose >
- - + + - - + + - - + + - 联系人与运维单位 - - - + + - - + + - - + + - + + + - + - {/* ====================== 2. 场站分区设置 ====================== */} + {/* ====================== 分区弹窗 ====================== */} setAreaVisible(false)} footer={null} > -
- -
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
r.status === 0 ? '正常' : '禁用' + title: '状态', render: r => r.status === 1 ? '启用' : '停用' }, { - title: '操作', render: () => ( - - - + title: '操作', render: (_, r) => ( + + + ) } ]} - dataSource={areaData.filter(a => a.stationId === currentStation?.id)} + dataSource={regionList} /> - {/* ====================== 3. 场站边界绘制 & 地图维护 ====================== */} + {/* ====================== 地图绘制 ====================== */} setMapVisible(false)} footer={null} > -
- {/**/} -
地图组件 / 百度地图 / 高德地图 区域绘制
-
支持:边界点绘制、电子围栏、导入KML、保存GeoJSON
- - +
+ 地图区域绘制(可自行接入高德/百度地图) + - - +