diff --git a/Step/wwwroot/assets/styles/base/depot-action-modal.less b/Step/wwwroot/assets/styles/base/depot-action-modal.less index a5623844..8593be3c 100644 --- a/Step/wwwroot/assets/styles/base/depot-action-modal.less +++ b/Step/wwwroot/assets/styles/base/depot-action-modal.less @@ -48,60 +48,4 @@ } } } -} -.nc-disconnected-container -{ - height: 490px; - width: 704px; - top: calc(~'50% - 245px'); - left: calc(~'50% - 352px'); - display: flex; - justify-content: center; - align-items: center; - .nc-disconnected-modal { - width: 704px; - height: 490px; - border-radius: 2px; - background-color: @color-background-white; - .nc-disconnected-modal-header { - width: 100%; - height: 60px; - color: @color-darkish-blue; - border-bottom: solid 2px @color-silver; - .nc-disconnected-modal-header-label { - font-size: 20px; - padding: 19px 0 0 24px; - } - } - .nc-disconnected-modal-body { - width: 100%; - height: calc(~'100% - 62px'); - .nc-disconnected-modal-body-header{ - height: calc(~'100% - 36px'); - display: flex; - flex-flow: column; - align-items: center; - justify-content: center; - color: @color-greyish-brown; - font-size: 20px; - .nc-disconnected-modal-body-htext { - font-size: 18px; - font-weight: 600; - line-height: 1.11; - color: @color-greyish-brown; - margin-bottom: 15px; - } - .nc-disconnected-modal-body-box { - display: flex; - flex-flow: column; - align-items: center; - justify-content: center; - .fa{ - font-size: 150px; - margin-bottom: 30px; - } - } - } - } - } } \ No newline at end of file diff --git a/Step/wwwroot/assets/styles/base/layout.less b/Step/wwwroot/assets/styles/base/layout.less index b65a02b7..8e2126b6 100644 --- a/Step/wwwroot/assets/styles/base/layout.less +++ b/Step/wwwroot/assets/styles/base/layout.less @@ -122,15 +122,6 @@ body { background-color: @background-color; z-index: 100; transition: transform 0.5s ease-out; - .modal-nc-disconnected{ - position: absolute; - top: 0; - left: 0; - background: rgba(255,255,255,0.5); - width: 100%; - height: 100%; - z-index: 1000; - } .handle { display: none; } diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 2a4d07f7..e15f7aa1 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -18033,61 +18033,6 @@ footer .container button.big:before { display: flex; flex-flow: row; } -.nc-disconnected-container { - height: 490px; - width: 704px; - top: calc(50% - 245px); - left: calc(50% - 352px); - display: flex; - justify-content: center; - align-items: center; -} -.nc-disconnected-container .nc-disconnected-modal { - width: 704px; - height: 490px; - border-radius: 2px; - background-color: #fff; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-header { - width: 100%; - height: 60px; - color: #002680; - border-bottom: solid 2px #bbbcbc; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-header .nc-disconnected-modal-header-label { - font-size: 20px; - padding: 19px 0 0 24px; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-body { - width: 100%; - height: calc(100% - 62px); -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-body .nc-disconnected-modal-body-header { - height: calc(100% - 36px); - display: flex; - flex-flow: column; - align-items: center; - justify-content: center; - color: #4b4b4b; - font-size: 20px; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-body .nc-disconnected-modal-body-header .nc-disconnected-modal-body-htext { - font-size: 18px; - font-weight: 600; - line-height: 1.11; - color: #4b4b4b; - margin-bottom: 15px; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-body .nc-disconnected-modal-body-header .nc-disconnected-modal-body-box { - display: flex; - flex-flow: column; - align-items: center; - justify-content: center; -} -.nc-disconnected-container .nc-disconnected-modal .nc-disconnected-modal-body .nc-disconnected-modal-body-header .nc-disconnected-modal-body-box .fa { - font-size: 150px; - margin-bottom: 30px; -} .production-container { height: 100%; width: 100%; @@ -20350,15 +20295,6 @@ body { z-index: 100; transition: transform 0.5s ease-out; } -#main-view .modal-nc-disconnected { - position: absolute; - top: 0; - left: 0; - background: rgba(255, 255, 255, 0.5); - width: 100%; - height: 100%; - z-index: 1000; -} #main-view .handle { display: none; } diff --git a/Step/wwwroot/src/App.ts b/Step/wwwroot/src/App.ts index 700f6220..0a239622 100644 --- a/Step/wwwroot/src/App.ts +++ b/Step/wwwroot/src/App.ts @@ -8,7 +8,7 @@ import { DataService } from "src/services/dataService"; import { Factory, MessageService } from "./_base"; import { ModalContainer, ModalNcContainer } from "./modules/base-components"; import { ModalHelper } from "src/components/modals" -import { appModelActions,machineStatusActions } from "src/store"; +import { appModelActions } from "src/store"; import { underTheHood } from "src/app_modules/under-the-hood"; import * as iziToast from "izitoast"; @@ -38,7 +38,6 @@ export default class app extends Vue { showHeaderOnBlur = false; applyBlurNc= false; applyBlurInternal = false; - applyBlurDisconnected = true; showHMIinProduction = false; showPRODinProduction = false; loadingOperations = 0; @@ -78,7 +77,7 @@ export default class app extends Vue { ms.subscribeToChannel("hide-modal-internal", args => { this.applyBlurInternal = false; }); - + ms.subscribeToChannel("show-loading", args => { this.loadingOperations++; }); @@ -139,22 +138,6 @@ export default class app extends Vue { get isMainViewLiftedUp() { return this.$store.state.isMainViewLiftedUp; } - - get isCNCConnected() { - return this.$store.state.machineStatus.ncReady; - } - get getRouteName() { - return this.$route.path; - } - @Watch("isCNCConnected") - @Watch("getRouteName") - connectedChange(){ - this.applyBlurDisconnected = !machineStatusActions.isAreaEnabled(this.$store, this.$route.meta.area); - if(this.applyBlurDisconnected) - Factory.Get(MessageService).publishToChannel("HMI-show-modal-disconnected"); - else - Factory.Get(MessageService).publishToChannel("HMI-hide-modal-disconnected"); - } @Watch("isMainViewLiftedUp") isMainViewLiftedUpChanged() { diff --git a/Step/wwwroot/src/App.vue b/Step/wwwroot/src/App.vue index 958e9829..e3597905 100644 --- a/Step/wwwroot/src/App.vue +++ b/Step/wwwroot/src/App.vue @@ -6,32 +6,8 @@
- - -
- -
- -
-
-
-
NC disconnected
-
-
-
-
- - - Active is trying to reconnect to NC... - -
-
-
-
-
- -
-
+ +
diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts index ac838b15..5116e0bc 100644 --- a/Step/wwwroot/src/app.business-logic.ts +++ b/Step/wwwroot/src/app.business-logic.ts @@ -27,7 +27,6 @@ let oldHMIvisible = false; let HMIAlarmsVisible = false; let HMIModalsVisible = false; let HMIModalsNcVisible = false; -let HMIModalsDiscVisible = false; let HMIDragging = false; let HMIshowTimeout; let HMIAlarmsTimeout; @@ -37,7 +36,6 @@ let HMIModalsNcTimeout; let PRODprodTimeout; let HMIScreenshotInterval; let HMIprodTimeout; -let HMIModalsDiscTimeout; let RerenderInterval; const messageService = Factory.Get(MessageService); @@ -228,23 +226,6 @@ if (typeof cmsClient != "undefined") { hideNcModal() }); - - Factory.Get(MessageService).subscribeToChannel("HMI-show-modal-disconnected", args => { - clearTimeout(HMIModalsDiscTimeout); - if (args[0] > 0) - HMIModalsDiscTimeout = setTimeout(showDiscModal, args[0]); - else - showDiscModal() - }); - - Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal-disconnected", args => { - clearTimeout(HMIModalsDiscTimeout); - if (args[0] > 0) - HMIModalsDiscTimeout = setTimeout(hideDiscModal, args[0]); - else - hideDiscModal() - }); - Factory.Get(MessageService).subscribeToChannel("HMI-hide-modal", args => { clearTimeout(HMIModalsTimeout); if (args[0] > 0) @@ -294,16 +275,6 @@ function hideNcModal() { HMIModalsNcVisible = false; ElaborateHMIStatus(); } - -function showDiscModal() { - HMIModalsDiscVisible = true; - ElaborateHMIStatus(); -} -function hideDiscModal() { - HMIModalsDiscVisible = false; - ElaborateHMIStatus(); -} - function stopDrag() { HMIDragging = false; ElaborateHMIStatus(); @@ -349,11 +320,7 @@ function HideProdProduction() { //Private function for elaborate status function ElaborateHMIStatus() { - let hmiv = false; - if(!HMIModalsDiscVisible) - hmiv = HMIvisible || HMIvisibleInProduction || PRODvisibleInProduction; - else - hmiv = HMIvisible; + let hmiv = HMIvisible || HMIvisibleInProduction || PRODvisibleInProduction; if (!hmiv) { if (HMIScreenshotInterval) diff --git a/Step/wwwroot/src/app_modules/tooling/route.js b/Step/wwwroot/src/app_modules/tooling/route.js index b539d99c..7ede569c 100644 --- a/Step/wwwroot/src/app_modules/tooling/route.js +++ b/Step/wwwroot/src/app_modules/tooling/route.js @@ -14,15 +14,15 @@ export const SummaryDepot = () => import("./components/summary-depot.vue"); export const routes = [ { path: "/tooling", component: Tooling, meta: { title: "Tools", area: "tooling" } }, - { name: "tooling-depot", path: "/tooling-depot/:id", component: Depot, meta: { title: "Depot", area: "tooling" } }, - { path: "/info-equipment", component: InfoEquipment, meta: { title: "Info-Equipment", area: "tooling" } }, - { path: "/tooling-equipment/:id?", component: ToolingEquipment, meta: { title: "Tooling-Equipment", area: "tooling" } }, - { path: "/tooling-families", component: ToolingFamilies, meta: { title: "Tooling-Families", area: "tooling" } }, - { path: "/tooling-shanks", component: ToolingShanks, meta: { title: "Tooling-Shanks", area: "tooling" } }, - { path: "/tooling-magpos", component: ToolingMagPos, meta: { title: "Tooling-MagPos", area: "tooling" } }, - { path: "/depot-action-loading", component: DepotActionLoading, meta: { title: "Depot-Action-Loading", area: "tooling" } }, - { path: "/depot-action-transfer", component: DepotActionTransfer, meta: { title: "Depot-Action-Transfer", area: "tooling" } }, - { path: "/depot-action-unloading", component: DepotActionUnloading, meta: { title: "Depot-Action-Unloading", area: "tooling" } }, - { path: "/depot-action-generic", component: DepotActionGeneric, meta: { title: "Depot-Action-Generic", area: "tooling" } }, + { name: "tooling-depot", path: "/tooling-depot/:id", component: Depot, meta: { title: "Depot", area: "depot" } }, + { path: "/info-equipment", component: InfoEquipment, meta: { title: "Info-Equipment", area: "info-equipment" } }, + { path: "/tooling-equipment/:id?", component: ToolingEquipment, meta: { title: "Tooling-Equipment", area: "tooling-equipment" } }, + { path: "/tooling-families", component: ToolingFamilies, meta: { title: "Tooling-Families", area: "tooling-families" } }, + { path: "/tooling-shanks", component: ToolingShanks, meta: { title: "Tooling-Shanks", area: "tooling-shanks" } }, + { path: "/tooling-magpos", component: ToolingMagPos, meta: { title: "Tooling-MagPos", area: "tooling-magpos" } }, + { path: "/depot-action-loading", component: DepotActionLoading, meta: { title: "Depot-Action-Loading", area: "depot-action-loading" } }, + { path: "/depot-action-transfer", component: DepotActionTransfer, meta: { title: "Depot-Action-Transfer", area: "depot-action-transfer" } }, + { path: "/depot-action-unloading", component: DepotActionUnloading, meta: { title: "Depot-Action-Unloading", area: "depot-action-unloading" } }, + { path: "/depot-action-generic", component: DepotActionGeneric, meta: { title: "Depot-Action-Generic", area: "depot-action-generic" } }, ];