feat: 管理员用户管理页添加角色列

public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

src/api/axios.js

@@ -2,7 +2,7 @@ import { message } from "antd";
 import axios from "axios";
 import { logout } from "../features/auth/authSlice";
 
-const baseURL = "http://127.0.0.1:8080";
+const baseURL = import.meta.env.VITE_API_URL;
 
 const axiosInstance = axios.create({
   baseURL: baseURL,

src/config/menuConfig.js

@@ -65,7 +65,7 @@ const menuConfig = [
     path: "/userdetail",
     label: "个人信息",
     icon: UserOutlined,
-    roles: ["USER", "LEADER", "DEVICE_ADMIN"],
+    roles: ["USER", "LEADER", "DEVICE_ADMIN", "ADMIN"],
   },
 ];
 

src/pages/admin/UserDetailModal.jsx

@@ -7,27 +7,21 @@ export default function UserDetailModal({
   visiable,
   mode = "create",
   user,
+  roles,
   onclose,
   onSuccess,
 }) {
   const [form] = Form.useForm();
   const [initialValues, setInitialValues] = useState();
   const [teams, setTeams] = useState([]);
-  const [roles, setRoles] = useState([]);
 
   const fetchTeams = async () => {
     const data = await axiosInstance.get("/teams");
     setTeams(data);
   };
 
-  const fetchRoles = async () => {
-    const data = await axiosInstance.get("/role");
-    setRoles(data);
-  };
-
   useEffect(() => {
     fetchTeams();
-    fetchRoles();
   }, []);
 
   useEffect(() => {

src/pages/admin/UserManage.jsx

@@ -11,12 +11,18 @@ export default function UserManage() {
   const [modalMode, setModalMode] = useState();
   const [selectedUser, setSelectedUser] = useState();
   const [modalOpen, setModalOpen] = useState(false);
+  const [roles, setRoles] = useState([]);
   const [pagination, setPagination] = useState({
     current: 1,
     pageSize: 10,
     total: 0,
   });
 
+  const fetchRoles = async () => {
+    const data = await axiosInstance.get("/role");
+    setRoles(data);
+  };
+
   const fetchData = async (pagination, name) => {
     const data = await axiosInstance.get("/user", {
       params: {
@@ -32,13 +38,8 @@ export default function UserManage() {
     });
   };
 
-  const fetchTeams = async () => {
-    const data = await axiosInstance.get("/teams");
-    setTeams(data);
-  };
-
   useEffect(() => {
-    // fetchTeams();
+    fetchRoles();
     fetchData({
       current: 1,
       pageSize: 10,
@@ -98,6 +99,13 @@ export default function UserManage() {
         <Column title="账号" key="username" dataIndex="username" />
         <Column title="联系电话" key="phone" dataIndex="phone" />
         <Column title="所属团队" key="team" dataIndex="team" />
+        <Column
+          title="角色"
+          key="roleId"
+          render={(_, { roleId }) =>
+            roles.find((r) => r.value === roleId)?.label || "未知角色"
+          }
+        />
         <Column
           title="操作"
           render={(_, record) => {
@@ -131,6 +139,7 @@ export default function UserManage() {
         visiable={modalOpen}
         mode={modalMode}
         user={selectedUser}
+        roles={roles}
         onclose={() => {
           setModalOpen(false);
           setSelectedUser(null);

src/pages/deviceAdmin/DeviceDetailModal.jsx

@@ -76,7 +76,7 @@ export default function DeviceDetailModal({
     if (imageFile) {
       const formData = new FormData();
       formData.append("image", imageFile);
-      await axiosInstance.post(`device/${device.id}/image`, formData, {
+      await axiosInstance.post(`device/${device.deviceId}/image`, formData, {
         headers: {
           "Content-Type": "multipart/form-data",
         },