|
@@ -274,7 +274,10 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
this.loginBtnLoading = true;
|
|
this.loginBtnLoading = true;
|
|
- await this.checkNewVersion();
|
|
|
|
|
|
+
|
|
|
|
+ const hasNewVersion = await this.checkNewVersion();
|
|
|
|
+ if (hasNewVersion) return;
|
|
|
|
+
|
|
this.loginTimeout = setTimeout(() => {
|
|
this.loginTimeout = setTimeout(() => {
|
|
this.loginBtnLoading = false;
|
|
this.loginBtnLoading = false;
|
|
}, 10 * 1000);
|
|
}, 10 * 1000);
|
|
@@ -403,6 +406,8 @@ export default {
|
|
}, 1000);
|
|
}, 1000);
|
|
});
|
|
});
|
|
location.reload(true);
|
|
location.reload(true);
|
|
|
|
+
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
async checkElectronConfig() {
|
|
async checkElectronConfig() {
|
|
@@ -427,7 +432,7 @@ export default {
|
|
this.updateQECSConfig(json);
|
|
this.updateQECSConfig(json);
|
|
} else {
|
|
} else {
|
|
this.$Message.error({
|
|
this.$Message.error({
|
|
- content: "获取远程配置文件出错,请重新刷新网页!",
|
|
|
|
|
|
+ content: "获取远程配置文件出错,请重新打开程序!",
|
|
duration: 15,
|
|
duration: 15,
|
|
closable: true,
|
|
closable: true,
|
|
});
|
|
});
|
|
@@ -435,7 +440,7 @@ export default {
|
|
}
|
|
}
|
|
} catch (e) {
|
|
} catch (e) {
|
|
this.$Message.error({
|
|
this.$Message.error({
|
|
- content: "获取远程配置文件出错,请重新刷新网页!",
|
|
|
|
|
|
+ content: "获取远程配置文件出错,请重新打开程序!",
|
|
duration: 15,
|
|
duration: 15,
|
|
closable: true,
|
|
closable: true,
|
|
});
|
|
});
|