diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index ba572af4..843917c7 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs index c9297d8c..70a4d55d 100644 --- a/Step.Core/ThreadsFunctions.cs +++ b/Step.Core/ThreadsFunctions.cs @@ -152,8 +152,8 @@ public static class ThreadsFunctions sw.Stop(); // Update thread timer - ReadPowerOnTimer += sw.ElapsedMilliseconds; - ReadPowerOnTimes++; + ReadPowerOnTimer += sw.ElapsedMilliseconds; + ReadPowerOnTimes++; // Wait Thread.Sleep(CalcSleepTime(400, (int)sw.ElapsedMilliseconds)); diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 01fc9cbd..1e63c8fb 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -1391,7 +1391,8 @@ namespace Step.NC IsNeeded = x.IsNeeded, Message = x.Message, Process = x.Process, - Type = x.Type.ToString() + Type = x.Type.ToString(), + Value = x.Value }).ToList(); return NO_ERROR; diff --git a/Step.Utils/ExceptionManager.cs b/Step.Utils/ExceptionManager.cs index 9e5b1612..8e207723 100644 --- a/Step.Utils/ExceptionManager.cs +++ b/Step.Utils/ExceptionManager.cs @@ -92,12 +92,19 @@ namespace Step.Utils NotifyUsers(error); } + private static bool MessageBoxShow = false; + private static void NotifyUsers(ErrorMessageModel error) { if (error.ErrorLevel > (int)ERROR_LEVEL.WARNING) { - // Notify user - MessageBox.Show(error.Message, error.Title, MessageBoxButtons.OK, MessageBoxIcon.Error); + if (!MessageBoxShow) + { + MessageBoxShow = true; + + // Notify user + MessageBox.Show(error.Message, error.Title, MessageBoxButtons.OK, MessageBoxIcon.Error); + } } else { diff --git a/Step/wwwroot/assets/styles/base/modals.less b/Step/wwwroot/assets/styles/base/modals.less index 3d793203..d0ab16e4 100644 --- a/Step/wwwroot/assets/styles/base/modals.less +++ b/Step/wwwroot/assets/styles/base/modals.less @@ -153,6 +153,16 @@ width: 100px; } } + .content-real-showval{ + display: flex; + align-items: center; + span{ + word-wrap: break-word; + } + input{ + margin-left: auto; + } + } .content-btn{ width: 592px; box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4); diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 1a8d888b..c6ccdc79 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -102,6 +102,16 @@ .modal.m155 .content-real span { width: 100px; } +.modal.m155 .content-real-showval { + display: flex; + align-items: center; +} +.modal.m155 .content-real-showval span { + word-wrap: break-word; +} +.modal.m155 .content-real-showval input { + margin-left: auto; +} .modal.m155 .content-btn { width: 592px; box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4); diff --git a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts index 76f068c0..6d3a03dd 100644 --- a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts @@ -12,6 +12,10 @@ export default class M155Dialog extends Vue{ data = null; value = 0; + MULTIPLE_BUTTONS = "MULTIPLE_BUTTONS"; + REAL = "REAL"; + SHOW_VAL = "SHOW_VAL" + mounted(){ this.data = ModalHelper.M155ModalData.data; this.value = 0; @@ -39,15 +43,16 @@ export default class M155Dialog extends Vue{ return this.value = k; } canSendAnswer(){ - if(this.isReal) + if(this.getType == this.REAL) return this.value != null && this.value != undefined; else return this.value && this.value != 0; } - get isReal(){ + get getType(){ if(this.data) - return this.data.type=="REAL"; - return true; + return this.data.type + + return "" } hide() { ModalHelper.M155ModalData.data.toDisplay = false; diff --git a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.vue b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.vue index c4392f33..47cf80c0 100644 --- a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.vue +++ b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.vue @@ -1,12 +1,18 @@