Commit 60c385dc authored by liuxiaohui's avatar liuxiaohui

merged master code

parents 5ea911e3 6284bf37
......@@ -6,13 +6,26 @@ import {
postResetUser,
postEditUser,
postExcelFile,
postDowload
postDowload,
} from '@/services/chatGLM/api';
import { PlusOutlined, UploadOutlined } from '@ant-design/icons';
import type { ActionType } from '@ant-design/pro-components';
import { PageContainer } from '@ant-design/pro-components';
import { ProTable } from '@ant-design/pro-components';
import { Button, Col, Divider, Form, Input, Modal, Radio, Row, Switch, message, Upload, Spin } from 'antd';
import {
Button,
Col,
Divider,
Form,
Input,
Modal,
Radio,
Row,
Switch,
message,
Upload,
Spin,
} from 'antd';
import classNames from 'classnames';
import { isEmpty } from 'lodash';
......@@ -194,7 +207,6 @@ const UserManage = () => {
},
];
const handleOk = () => {
setIsModalAccountOpen(false);
};
......@@ -239,7 +251,7 @@ const UserManage = () => {
const onHandleClickAccountFinish = (values: any) => {
if (accountModalName === '添加账号') {
alert("2");
alert('2');
createdAccount(values);
}
if (accountModalName === '编辑账号') {
......@@ -305,7 +317,7 @@ const UserManage = () => {
setTimeout(() => {
setIsModalOpen(true);
}, 100)
})
});
};
const downloadExcelTemplate = () => {
......@@ -502,7 +514,7 @@ const UserManage = () => {
type="primary"
>
添加账号
</Button>
</Button>,
]}
/>
<UserModal isModalOpen={isModalOpen} data={users} onClose={()=>{ setIsModalOpen(false) }}></UserModal>
......@@ -510,4 +522,4 @@ const UserManage = () => {
);
};
export default UserManage;
\ No newline at end of file
export default UserManage;
......@@ -28,7 +28,7 @@ request.interceptors.request.use((url, options) => {
authHeader= {
Authorization: `Bearer ${token || ''}`,
'Content-Type': 'application/json',
__tenant: '3a0ad79d-bf4e-e9ec-4315-b9021cfacd95',
__tenant: '3a0a90fe-9a0d-70f4-200d-a80a41fb6195',
};
}
return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment