feat(前端):user and device list

web-fe/.umirc.ts

@@ -45,7 +45,7 @@ export default defineConfig({
   npmClient: 'pnpm',
   proxy: {
     '/api/nex/v1/': {
-      target: 'http://10.100.51.85:8112',
+      target: 'http://10.100.51.85:8113',
       // changeOrigin: true,
     },
     '/api/files': {

web-fe/src/pages/terminal/index.tsx

@@ -7,9 +7,9 @@ import { deleteUserGroup, getGroupTree } from '@/services/userList';
 import {
   DeleteOutlined,
   DownOutlined,
+  GoldOutlined,
   PlusOutlined,
   RedoOutlined,
-  GoldOutlined,
 } from '@ant-design/icons';
 import {
   Button,
@@ -387,6 +387,29 @@ const UserListPage: React.FC = () => {
   };
   const onDeleteGroup = async () => {
     if (selectedOrg) {
+      const params: any = {
+        page_size: pageSize,
+        page_num: currentPage,
+      };
+      if (selectedOrg) {
+        params.device_group_id = selectedOrg;
+      }
+      try {
+        const result: any = await getTerminalList(params);
+        const { data } = result || {};
+        const { total = 0 } = data || {};
+        if (total > 0) {
+          message.info("该分组下有终端，请先删除该分组下的所有终端");
+        } else {
+          onDeleteGroupSave();
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    }
+  };
+
+  const onDeleteGroupSave = async () => {
     try {
       const params = {
         id: selectedOrg,
@@ -400,7 +423,6 @@ const UserListPage: React.FC = () => {
     } catch (error) {
       message.error('分组删除失败');
     }
-    }
   };
 
   const onSaveGroup = () => {

web-fe/src/pages/terminal/mod/bindImage/index.tsx

@@ -61,9 +61,8 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
   const handleOk = async () => {
     try {
       const values = await form.validateFields();
-      const { image_list } = values || {};
+      const { image_list = [] } = values || {};
       console.log('image_list=====', image_list);
-      if (image_list && image_list.length > 0) {
       const list: any[] = [];
       image_list.forEach((item: any) => {
         const obj: any = {
@@ -80,11 +79,9 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
       });
       const payload: any = {
         data: list,
+        device_id:device_id,
       };
       onBind(payload);
-      } else {
-        message.info('请先选择绑定的镜像');
-      }
     } catch (error) {
       message.error('请检查表单字段');
     }
@@ -131,7 +128,7 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
           <Form.Item
             name="image_list"
             label="选择镜像"
-            rules={[{ required: true, message: '请输入终端型号' }]}
+            rules={[{ required: false, message: '请输入终端型号' }]}
           >
             <SelectedTable />
           </Form.Item>

web-fe/src/pages/terminal/mod/bindUser/index.tsx

@@ -112,7 +112,6 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
       const values = await form.validateFields();
       const { user_list = [] } = values || {};
       const list: any[] = [];
-      if (user_list && user_list.length > 0) {
       user_list.forEach((item: any) => {
         const { type, id } = item || {};
         if (type === 1) {
@@ -149,9 +148,9 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
       });
       const payload = {
         data: list,
+        device_id:device_id,
       };
       onBind(payload);
-      }
     } catch (error) {
       message.error('请检查表单字段');
     }
@@ -198,7 +197,7 @@ const BindUserModal: React.FC<UserEditModalProps> = ({
           <Form.Item
             name="user_list"
             label="选择用户"
-            rules={[{ required: true, message: '请选择绑定用户' }]}
+            rules={[{ required: false, message: '请选择绑定用户' }]}
           >
             <SelectedTable orgTreeData={orgTreeData} />
           </Form.Item>

web-fe/src/pages/userList/index.tsx

@@ -394,6 +394,41 @@ const UserListPage: React.FC = () => {
 
   const onDeleteGroup = async () => {
     if (selectedOrg) {
+      // try {
+      //   const params = {
+      //     id: selectedOrg,
+      //   };
+      //   const res = await deleteUserGroup(params);
+      //   const { code } = res || {};
+      //   if (code === ERROR_CODE) {
+      //     message.success('分组删除成功');
+      //     setSelectedOrg(null);
+      //     getUserGroupList();
+      //   }
+      // } catch (error) {
+      //   message.error('分组删除失败');
+      // }
+      const params: any = {
+        page_size: pageSize,
+        page_num: currentPage,
+      };
+      if (selectedOrg) {
+        params.user_group_id = selectedOrg;
+      }
+      try {
+        const result = await getUserList(params);
+        const { data = {} } = result || {};
+        const { total = 0 } = data || {};
+        if (total > 0) {
+          message.info('当前分组下有用户，请先删除用户', 5);
+        } else {
+          ondeleteCroupSave();
+        }
+      } catch (err) {}
+    }
+  };
+
+  const ondeleteCroupSave = async () => {
     try {
       const params = {
         id: selectedOrg,
@@ -408,7 +443,6 @@ const UserListPage: React.FC = () => {
     } catch (error) {
       message.error('分组删除失败');
     }
-    }
   };
 
   return (