From 5039e6e38957ffc1ffdcfeeb040674aa02794482 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 二月 2024 23:19:48 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/App.jsx                     |    2 --
 zy-asrs-flow/src/pages/system/role/index.jsx |   44 ++++++++++----------------------------------
 2 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/zy-asrs-flow/src/App.jsx b/zy-asrs-flow/src/App.jsx
index 6892f48..28531f5 100644
--- a/zy-asrs-flow/src/App.jsx
+++ b/zy-asrs-flow/src/App.jsx
@@ -185,7 +185,6 @@
   // 鍓嶇疆瀹堝崼
   requestInterceptors: [
     (url, options) => {
-      console.log('request ====>:', url);
       const token = getToken();
       if (token && options.headers) {
         options.headers[TOKEN_HEADER_NAME] = token;
@@ -207,7 +206,6 @@
       if (token) {
         setToken(token);
       }
-      console.log(response?.data);
       return response;
     }
   ]
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 8b0ea37..d78fa07 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -1,7 +1,7 @@
 
 import React, { useState, useRef, useEffect } from 'react';
 import { useIntl, FormattedMessage } from '@umijs/max';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Table } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, ExportOutlined } from '@ant-design/icons';
 import { getLogininforList, removeLogininfor, exportLogininfor } from '@/services/monitor/logininfor';
@@ -46,11 +46,11 @@
     }
 };
 
-const handleRemove = async (selectedRows) => {
-    if (!selectedRows) return true;
+const handleRemove = async (rows) => {
+    if (!rows) return true;
     const hide = message.loading('姝e湪鍒犻櫎');
     try {
-        const resp = await removeLogininfor(selectedRows.map((row) => row.infoId).join(','));
+        const resp = await removeLogininfor(rows.map((row) => row.infoId).join(','));
         hide();
         if (resp.code === 200) {
             message.success('鍒犻櫎鎴愬姛锛屽嵆灏嗗埛鏂�');
@@ -130,10 +130,8 @@
                         Modal.confirm({
                             title: '鍒犻櫎',
                             content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
-                            okText: '纭',
-                            cancelText: '鍙栨秷',
                             onOk: async () => {
-                                const success = await handleRemoveOne(record);
+                                const success = await handleRemove([record]);
                                 if (success) {
                                     if (actionRef.current) {
                                         actionRef.current.reload();
@@ -159,35 +157,12 @@
                     })}
                     actionRef={actionRef}
                     formRef={formTableRef}
-                    rowKey="infoId"
+                    rowKey="id"
                     key="logininforList"
                     search={{
                         labelWidth: 120,
                     }}
                     toolBarRender={() => [
-                        <Button
-                            key="remove"
-                            danger
-                            hidden={selectedRows?.length === 0}
-                            onClick={async () => {
-                                Modal.confirm({
-                                    title: '鏄惁纭鍒犻櫎鎵�閫夋暟鎹」?',
-                                    icon: <ExclamationCircleOutlined />,
-                                    content: '璇疯皑鎱庢搷浣�',
-                                    async onOk() {
-                                        const success = await handleRemove(selectedRows);
-                                        if (success) {
-                                            setSelectedRows([]);
-                                            actionRef.current?.reloadAndRest?.();
-                                        }
-                                    },
-                                    onCancel() { },
-                                });
-                            }}
-                        >
-                            <DeleteOutlined />
-                            <FormattedMessage id="pages.searchTable.delete" defaultMessage="鍒犻櫎" />
-                        </Button>,
                         <Button
                             type="primary"
                             key="save"
@@ -219,9 +194,9 @@
                     }
                     columns={columns}
                     rowSelection={{
-                        onChange: (_, selectedRows) => {
-                            setSelectedRows(selectedRows);
-                        },
+                        onChange: (ids, rows) => {
+                            setSelectedRows(rows);
+                        }
                     }}
                 />
             </div>
@@ -237,6 +212,7 @@
                 >
                     <Button
                         key="remove"
+                        danger
                         onClick={async () => {
                             Modal.confirm({
                                 title: '鍒犻櫎',

--
Gitblit v1.9.1