diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts index c17d48f9..ba727822 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/paddle.ts @@ -5,6 +5,7 @@ import { dataService } from "@/services/dataService"; import { store, MachineStatusModel } from "@/store"; import { SoftKeysConfigurationModel, machineInfoStore } from "@/store/machineInfo.store"; import { Hub, machineService } from "@/services"; +import { Watch } from "vue-property-decorator"; @Component({ components: { softKey } @@ -58,6 +59,11 @@ export default class Paddle extends Vue { } async mounted() { + this.loadData(); + } + + @Watch("isOpen") + async loadData() { await dataService.GetSoftKeysConfiguration(); await dataService.GetUserSoftkeyFavorite(); } diff --git a/Thermo.Active/wwwroot/src/services/hub.ts b/Thermo.Active/wwwroot/src/services/hub.ts index 31a2785b..35cb4bfd 100644 --- a/Thermo.Active/wwwroot/src/services/hub.ts +++ b/Thermo.Active/wwwroot/src/services/hub.ts @@ -182,6 +182,11 @@ export class Hub { if (typeof cmsClient != "undefined") $.connection.hub.qs.CmsClientId = cmsClient.getClientID; + + $.connection.hub.stop(); + setTimeout(() => { + $.connection.hub.start(); + }, 1000); } private logout(e) { @@ -301,7 +306,7 @@ export class Hub { if (status == "disconnected" && !Hub._serverConnectionNotificationVisible) { iziToast.warning({ - id: "serverConnection", timeout: false, toastOnce: true, theme: "dark", title: "Active-Server Offline", close: false, closeOnEscape: false, drag: false + id: "serverConnection", timeout: false, toastOnce: true, theme: "dark", title: "Active-Server Offline", close: true, closeOnEscape: false, drag: false } as IziToastSettings); Hub._serverConnectionNotificationVisible = true;