打包准备修复bug

pull/8/head
杨默涵 2 months ago
parent 5b6dcb0ddf
commit 6d30cf1a0a

@ -140,6 +140,12 @@ public class ExamController {
registerStage.setTitle("数学考试系统 - 用户注册"); registerStage.setTitle("数学考试系统 - 用户注册");
registerStage.setScene(scene); registerStage.setScene(scene);
registerStage.setResizable(false); registerStage.setResizable(false);
// 获取注册控制器并设置原始登录界面引用
RegisterController registerController = loader.getController();
Stage currentStage = (Stage) loginStatusLabel.getScene().getWindow();
registerController.setOriginalLoginStage(currentStage);
registerStage.show(); registerStage.show();
} catch (Exception e) { } catch (Exception e) {

@ -46,6 +46,9 @@ public class RegisterController {
// 邮件服务 // 邮件服务
private EmailService emailService; private EmailService emailService;
// 原始登录界面的引用
private Stage originalLoginStage;
@FXML @FXML
public void initialize() { public void initialize() {
@ -60,6 +63,14 @@ public class RegisterController {
showStatus("⚠️ 邮件服务未配置请检查mail.properties文件", true); showStatus("⚠️ 邮件服务未配置请检查mail.properties文件", true);
} }
} }
/**
*
* @param originalStage
*/
public void setOriginalLoginStage(Stage originalStage) {
this.originalLoginStage = originalStage;
}
private void setupLevelComboBox() { private void setupLevelComboBox() {
ObservableList<String> levels = FXCollections.observableArrayList("小学", "初中", "高中"); ObservableList<String> levels = FXCollections.observableArrayList("小学", "初中", "高中");
@ -200,11 +211,16 @@ public class RegisterController {
@FXML @FXML
private void handleBackToLogin() { private void handleBackToLogin() {
try { try {
// 关闭当前窗口 // 关闭当前注册窗口
Stage currentStage = (Stage) backToLoginButton.getScene().getWindow(); Stage currentStage = (Stage) backToLoginButton.getScene().getWindow();
currentStage.close(); currentStage.close();
// 打开登录界面 // 关闭原始登录界面(如果存在)
if (originalLoginStage != null && originalLoginStage.isShowing()) {
originalLoginStage.close();
}
// 打开新的登录界面
FXMLLoader loader = new FXMLLoader(getClass().getResource("exam-view.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("exam-view.fxml"));
Scene scene = new Scene(loader.load(), 900, 900); Scene scene = new Scene(loader.load(), 900, 900);
Stage loginStage = new Stage(); Stage loginStage = new Stage();

@ -1,3 +1,3 @@
666|123456789|252436951@qq.com|小学|1760166999971 666|123456789|252436951@qq.com|小学|1760166999971
wgll|Ymh123456|ymhlovesLQX@163.com|小学|1760257151837 wgll|Ymh123456|ymhlovesLQX@163.com|小学|1760261535669

Loading…
Cancel
Save