|
@@ -158,6 +158,7 @@ export default {
|
|
disableLoginBtnBecauseRemoteApp: true,
|
|
disableLoginBtnBecauseRemoteApp: true,
|
|
disableLoginBtnBecauseVCam: true,
|
|
disableLoginBtnBecauseVCam: true,
|
|
disableLoginBtnBecauseNoRemoteAppChecker: false,
|
|
disableLoginBtnBecauseNoRemoteAppChecker: false,
|
|
|
|
+ disableLoginBtnBecauseRefreshServiceWorker: false,
|
|
newVersionAvailable: false,
|
|
newVersionAvailable: false,
|
|
VUE_APP_GIT_REPO_VERSION: process.env.VUE_APP_GIT_REPO_VERSION,
|
|
VUE_APP_GIT_REPO_VERSION: process.env.VUE_APP_GIT_REPO_VERSION,
|
|
};
|
|
};
|
|
@@ -170,10 +171,11 @@ export default {
|
|
this.$Message.info({
|
|
this.$Message.info({
|
|
content: "正在更新版本...",
|
|
content: "正在更新版本...",
|
|
});
|
|
});
|
|
|
|
+ this.disableLoginBtnBecauseRefreshServiceWorker = true;
|
|
await new Promise(resolve => {
|
|
await new Promise(resolve => {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
resolve();
|
|
resolve();
|
|
- }, 3000);
|
|
|
|
|
|
+ }, 2000);
|
|
});
|
|
});
|
|
location.reload(true);
|
|
location.reload(true);
|
|
}
|
|
}
|
|
@@ -279,7 +281,10 @@ export default {
|
|
beforeDestroy() {
|
|
beforeDestroy() {
|
|
clearTimeout(this.loginTimeout);
|
|
clearTimeout(this.loginTimeout);
|
|
// clearInterval(this.checkNewVersionInterval);
|
|
// clearInterval(this.checkNewVersionInterval);
|
|
- document.removeEventListener(this.checkNewVersionListener);
|
|
|
|
|
|
+ document.removeEventListener(
|
|
|
|
+ "__newSWAvailable",
|
|
|
|
+ this.checkNewVersionListener
|
|
|
|
+ );
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapMutations(["updateUser", "updateTimeDifference", "updateQECSConfig"]),
|
|
...mapMutations(["updateUser", "updateTimeDifference", "updateQECSConfig"]),
|
|
@@ -438,6 +443,7 @@ export default {
|
|
content: "正在获取新版本...",
|
|
content: "正在获取新版本...",
|
|
});
|
|
});
|
|
localStorage.setItem("__swReload", "anything");
|
|
localStorage.setItem("__swReload", "anything");
|
|
|
|
+ this.disableLoginBtnBecauseRefreshServiceWorker = true;
|
|
await new Promise(resolve => {
|
|
await new Promise(resolve => {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
resolve();
|
|
resolve();
|
|
@@ -716,10 +722,11 @@ export default {
|
|
// this.disableLoginBtnBecauseNoRemoteAppChecker
|
|
// this.disableLoginBtnBecauseNoRemoteAppChecker
|
|
// );
|
|
// );
|
|
return (
|
|
return (
|
|
- this.isElectron &&
|
|
|
|
- (this.disableLoginBtnBecauseRemoteApp ||
|
|
|
|
- this.disableLoginBtnBecauseVCam ||
|
|
|
|
- this.disableLoginBtnBecauseNoRemoteAppChecker)
|
|
|
|
|
|
+ (this.isElectron &&
|
|
|
|
+ (this.disableLoginBtnBecauseRemoteApp ||
|
|
|
|
+ this.disableLoginBtnBecauseVCam ||
|
|
|
|
+ this.disableLoginBtnBecauseNoRemoteAppChecker)) ||
|
|
|
|
+ this.disableLoginBtnBecauseRefreshServiceWorker
|
|
);
|
|
);
|
|
},
|
|
},
|
|
},
|
|
},
|