diff --git a/Step/wwwroot/src/App.vue b/Step/wwwroot/src/App.vue index 0197300b..9c6b5ef0 100644 --- a/Step/wwwroot/src/App.vue +++ b/Step/wwwroot/src/App.vue @@ -38,7 +38,7 @@ import { DataService } from "src/services/dataService"; import { Factory, MessageService } from "./_base"; import { ModalContainer, ModalHelper } from "./modules/base-components"; import { appModelActions } from "src/store"; -import { underTheHood } from "src/app_modules/under-the-hood/components"; +import { underTheHood } from "src/app_modules/under-the-hood"; import * as iziToast from "izitoast"; import moment from "moment"; diff --git a/Step/wwwroot/src/app.routes.js b/Step/wwwroot/src/app.routes.js index 1dba7fd9..35b2e533 100644 --- a/Step/wwwroot/src/app.routes.js +++ b/Step/wwwroot/src/app.routes.js @@ -104,7 +104,7 @@ export let routes = [ { path: "/missing-tool", component: MissingTool, meta: { title: "Missing Tool", area: "missing-tool" } }, - { path: "/modal-missing-tools", component: ModalMissingTools, meta: { title: "Modal Missing Tools", area: "modal-missing-tools" } }, + // { path: "/modal-missing-tools", component: ModalMissingTools, meta: { title: "Modal Missing Tools", area: "modal-missing-tools" } }, { path: "/program-management", component: ProgramManagement, meta: { title: "Program-Management", area: "program-management" } }, diff --git a/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts b/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts index 4e93c31a..8c070624 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts +++ b/Step/wwwroot/src/app_modules/production/components/card-production-cms.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import cardQueueProduction from "./card-queue-production.vue"; import cardJobProduction from "./card-job-production.vue"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; import modalLoadProgram from "src/modules/base-components/modal-load-program.vue"; import { Hub } from "src/services/hub"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/app_modules/production/components/production.ts b/Step/wwwroot/src/app_modules/production/components/production.ts index 500aad9d..79934b9f 100644 --- a/Step/wwwroot/src/app_modules/production/components/production.ts +++ b/Step/wwwroot/src/app_modules/production/components/production.ts @@ -10,7 +10,7 @@ import { appModelActions, alarmsModelActions, store } from "src/store"; import { DataService } from 'src/services/dataService'; import Component from "vue-class-component"; import { Watch } from "vue-property-decorator"; -import { ModalHelper } from "@/src/components/modals"; +import { ModalHelper } from "src/components/modals"; @Component({ components: { diff --git a/Step/wwwroot/src/app_modules/tooling/components/assisted-tooling.ts b/Step/wwwroot/src/app_modules/tooling/components/assisted-tooling.ts index 194fffe3..cbfc0677 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-tooling.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-tooling.ts @@ -2,7 +2,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; @Component({ components: { modal: Modal } }) export default class AssistedTooling extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts index eb6f8f28..ac28e581 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; import { cardAssistedTooling } from "src/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts index 8ef9fd16..de757e09 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { ModalHelper, Modal } from "@/src/components/modals"; +import { ModalHelper, Modal } from "src/components/modals"; import { cardAssistedTooling } from "src/modules/base-components/cards"; diff --git a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts index 196a2a7c..a72ab26d 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { ModalHelper, Modal } from "@/src/components/modals"; +import { ModalHelper, Modal } from "src/components/modals"; import { cardAssistedTooling } from "src/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts index 5ce38f7f..a041efc4 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts @@ -6,7 +6,7 @@ import { store, AppModel } from "src/store"; import { DepotService, ToolingService } from 'src/services'; import { Factory, MessageService } from 'src/_base'; -import { Modal, ModalHelper } from "@/src/components/modals"; +import { Modal, ModalHelper } from "src/components/modals"; @Component({ name: "infoEquipment", diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts index 015aff13..9eee3e25 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts @@ -15,7 +15,7 @@ import { MessageService, Factory, awaiter } from "src/_base"; import { Container, Draggable } from "vue-smooth-dnd"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, InfoEquipment } from "../index"; -import { Modal, ModalHelper } from "@/src/components/modals"; +import { Modal, ModalHelper } from "src/components/modals"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts index c1b3bf3e..20b88943 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts @@ -9,7 +9,7 @@ import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../index"; import { awaiter } from "src/_base"; import { Hub } from "src/services/hub"; -import { ModalHelper } from "@/src/components/modals"; +import { ModalHelper } from "src/components/modals"; declare let $: any; @Component({ components: { equipment, inputBox } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts index f5b5ac3c..a670c8af 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts @@ -5,7 +5,7 @@ import { ToolingService } from "src/services/toolingService"; import { store, AppModel } from "src/store"; import { toolingActions } from "src/store/tooling.store"; import { Watch } from "vue-property-decorator"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../index"; import { awaiter } from "src/_base"; diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts index 92b98244..a92f7410 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts @@ -7,7 +7,7 @@ import { Hub } from "src/services/hub"; import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../"; import { awaiter } from "src/_base"; -import { ModalHelper } from "@/src/components/modals"; +import { ModalHelper } from "src/components/modals"; @Component({ name: "tooling", components: { card: card } }) diff --git a/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts b/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts index 6026c9ae..a240fcbb 100644 --- a/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts +++ b/Step/wwwroot/src/modules/base-components/modal-add-element-queue.ts @@ -1,8 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import Modal from "src/modules/base-components/modal.vue"; -import { Factory, MessageService, awaiter } from "../../_base"; +import { Factory, MessageService, awaiter } from "src/_base"; import moment from "moment"; import cardFolderPath from "./cards/card-folder-path.vue"; import cardElementQueue from "src/app_modules/production/components/card-element-queue.vue"; @@ -10,7 +9,7 @@ import * as iziToast from "izitoast"; import { fileService } from "src/services"; import ModalEditJob from "./modal-edit-job.vue"; -import { ModalHelper } from "@/src/components/modals"; +import { ModalHelper, Modal } from "src/components/modals"; declare var cmsClient: any; diff --git a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue index 776c245d..551dc5a2 100644 --- a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue +++ b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.vue @@ -17,53 +17,53 @@ - \ No newline at end of file + diff --git a/Step/wwwroot/src/modules/base-components/modal-edit-job.ts b/Step/wwwroot/src/modules/base-components/modal-edit-job.ts index db3213e4..3e09b11a 100644 --- a/Step/wwwroot/src/modules/base-components/modal-edit-job.ts +++ b/Step/wwwroot/src/modules/base-components/modal-edit-job.ts @@ -1,6 +1,6 @@ import Vue from "vue"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; import { Factory, MessageService } from '../../_base'; import { tool } from "src/modules/base-components/cards"; import { inputBox } from "src/modules/base-components/cards"; diff --git a/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.ts b/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.ts index 2667128f..40cf4dec 100644 --- a/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.ts +++ b/Step/wwwroot/src/modules/base-components/modal-job-add-parameter.ts @@ -1,7 +1,7 @@ import Vue from "vue"; -import { ModalHelper,Modal } from "@/src/components/modals"; -import { Factory, MessageService } from '../../_base'; +import { ModalHelper,Modal } from "src/components/modals"; +import { Factory, MessageService } from 'src/_base'; import Component from "vue-class-component"; import { Deferred } from "src/services/Deferred"; import { Prop } from "vue-property-decorator"; diff --git a/Step/wwwroot/src/modules/base-components/modal-load-program.ts b/Step/wwwroot/src/modules/base-components/modal-load-program.ts index c8e889be..2888312d 100644 --- a/Step/wwwroot/src/modules/base-components/modal-load-program.ts +++ b/Step/wwwroot/src/modules/base-components/modal-load-program.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { ModalHelper,Modal } from "@/src/components/modals"; +import { ModalHelper,Modal } from "src/components/modals"; import { Factory, MessageService, awaiter } from "../../_base"; // import { MaintenanceService } from "../services/maintenanceService"; // import { store } from "src/store"; diff --git a/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts b/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts index cd127f9b..ddb98789 100644 --- a/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts +++ b/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts @@ -1,13 +1,13 @@ import Vue from "vue"; -import Modal from "src/modules/base-components/modal.vue"; -import { Factory, MessageService } from '../../_base'; + +import { Factory, MessageService } from 'src/_base'; import missingTool from "src/modules/base-components/cards/missing-tool.vue"; import Component from "vue-class-component"; import { Deferred } from "../../services/Deferred"; import { Prop } from "vue-property-decorator"; import { relativeTimeThreshold } from "moment"; -import { ModalHelper } from "@/src/components/modals"; +import { ModalHelper, Modal } from "src/components/modals"; diff --git a/Step/wwwroot/src/modules/create-maintenance.ts b/Step/wwwroot/src/modules/create-maintenance.ts index 14d7174d..b64ca2ef 100644 --- a/Step/wwwroot/src/modules/create-maintenance.ts +++ b/Step/wwwroot/src/modules/create-maintenance.ts @@ -1,12 +1,12 @@ import Vue from "vue"; -import Modal from "src/modules/base-components/modal.vue"; + import { Factory, MessageService,awaiter } from '../_base'; import { MaintenanceService } from "../services/maintenanceService"; import moment from "moment"; import Component from "vue-class-component"; import DatePicker from "vue2-datepicker"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper, Modal } from "src/components/modals"; @Component({ components: { modal: Modal, datePicker: DatePicker },