Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chatGLM
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘坚-丰林-DEV
chatGLM
Commits
fd5aa690
Commit
fd5aa690
authored
Apr 17, 2023
by
文旺-丰林-DEV
Browse files
Options
Browse Files
Download
Plain Diff
merge code
parents
ef0fd56b
b59a755e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
17 deletions
+12
-17
index.tsx
src/pages/Chat/index.tsx
+2
-2
index.tsx
src/pages/UserManage/index.tsx
+10
-15
No files found.
src/pages/Chat/index.tsx
View file @
fd5aa690
...
@@ -133,7 +133,7 @@ const Chat: React.FC = () => {
...
@@ -133,7 +133,7 @@ const Chat: React.FC = () => {
/>
/>
</
Col
>
</
Col
>
<
Col
>
AI改变世界
</
Col
>
<
Col
>
AI改变世界
</
Col
>
<
Col
pull=
{
1
}
></
Col
>
<
Col
pull=
{
1
}
/
>
</
Row
>
</
Row
>
);
);
};
};
...
@@ -219,7 +219,7 @@ const Chat: React.FC = () => {
...
@@ -219,7 +219,7 @@ const Chat: React.FC = () => {
</
Col
>
</
Col
>
{
promptLoading
&&
(
{
promptLoading
&&
(
<
Col
span=
{
24
}
>
<
Col
span=
{
24
}
>
<
PageLoading
></
PageLoading
>
<
PageLoading
/
>
</
Col
>
</
Col
>
)
}
)
}
<
Col
span=
{
'24'
}
style=
{
{
padding
:
isMobile
?
''
:
'0 100px'
}
}
>
<
Col
span=
{
'24'
}
style=
{
{
padding
:
isMobile
?
''
:
'0 100px'
}
}
>
...
...
src/pages/UserManage/index.tsx
View file @
fd5aa690
...
@@ -92,11 +92,11 @@ const UserManage = () => {
...
@@ -92,11 +92,11 @@ const UserManage = () => {
status
:
'Error'
,
status
:
'Error'
,
},
},
},
},
render
(
text
,
record
)
{
render
(
_
text
,
record
)
{
return
(
return
(
<
div
className=
{
styles
.
isActive
}
>
<
div
className=
{
styles
.
isActive
}
>
<
span
className=
{
classNames
(
styles
.
dot
,
record
.
isActive
?
styles
.
green
:
styles
.
red
)
}
/>
<
span
className=
{
classNames
(
styles
.
dot
,
record
.
isActive
?
styles
.
green
:
styles
.
red
)
}
/>
<
div
>
{
record
.
isActive
?
'启
动
'
:
'禁用'
}
</
div
>
<
div
>
{
record
.
isActive
?
'启
用
'
:
'禁用'
}
</
div
>
</
div
>
</
div
>
);
);
},
},
...
@@ -174,19 +174,14 @@ const UserManage = () => {
...
@@ -174,19 +174,14 @@ const UserManage = () => {
const
createdAccount
=
(
values
:
any
)
=>
{
const
createdAccount
=
(
values
:
any
)
=>
{
setLoading
(
true
);
setLoading
(
true
);
const
data
=
{
role
:
values
.
roles
,
Phone
:
values
.
phoneNumber
,
Password
:
values
,
};
CreatedAccount
(
values
)
CreatedAccount
(
values
)
.
then
((
res
)
=>
{
.
then
(()
=>
{
setLoading
(
false
);
setLoading
(
false
);
setIsModalAccountOpen
(
false
);
setIsModalAccountOpen
(
false
);
accountForm
.
resetFields
();
accountForm
.
resetFields
();
actionRef
.
current
?.
reload
();
actionRef
.
current
?.
reload
();
})
})
.
catch
((
error
)
=>
{
.
catch
(()
=>
{
setLoading
(
false
);
setLoading
(
false
);
});
});
};
};
...
@@ -198,14 +193,14 @@ const UserManage = () => {
...
@@ -198,14 +193,14 @@ const UserManage = () => {
id
:
editMessage
.
id
,
id
:
editMessage
.
id
,
};
};
postEditUser
(
data
)
postEditUser
(
data
)
.
then
((
res
)
=>
{
.
then
(()
=>
{
setLoading
(
false
);
setLoading
(
false
);
setIsModalAccountOpen
(
false
);
setIsModalAccountOpen
(
false
);
message
.
success
(
'编辑成功'
);
message
.
success
(
'编辑成功'
);
accountForm
.
resetFields
();
accountForm
.
resetFields
();
actionRef
.
current
?.
reload
();
actionRef
.
current
?.
reload
();
})
})
.
catch
((
error
)
=>
{
.
catch
(()
=>
{
setLoading
(
false
);
setLoading
(
false
);
});
});
};
};
...
@@ -247,12 +242,12 @@ const UserManage = () => {
...
@@ -247,12 +242,12 @@ const UserManage = () => {
postDeleteUser
({
postDeleteUser
({
id
:
deleteMessage
.
id
,
id
:
deleteMessage
.
id
,
})
})
.
then
((
res
)
=>
{
.
then
(()
=>
{
setIsModalDeleteAccountOpen
(
false
);
setIsModalDeleteAccountOpen
(
false
);
actionRef
.
current
?.
reload
();
actionRef
.
current
?.
reload
();
message
.
success
(
'删除成功'
);
message
.
success
(
'删除成功'
);
})
})
.
catch
((
err
)
=>
{
.
catch
(()
=>
{
setIsModalDeleteAccountOpen
(
false
);
setIsModalDeleteAccountOpen
(
false
);
});
});
};
};
...
@@ -264,14 +259,14 @@ const UserManage = () => {
...
@@ -264,14 +259,14 @@ const UserManage = () => {
Password
:
values
?.
newPassword
,
Password
:
values
?.
newPassword
,
};
};
postResetUser
(
data
)
postResetUser
(
data
)
.
then
((
res
)
=>
{
.
then
(()
=>
{
setResetLoading
(
false
);
setResetLoading
(
false
);
setIsModalResetPassword
(
false
);
setIsModalResetPassword
(
false
);
actionRef
.
current
?.
reload
();
actionRef
.
current
?.
reload
();
resetPasswordForm
.
resetFields
();
resetPasswordForm
.
resetFields
();
message
.
success
(
'重置成功'
);
message
.
success
(
'重置成功'
);
})
})
.
catch
((
err
)
=>
{
.
catch
(()
=>
{
setResetLoading
(
false
);
setResetLoading
(
false
);
});
});
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment