Skip to content

[feature]Merge to master from Dev-cur #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nana7mi-swjtu merged 1 commit into from
Jul 13, 2025
Merged

[feature]Merge to master from Dev-cur #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion view/homepage/administratorhomepage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace view::homepage {
.arg(A_name).arg(A_ID));
}

void administratorHomepage::on_editProfileButton_clicked() {
void administratorHomepage::on_editProfileButton_2_clicked() {
service::log() << "管理员 " << A_name << " 点击了修改个人信息按钮";

// TODO: 打开修改密码/个人信息页面
Expand Down
2 changes: 1 addition & 1 deletion view/homepage/administratorhomepage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace view::homepage {
void on_approvalButton_clicked(); // 审批
void on_userManageButton_clicked(); // 用户管理
void on_systemManageButton_clicked(); // 系统管理
void on_editProfileButton_clicked(); // 修改个人信息
void on_editProfileButton_2_clicked(); // 修改个人信息
void on_logoutButton_clicked(); // 退出登录
void on_messageButton_clicked(); // 消息
void on_Button_clicked();
Expand Down
4 changes: 2 additions & 2 deletions view/homepage/administratorhomepage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>962</width>
<height>797</height>
<width>962</width>
<height>797</height>
</rect>
</property>
<property name="windowTitle">
Expand Down