diff --git a/Step/wwwroot/config.development.json b/Step/wwwroot/config.development.json new file mode 100644 index 00000000..207ef91f --- /dev/null +++ b/Step/wwwroot/config.development.json @@ -0,0 +1,7 @@ +{ + "env": "production", + "api": { + "enabled": true, + "apiServerUrl": "https://localhost" + } +} \ No newline at end of file diff --git a/Step/wwwroot/config.production.json b/Step/wwwroot/config.production.json new file mode 100644 index 00000000..cea1e94e --- /dev/null +++ b/Step/wwwroot/config.production.json @@ -0,0 +1,7 @@ +{ + "env": "development", + "api": { + "enabled": false, + "apiServerUrl": "https://localhost" + } +} \ No newline at end of file diff --git a/Step/wwwroot/src/@types/signalr.alarms.d.ts b/Step/wwwroot/src/@types/signalr.alarms.d.ts index feba810a..fa209bda 100644 --- a/Step/wwwroot/src/@types/signalr.alarms.d.ts +++ b/Step/wwwroot/src/@types/signalr.alarms.d.ts @@ -1,4 +1,4 @@ -import { processModelActions } from "src/store"; +import { processModelActions } from "@/store"; declare module signalr_alarms { diff --git a/Step/wwwroot/src/App.ts b/Step/wwwroot/src/App.ts index 98aa8d21..78b487fc 100644 --- a/Step/wwwroot/src/App.ts +++ b/Step/wwwroot/src/App.ts @@ -1,15 +1,15 @@ import Vue from "vue"; import { Hub } from "./services/hub"; import { Header, Footer, LocalizationService } from "./app.modules"; -import { Login } from "src/app_modules/machine"; -import { alarmList } from "src/app_modules/alarms"; -import { loginService } from "src/services/loginService"; -import { DataService } from "src/services/dataService"; +import { Login } from "@/app_modules/machine"; +import { alarmList } from "@/app_modules/alarms"; +import { loginService } from "@/services/loginService"; +import { DataService } from "@/services/dataService"; import { Factory, messageService } from "./_base"; import { ModalContainer, ModalNcContainer } from "./modules/base-components"; -import { ModalHelper } from "src/components/modals" -import { store, appModelActions, machineStatusActions } from "src/store"; -import { underTheHood } from "src/app_modules/under-the-hood"; +import { ModalHelper } from "@/components/modals" +import { store, appModelActions, machineStatusActions } from "@/store"; +import { underTheHood } from "@/app_modules/under-the-hood"; import * as iziToast from "izitoast"; diff --git a/Step/wwwroot/src/_base/baseRestService.ts b/Step/wwwroot/src/_base/baseRestService.ts index de27ec3d..c5503312 100644 --- a/Step/wwwroot/src/_base/baseRestService.ts +++ b/Step/wwwroot/src/_base/baseRestService.ts @@ -2,7 +2,7 @@ import Axios, { AxiosInstance, AxiosPromise, AxiosResponse, AxiosBasicCredential import Factory from "./factoryService"; import * as iziToast from "izitoast"; // import { localizeString } from "../filters/localizeFilter"; -import { store, AppModel } from "src/store"; +import { store, AppModel } from "@/store"; interface InterceptorRequestDelegate { (config: AxiosRequestConfig): AxiosRequestConfig; } interface InterceptorResponseDelegate { (config: AxiosResponse): AxiosResponse; } diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts index 11a80b4e..30b0e6da 100644 --- a/Step/wwwroot/src/app.business-logic.ts +++ b/Step/wwwroot/src/app.business-logic.ts @@ -1,12 +1,12 @@ import { Factory, messageService } from "./_base"; -import { machineService } from "src/services/machineService"; -import { loginService } from "src/services/loginService"; +import { machineService } from "@/services/machineService"; +import { loginService } from "@/services/loginService"; -import { store, AppModel, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions } from "src/store"; +import { store, AppModel, MachineStatusModel, machineStatusActions, localizationModelActions, machineInfoActions } from "@/store"; -import { UserInfoDialog, MachineInfoDialog, AxesCalibration, ContactInfoDialog, Login, CmsconnectInfoDialog } from "src/app_modules/machine"; -import { AreaModel } from "src/store/machineStatus.store"; +import { UserInfoDialog, MachineInfoDialog, AxesCalibration, ContactInfoDialog, Login, CmsconnectInfoDialog } from "@/app_modules/machine"; +import { AreaModel } from "@/store/machineStatus.store"; import { DataService } from "./services/dataService"; diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts index 74994d49..b50a6a13 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-detail.ts @@ -1,18 +1,18 @@ import Vue from "vue" import moment from "moment"; -import { AlarmModel } from "src/store"; -import { Hub } from "src/services"; -import { getColorFromName, isDarkColor } from "src/_base/utils"; +import { AlarmModel } from "@/store"; +import { Hub } from "@/services"; +import { getColorFromName, isDarkColor } from "@/_base/utils"; import Component from "vue-class-component"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper } from "@/components/modals"; import { Prop } from "vue-property-decorator"; -import { alarmsService } from "src/services/alarmsService"; -import { Accordion } from "src/modules/base-components"; +import { alarmsService } from "@/services/alarmsService"; +import { Accordion } from "@/modules/base-components"; @Component({ components: { accordion: Accordion } }) export default class AlarmDetail extends Vue { diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts index 975817e7..94e905e3 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts @@ -7,17 +7,17 @@ import moment from "moment"; -import { AlarmModel } from "@/src/store"; -import { loginService } from "src/services"; -import { alarmsService } from "src/services/alarmsService"; +import { AlarmModel } from "@/store"; +import { loginService } from "@/services"; +import { alarmsService } from "@/services/alarmsService"; -import { awaiter, messageService } from "src/_base"; -import { getColorFromName, isDarkColor } from "src/_base/utils"; +import { awaiter, messageService } from "@/_base"; +import { getColorFromName, isDarkColor } from "@/_base/utils"; import DatePicker from "vue2-datepicker"; -import { Accordion } from "src/modules/base-components"; -import { ModalHelper } from "src/components/modals"; -import { CustomPagination } from "src/components/pagination"; +import { Accordion } from "@/modules/base-components"; +import { ModalHelper } from "@/components/modals"; +import { CustomPagination } from "@/components/pagination"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts index 6450cd75..b7c65ea8 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarms-list.ts @@ -2,11 +2,11 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch } from "vue-property-decorator"; -import { store, AppModel, AlarmModel, alarmsModelActions,appModelActions } from "src/store"; +import { store, AppModel, AlarmModel, alarmsModelActions,appModelActions } from "@/store"; import alarmItem from "./alarm-item.vue"; import alarmDetail from "./alarm-detail.vue"; import moment from "moment"; -import { Hub } from "src/services"; +import { Hub } from "@/services"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/jobs/components/job-editor-detail.ts b/Step/wwwroot/src/app_modules/jobs/components/job-editor-detail.ts index c7af4789..bdfdad5c 100644 --- a/Step/wwwroot/src/app_modules/jobs/components/job-editor-detail.ts +++ b/Step/wwwroot/src/app_modules/jobs/components/job-editor-detail.ts @@ -9,7 +9,7 @@ import "./job-editor-lang-definition" import { Container, Draggable } from "vue-smooth-dnd"; import objectsJob from "./objects-job.vue"; import * as pf from "sprintf-js"; -import { jobService } from "src/services"; +import { jobService } from "@/services"; import * as iziToast from "izitoast"; declare var cmsClient: any; diff --git a/Step/wwwroot/src/app_modules/jobs/components/job-editor.ts b/Step/wwwroot/src/app_modules/jobs/components/job-editor.ts index 8e738d44..766b63b6 100644 --- a/Step/wwwroot/src/app_modules/jobs/components/job-editor.ts +++ b/Step/wwwroot/src/app_modules/jobs/components/job-editor.ts @@ -1,17 +1,17 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Container, Draggable } from "vue-smooth-dnd"; -import { store, AppModel, jobEditorStoreActions } from "src/store"; -import { ToolingService } from "src/services"; +import { store, AppModel, jobEditorStoreActions } from "@/store"; +import { ToolingService } from "@/services"; import * as iziToast from "izitoast"; -import { awaiter } from "src/_base"; -import { ModalImage } from "src/modules/base-components/index"; +import { awaiter } from "@/_base"; +import { ModalImage } from "@/modules/base-components/index"; -import { ModalMissingTools, ModalJobAddParameter } from "src/modules/base-components"; -import { ModalHelper } from "src/components/modals"; +import { ModalMissingTools, ModalJobAddParameter } from "@/modules/base-components"; +import { ModalHelper } from "@/components/modals"; -import { tool } from "src/modules/base-components/cards"; -import { inputBox } from "src/modules/base-components/cards"; +import { tool } from "@/modules/base-components/cards"; +import { inputBox } from "@/modules/base-components/cards"; import objectsJob from "./objects-job.vue"; import jobEditorDetail from "./job-editor-detail.vue"; diff --git a/Step/wwwroot/src/app_modules/machine/components/axes-calibration-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/axes-calibration-dialog.ts index 549bf87b..ec04ac05 100644 --- a/Step/wwwroot/src/app_modules/machine/components/axes-calibration-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/axes-calibration-dialog.ts @@ -1,5 +1,5 @@ -import { Loader } from "src/components"; -import { AppModel } from "src/store"; +import { Loader } from "@/components"; +import { AppModel } from "@/store"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/app_modules/machine/components/cmsconnect-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/cmsconnect-info-dialog.ts index d95ebc67..600dded9 100644 --- a/Step/wwwroot/src/app_modules/machine/components/cmsconnect-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/cmsconnect-info-dialog.ts @@ -1,10 +1,10 @@ import Vue from "vue"; -import { Modal, ModalHelper } from "src/components/modals"; -import { machineService } from "src/services/machineService"; -import { Factory, messageService,awaiter } from "src/_base"; +import { Modal, ModalHelper } from "@/components/modals"; +import { machineService } from "@/services/machineService"; +import { Factory, messageService,awaiter } from "@/_base"; import moment from "moment"; import Component from "vue-class-component"; -import { CmsConnectService } from "src/services"; +import { CmsConnectService } from "@/services"; import { Watch } from "vue-property-decorator"; @Component({ diff --git a/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts index d61c2e4b..ab3d4b45 100644 --- a/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/contact-info-dialog.ts @@ -1,7 +1,7 @@ import Vue from "vue"; -import { Modal, ModalHelper } from "src/components/modals"; -import { machineService, ContactConfigurationModel, ContactModel } from "src/services/machineService"; -import { Factory, messageService, awaiter } from "src/_base"; +import { Modal, ModalHelper } from "@/components/modals"; +import { machineService, ContactConfigurationModel, ContactModel } from "@/services/machineService"; +import { Factory, messageService, awaiter } from "@/_base"; import Component from "vue-class-component"; import QRCode from "qrcode"; diff --git a/Step/wwwroot/src/app_modules/machine/components/login.ts b/Step/wwwroot/src/app_modules/machine/components/login.ts index 293cdb57..355b8f57 100644 --- a/Step/wwwroot/src/app_modules/machine/components/login.ts +++ b/Step/wwwroot/src/app_modules/machine/components/login.ts @@ -1,12 +1,12 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Modal, ModalHelper } from "src/components/modals" +import { Modal, ModalHelper } from "@/components/modals" -import { Factory, messageService, awaiter } from "src/_base"; -import { loginService } from "src/app.modules"; +import { Factory, messageService, awaiter } from "@/_base"; +import { loginService } from "@/app.modules"; import { DataService } from 'src/services/dataService'; import iziToast, { IziToastSettings } from "izitoast"; -import { store, machineStatusActions } from "src/store"; +import { store, machineStatusActions } from "@/store"; @Component({ name: "login", components: { modal: Modal } }) export default class Login extends Vue { 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 353080a5..9d717aa0 100644 --- a/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/m155-dialog.ts @@ -1,9 +1,9 @@ -import { AppModel } from "src/store"; -import { Modal, ModalHelper } from "src/components/modals"; +import { AppModel } from "@/store"; +import { Modal, ModalHelper } from "@/components/modals"; import Component from "vue-class-component"; import Vue from "vue"; -import { Hub } from "src/services"; -import { Factory, messageService } from "src/_base"; +import { Hub } from "@/services"; +import { Factory, messageService } from "@/_base"; import { Watch } from "vue-property-decorator"; @Component({ components: { modal: Modal } }) diff --git a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts index cf7e741f..a8dfca10 100644 --- a/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/machine-info-dialog.ts @@ -1,7 +1,7 @@ import Vue from "vue"; -import { Modal, ModalHelper } from "src/components/modals"; -import { machineService } from "src/services/machineService"; -import { Factory, messageService } from "src/_base"; +import { Modal, ModalHelper } from "@/components/modals"; +import { machineService } from "@/services/machineService"; +import { Factory, messageService } from "@/_base"; import moment from "moment"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts b/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts index af23a95a..fb96f194 100644 --- a/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts +++ b/Step/wwwroot/src/app_modules/machine/components/user-info-dialog.ts @@ -2,14 +2,14 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch } from "vue-property-decorator"; -import { Modal, ModalHelper } from "src/components/modals" +import { Modal, ModalHelper } from "@/components/modals" -import { AppModel, localizationModelActions } from "src/store"; -import { Factory, messageService, awaiter } from "src/_base"; -import { loginService } from "src/app.modules"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; -import { LocalizationService, localizationService } from "src/services/localizationService"; -import { DataService } from "src/services/dataService"; +import { AppModel, localizationModelActions } from "@/store"; +import { Factory, messageService, awaiter } from "@/_base"; +import { loginService } from "@/app.modules"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; +import { LocalizationService, localizationService } from "@/services/localizationService"; +import { DataService } from "@/services/dataService"; @Component({ name: "userInfo", components: { modal: Modal } }) export default class UserInfo extends Vue { diff --git a/Step/wwwroot/src/app_modules/machine/components/user-info.ts b/Step/wwwroot/src/app_modules/machine/components/user-info.ts index c1b2be64..8bd6f8a0 100644 --- a/Step/wwwroot/src/app_modules/machine/components/user-info.ts +++ b/Step/wwwroot/src/app_modules/machine/components/user-info.ts @@ -1,9 +1,9 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; import moment from "moment"; -import { AppModel } from "src/store"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; +import { AppModel } from "@/store"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; @Component({ name: "user-info"}) export default class UserInfo extends Vue { diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts index d2f03e19..72e765df 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts @@ -1,9 +1,9 @@ import Vue from "vue"; -import { ModalHelper, Modal } from "src/components/modals"; -import { MaintenanceService } from "src/services/maintenanceService"; -import { getColorFromName, isDarkColor } from "src/_base/utils"; -import { alarmsModelActions, store } from "src/store"; +import { ModalHelper, Modal } from "@/components/modals"; +import { MaintenanceService } from "@/services/maintenanceService"; +import { getColorFromName, isDarkColor } from "@/_base/utils"; +import { alarmsModelActions, store } from "@/store"; import moment from "moment"; import Component from "vue-class-component"; @@ -11,7 +11,7 @@ import { Prop } from "vue-property-decorator"; import cardmaintenancewizard from "./card-maintenance-wizard.vue"; import accordionMaintenance from "./accordion-maintenance.vue"; -import {PasswordDialog} from "src/app_modules/maintenance"; +import {PasswordDialog} from "@/app_modules/maintenance"; import { Watch } from "vue-property-decorator"; @Component({ diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts index 8ee1f9e7..c47708c6 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts @@ -1,15 +1,15 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { MaintenanceProgress, CreateMaintenance } from "src/modules/base-components"; -import { ModalHelper } from "src/components/modals"; +import { MaintenanceProgress, CreateMaintenance } from "@/modules/base-components"; +import { ModalHelper } from "@/components/modals"; import maintenanceCard from "./maintenance-card.vue"; -import { MaintenanceService } from "src/services/maintenanceService"; -import { alarmsModelActions, store, AppModel } from "src/store"; -import { Factory, messageService, awaiter } from "src/_base"; +import { MaintenanceService } from "@/services/maintenanceService"; +import { alarmsModelActions, store, AppModel } from "@/store"; +import { Factory, messageService, awaiter } from "@/_base"; import moment from "moment"; -import { MaintenanceGetters, MaintenanceActions, maintenanceActions } from "src/store/maintenance.store"; +import { MaintenanceGetters, MaintenanceActions, maintenanceActions } from "@/store/maintenance.store"; import { Watch } from "vue-property-decorator"; -import { HistoryMaintenance } from "src/modules/base-components"; +import { HistoryMaintenance } from "@/modules/base-components"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/maintenance/components/password-dialog.ts b/Step/wwwroot/src/app_modules/maintenance/components/password-dialog.ts index 8756cb72..571fe704 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/password-dialog.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/password-dialog.ts @@ -1,4 +1,4 @@ -import { Modal, ModalHelper } from "src/components/modals"; +import { Modal, ModalHelper } from "@/components/modals"; import Component from "vue-class-component"; import Vue from "vue"; import { Watch } from "vue-property-decorator"; diff --git a/Step/wwwroot/src/app_modules/production/components/card-axes-production.ts b/Step/wwwroot/src/app_modules/production/components/card-axes-production.ts index 4917e594..a89ce2fc 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-axes-production.ts +++ b/Step/wwwroot/src/app_modules/production/components/card-axes-production.ts @@ -1,5 +1,5 @@ -import { Hub } from "src/services/hub"; -import { DoughnutChartAnimated } from "src/components/doughnut-chart"; +import { Hub } from "@/services/hub"; +import { DoughnutChartAnimated } from "@/components/doughnut-chart"; import Vue from "vue"; import Component from "vue-class-component"; import { Prop } from "vue-property-decorator"; diff --git a/Step/wwwroot/src/app_modules/production/components/card-element-queue.ts b/Step/wwwroot/src/app_modules/production/components/card-element-queue.ts index cb12a4b1..4f8bde47 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-element-queue.ts +++ b/Step/wwwroot/src/app_modules/production/components/card-element-queue.ts @@ -1,6 +1,6 @@ import Vue from "vue"; -import Popup from "src/modules/base-components/popup.vue"; +import Popup from "@/modules/base-components/popup.vue"; import { FileService } from 'src/services/fileService'; import Component from "vue-class-component"; import { Prop } from "vue-property-decorator"; diff --git a/Step/wwwroot/src/app_modules/production/components/card-job-production.ts b/Step/wwwroot/src/app_modules/production/components/card-job-production.ts index 9162c223..7f3e5629 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-job-production.ts +++ b/Step/wwwroot/src/app_modules/production/components/card-job-production.ts @@ -1,11 +1,11 @@ import Vue from "vue"; import cardProductionSectionFile from "./card-production-section-file.vue"; import moment from "moment"; -import { fileService, FileService } from "src/services/fileService"; +import { fileService, FileService } from "@/services/fileService"; import Component from "vue-class-component"; import { Prop, Watch } from "vue-property-decorator"; -import { ModalHelper,Modal } from "src/components/modals"; -import { ModalImage } from "src/modules/base-components/index"; +import { ModalHelper,Modal } from "@/components/modals"; +import { ModalImage } from "@/modules/base-components/index"; const maxIsolines: number = 8; @Component({ 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 e8e8175b..2f8b8447 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 @@ -1,14 +1,14 @@ import Vue from "vue"; -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; import Component from "vue-class-component"; -import { ModalHelper,Modal } from "src/components/modals"; +import { ModalHelper,Modal } from "@/components/modals"; import { Prop } from "vue-property-decorator"; -import modalLoadProgram from "src/modules/base-components/modal-load-program.vue"; +import modalLoadProgram from "@/modules/base-components/modal-load-program.vue"; import cardJobProduction from "./card-job-production.vue"; import cardQueueProduction from "./card-queue-production.vue"; diff --git a/Step/wwwroot/src/app_modules/production/components/card-queue-production.ts b/Step/wwwroot/src/app_modules/production/components/card-queue-production.ts index 5bcbaedc..f6f5ad2d 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-queue-production.ts +++ b/Step/wwwroot/src/app_modules/production/components/card-queue-production.ts @@ -1,13 +1,13 @@ import Vue from "vue"; import Component from "vue-class-component"; -import Popup from "src/modules/base-components/popup.vue"; +import Popup from "@/modules/base-components/popup.vue"; import cardElementQueue from "./card-element-queue.vue"; -import { ModalHelper,Modal } from "src/components/modals"; -import modalAddElementQueue from "src/modules/base-components/modal-add-element-queue.vue" +import { ModalHelper,Modal } from "@/components/modals"; +import modalAddElementQueue from "@/modules/base-components/modal-add-element-queue.vue" import { FileService } from 'src/services/fileService'; -import { productionActions } from "src/store/production.store"; -import { store, AppModel } from "src/store"; +import { productionActions } from "@/store/production.store"; +import { store, AppModel } from "@/store"; import { Container, Draggable, } from "vue-smooth-dnd"; @Component({ diff --git a/Step/wwwroot/src/app_modules/production/components/production.ts b/Step/wwwroot/src/app_modules/production/components/production.ts index a00f27a5..13eb0466 100644 --- a/Step/wwwroot/src/app_modules/production/components/production.ts +++ b/Step/wwwroot/src/app_modules/production/components/production.ts @@ -1,18 +1,18 @@ import Vue from "vue"; -import softkeysPrefered from "src/modules/base-components/cards/softkeys-prefered.vue" +import softkeysPrefered from "@/modules/base-components/cards/softkeys-prefered.vue" import headProduction from "./head-production.vue" import cardAxesProduction from "./card-axes-production.vue" -import processSelectionMaintenance from "src/modules/base-components/cards/process-selection-maintenance.vue"; +import processSelectionMaintenance from "@/modules/base-components/cards/process-selection-maintenance.vue"; import cardProductionCms from "./card-production-cms.vue"; -import cardScadaProduction from "src/app_modules/scada/components/card-scada-production.vue"; -import { Hub } from "src/services/hub"; -import { Factory, messageService, awaiter } from "src/_base"; -import { appModelActions, alarmsModelActions, store } from "src/store"; +import cardScadaProduction from "@/app_modules/scada/components/card-scada-production.vue"; +import { Hub } from "@/services/hub"; +import { Factory, messageService, awaiter } from "@/_base"; +import { appModelActions, alarmsModelActions, store } from "@/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 { productionActions } from "src/store/production.store"; +import { ModalHelper } from "@/components/modals"; +import { productionActions } from "@/store/production.store"; declare var cmsClient; diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-alarms.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-alarms.ts index 6e72d809..94167402 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-alarms.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-alarms.ts @@ -3,11 +3,11 @@ import Component from "vue-class-component"; import {cardReport} from "../../../modules/base-components/cards/index"; import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue"; import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue"; -import { Accordion } from "src/modules/base-components"; -import { loginService } from "src/services"; +import { Accordion } from "@/modules/base-components"; +import { loginService } from "@/services"; import DatePicker from "vue2-datepicker"; import moment from "moment"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper } from "@/components/modals"; declare let $: any; @Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } }) diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-events.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-events.ts index 9a34dab8..119afa96 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-events.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-events.ts @@ -3,11 +3,11 @@ import Component from "vue-class-component"; import { cardReport } from "../../../modules/base-components/cards/index"; import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue"; import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue"; -import { Accordion } from "src/modules/base-components"; -import { loginService } from "src/services"; +import { Accordion } from "@/modules/base-components"; +import { loginService } from "@/services"; import DatePicker from "vue2-datepicker"; import moment from "moment"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper } from "@/components/modals"; declare let $: any; @Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } }) diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-machine-status.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-machine-status.ts index 2d9f9073..95600254 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-machine-status.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-machine-status.ts @@ -1,20 +1,20 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { cardReport } from "src/modules/base-components/cards/index"; -import accordionDropdown from "src/modules/base-components/accordion-dropdown.vue"; -import modalReportSelectColumn from "src/modules/base-components/modal-report-select-column.vue"; -import { Accordion } from "src/modules/base-components"; -import { loginService } from "src/services"; +import { cardReport } from "@/modules/base-components/cards/index"; +import accordionDropdown from "@/modules/base-components/accordion-dropdown.vue"; +import modalReportSelectColumn from "@/modules/base-components/modal-report-select-column.vue"; +import { Accordion } from "@/modules/base-components"; +import { loginService } from "@/services"; import DatePicker from "vue2-datepicker"; import moment from "moment"; -import { ModalHelper } from "src/components/modals"; -import { ReportGetters } from "@/src/store/report.store"; +import { ModalHelper } from "@/components/modals"; +import { ReportGetters } from "@/store/report.store"; import Chart from "chart.js"; -import { reportService } from "src/services/reportService"; +import { reportService } from "@/services/reportService"; import { Watch } from "vue-property-decorator"; -import { DoughnutChart } from "src/components/doughnut-chart"; +import { DoughnutChart } from "@/components/doughnut-chart"; declare let $: any; @Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion, DoughnutChart } }) @@ -180,14 +180,14 @@ export default class CardReportMachineStatus extends Vue { // import Vue from "vue"; // import Component from "vue-class-component"; -// import {cardReport} from "src/modules/base-components/cards/index"; -// import accordionDropdown from "src/modules/base-components/accordion-dropdown.vue"; -// import modalReportSelectColumn from "src/modules/base-components/modal-report-select-column.vue"; -// import { Accordion } from "src/modules/base-components"; -// import { loginService } from "src/services"; +// import {cardReport} from "@/modules/base-components/cards/index"; +// import accordionDropdown from "@/modules/base-components/accordion-dropdown.vue"; +// import modalReportSelectColumn from "@/modules/base-components/modal-report-select-column.vue"; +// import { Accordion } from "@/modules/base-components"; +// import { loginService } from "@/services"; // import DatePicker from "vue2-datepicker"; // import moment from "moment"; -// import { ModalHelper } from "src/components/modals"; +// import { ModalHelper } from "@/components/modals"; // declare let $: any; // @Component({ components: { datePicker: DatePicker, cardReport: cardReport, accordionDropdown: accordionDropdown, accordion: Accordion } }) diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts index 4f1ca2c5..333e9d7e 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-production.ts @@ -1,20 +1,20 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { cardReport } from "src/modules/base-components/cards/index"; -import accordionDropdown from "src/modules/base-components/accordion-dropdown.vue"; -import modalReportSelectColumn from "src/modules/base-components/modal-report-select-column.vue"; -import { Accordion } from "src/modules/base-components"; -import { loginService } from "src/services"; +import { cardReport } from "@/modules/base-components/cards/index"; +import accordionDropdown from "@/modules/base-components/accordion-dropdown.vue"; +import modalReportSelectColumn from "@/modules/base-components/modal-report-select-column.vue"; +import { Accordion } from "@/modules/base-components"; +import { loginService } from "@/services"; import DatePicker from "vue2-datepicker"; import moment from "moment"; -import { ModalHelper } from "src/components/modals"; -import { ReportGetters } from "@/src/store/report.store"; +import { ModalHelper } from "@/components/modals"; +import { ReportGetters } from "@/store/report.store"; import { Watch } from "vue-property-decorator"; import Chart from "chart.js"; -import { reportService } from "src/services/reportService"; -import { DoughnutChart } from "src/components/doughnut-chart"; -import { CustomPagination } from "src/components/pagination"; +import { reportService } from "@/services/reportService"; +import { DoughnutChart } from "@/components/doughnut-chart"; +import { CustomPagination } from "@/components/pagination"; declare let $: any; @Component({ diff --git a/Step/wwwroot/src/app_modules/reports/components/card-report-timeline.ts b/Step/wwwroot/src/app_modules/reports/components/card-report-timeline.ts index 14d0441f..7af187ab 100644 --- a/Step/wwwroot/src/app_modules/reports/components/card-report-timeline.ts +++ b/Step/wwwroot/src/app_modules/reports/components/card-report-timeline.ts @@ -1,12 +1,12 @@ import Vue from "vue"; import { Component, Watch } from "vue-property-decorator"; -import { cardReport } from "src/modules/base-components/cards/index"; -import accordionDropdown from "src/modules/base-components/accordion-dropdown.vue"; +import { cardReport } from "@/modules/base-components/cards/index"; +import accordionDropdown from "@/modules/base-components/accordion-dropdown.vue"; import DatePicker from "vue2-datepicker"; -import { ReportGetters } from "src/store/report.store"; -import { reportService } from "src/services/reportService"; -import { TimeLineChartHeader, TimeLineChartRow } from "src/components/timeline-chart"; -import { DoughnutChart } from "src/components/doughnut-chart"; +import { ReportGetters } from "@/store/report.store"; +import { reportService } from "@/services/reportService"; +import { TimeLineChartHeader, TimeLineChartRow } from "@/components/timeline-chart"; +import { DoughnutChart } from "@/components/doughnut-chart"; declare let $: any; @Component({ diff --git a/Step/wwwroot/src/app_modules/reports/components/reports.ts b/Step/wwwroot/src/app_modules/reports/components/reports.ts index b5117f15..e64dc99c 100644 --- a/Step/wwwroot/src/app_modules/reports/components/reports.ts +++ b/Step/wwwroot/src/app_modules/reports/components/reports.ts @@ -3,16 +3,16 @@ import Component from "vue-class-component"; import {cardReport} from "../../../modules/base-components/cards/index"; import accordionDropdown from "../../../modules/base-components/accordion-dropdown.vue"; import modalReportSelectColumn from "../../../modules/base-components/modal-report-select-column.vue"; -import { Accordion } from "src/modules/base-components"; +import { Accordion } from "@/modules/base-components"; import DatePicker from "vue2-datepicker"; import moment from "moment"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper } from "@/components/modals"; -import cardReportProduction from "src/app_modules/reports/components/card-report-production.vue"; -import cardReportEvents from "src/app_modules/reports/components/card-report-events.vue"; -import cardReportAlarms from "src/app_modules/reports/components/card-report-alarms.vue"; -import cardReportMachineStatus from "src/app_modules/reports/components/card-report-machine-status.vue"; -import cardReportTimeline from "src/app_modules/reports/components/card-report-timeline.vue"; +import cardReportProduction from "@/app_modules/reports/components/card-report-production.vue"; +import cardReportEvents from "@/app_modules/reports/components/card-report-events.vue"; +import cardReportAlarms from "@/app_modules/reports/components/card-report-alarms.vue"; +import cardReportMachineStatus from "@/app_modules/reports/components/card-report-machine-status.vue"; +import cardReportTimeline from "@/app_modules/reports/components/card-report-timeline.vue"; import { reportService } from "../../../services/reportService"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts index 7c78202f..2c1bec24 100644 --- a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts +++ b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { store, AppModel } from "src/store"; -import { scadaService } from "src/services/scadaService"; +import { store, AppModel } from "@/store"; +import { scadaService } from "@/services/scadaService"; @Component({ components: { diff --git a/Step/wwwroot/src/app_modules/scada/components/scada.ts b/Step/wwwroot/src/app_modules/scada/components/scada.ts index 0c876c19..7f8ca2c5 100644 --- a/Step/wwwroot/src/app_modules/scada/components/scada.ts +++ b/Step/wwwroot/src/app_modules/scada/components/scada.ts @@ -1,9 +1,9 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { store, AppModel } from "src/store"; -import { scadaService } from "src/services/scadaService"; +import { store, AppModel } from "@/store"; +import { scadaService } from "@/services/scadaService"; import { Watch, Prop } from "vue-property-decorator"; -import { awaiter, Factory, messageService } from "src/_base"; +import { awaiter, Factory, messageService } from "@/_base"; import { scadaActions } from "../../../store/scada"; 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 cbfc0677..b4a79e7b 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 "@/components/modals"; @Component({ components: { modal: Modal } }) export default class AssistedTooling extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfive.ts b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfive.ts index fb17a287..84d8b73f 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfive.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfive.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 "@/components/modals"; @Component({ components: { modal: Modal } }) export default class AssistedToolingFive 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 ac28e581..6891263b 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingfour.ts @@ -1,8 +1,8 @@ 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 { cardAssistedTooling } from "src/modules/base-components/cards"; +import { ModalHelper,Modal } from "@/components/modals"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) export default class AssistedToolingFour extends Vue { 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 de757e09..b44cf43f 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingthree.ts @@ -1,8 +1,8 @@ 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 { cardAssistedTooling } from "src/modules/base-components/cards"; +import { ModalHelper, Modal } from "@/components/modals"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) 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 a72ab26d..6a8dec11 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/assisted-toolingtwo.ts @@ -1,8 +1,8 @@ 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 { cardAssistedTooling } from "src/modules/base-components/cards"; +import { ModalHelper, Modal } from "@/components/modals"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) export default class AssistedToolingTwo extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/depot-action-generic.ts b/Step/wwwroot/src/app_modules/tooling/components/depot-action-generic.ts index 61a9a90c..3cf44fd9 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/depot-action-generic.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/depot-action-generic.ts @@ -1,6 +1,6 @@ import Vue from "vue"; import Component from "vue-class-component"; -import Modal from "src/components/modals/modal.vue"; +import Modal from "@/components/modals/modal.vue"; @Component({ components: { modal: Modal } }) export default class DepotActionGeneric extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/depot-action-loading.ts b/Step/wwwroot/src/app_modules/tooling/components/depot-action-loading.ts index b1875c00..d301ccf3 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/depot-action-loading.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/depot-action-loading.ts @@ -1,8 +1,8 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import Modal from "src/components/modals/modal.vue"; -import { cardAssistedTooling } from "src/modules/base-components/cards"; +import Modal from "@/components/modals/modal.vue"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) export default class DepotActionLoading extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/depot-action-start-needed.ts b/Step/wwwroot/src/app_modules/tooling/components/depot-action-start-needed.ts index 61467236..c0254238 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/depot-action-start-needed.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/depot-action-start-needed.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import Modal from "src/components/modals/modal.vue"; +import Modal from "@/components/modals/modal.vue"; import { assistedTooling1 } from "../"; @Component({ components: { assistedTooling1, modal: Modal } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/depot-action-transfer.ts b/Step/wwwroot/src/app_modules/tooling/components/depot-action-transfer.ts index ea8b49ec..adcfaac0 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/depot-action-transfer.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/depot-action-transfer.ts @@ -1,8 +1,8 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import Modal from "src/components/modals/modal.vue"; -import { cardAssistedTooling } from "src/modules/base-components/cards"; +import Modal from "@/components/modals/modal.vue"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) export default class DepotActionTransfer extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/depot-action-unloading.ts b/Step/wwwroot/src/app_modules/tooling/components/depot-action-unloading.ts index d7f22d60..ee8f0a5b 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/depot-action-unloading.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/depot-action-unloading.ts @@ -1,8 +1,8 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import Modal from "src/components/modals/modal.vue"; -import { cardAssistedTooling } from "src/modules/base-components/cards"; +import Modal from "@/components/modals/modal.vue"; +import { cardAssistedTooling } from "@/modules/base-components/cards"; @Component({ components: { cardAssistedTooling, modal: Modal } }) export default class DepotActionUnloading extends Vue { 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 dbc1dafc..89e866ab 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/info-equipment.ts @@ -2,11 +2,11 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { store, AppModel } from "src/store"; +import { store, AppModel } from "@/store"; import { DepotService, ToolingService } from 'src/services'; import { Factory, messageService } from 'src/_base'; -import { Modal, ModalHelper } from "src/components/modals"; +import { Modal, ModalHelper } from "@/components/modals"; @Component({ name: "infoEquipment", diff --git a/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts index 0944461f..9148028d 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/load-depot.ts @@ -1,10 +1,10 @@ -import { ModalHelper, Modal } from "src/components/modals" +import { ModalHelper, Modal } from "@/components/modals" import { DepotService } from 'src/services/depotService'; import { Factory, messageService } from 'src/_base'; -import { inputBox } from "src/modules/base-components/cards"; -import { store, AppModel } from "src/store"; -import { ToolingGetters,toolingActions } from "src/store/tooling.store"; +import { inputBox } from "@/modules/base-components/cards"; +import { store, AppModel } from "@/store"; +import { ToolingGetters,toolingActions } from "@/store/tooling.store"; export default { diff --git a/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts b/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts index 4d46f23c..ae8e7de4 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/self-adaptive-path-dialog.ts @@ -1,10 +1,10 @@ import Vue from "vue"; -import { Modal, ModalHelper } from "src/components/modals"; -import { Factory, messageService } from "src/_base"; +import { Modal, ModalHelper } from "@/components/modals"; +import { Factory, messageService } from "@/_base"; import moment from "moment"; import Component from "vue-class-component"; -import { ToolingService } from "src/services/toolingService"; -import { awaiter } from "src/_base"; +import { ToolingService } from "@/services/toolingService"; +import { awaiter } from "@/_base"; @Component({ components: { modal: Modal } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/summary-depot.ts b/Step/wwwroot/src/app_modules/tooling/components/summary-depot.ts index 728fade3..1136e90b 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/summary-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/summary-depot.ts @@ -1,4 +1,4 @@ -import loadequipment from "src/modules/base-components/cards/load-equipment.vue"; +import loadequipment from "@/modules/base-components/cards/load-equipment.vue"; import Vue from "vue"; import Component from "vue-class-component"; 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 7a0d6349..4715fa09 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-depot.ts @@ -2,20 +2,20 @@ import Vue from "vue"; import Component from "vue-class-component"; import { Watch, Prop } from "vue-property-decorator"; -import { tool, detailCard, cardToolDepot, cardBusyDepot } from "src/modules/base-components/cards"; -import { store, AppModel, machineInfoActions } from "src/store"; -import { DepotService } from "src/services/depotService"; +import { tool, detailCard, cardToolDepot, cardBusyDepot } from "@/modules/base-components/cards"; +import { store, AppModel, machineInfoActions } from "@/store"; +import { DepotService } from "@/services/depotService"; import { mapGetters } from 'vuex' -import { depotBL } from "src/business-logic/depot-bl"; -import { ToolingService } from "src/services/toolingService"; -import { ToolingGetters,toolingActions } from "src/store/tooling.store"; +import { depotBL } from "@/business-logic/depot-bl"; +import { ToolingService } from "@/services/toolingService"; +import { ToolingGetters,toolingActions } from "@/store/tooling.store"; import LoadDepot from "./load-depot.vue"; -import { messageService, Factory, awaiter } from "src/_base"; +import { messageService, Factory, awaiter } from "@/_base"; import { Container, Draggable } from "vue-smooth-dnd"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, DepotActionStartNeeded, InfoEquipment } from "../index"; -import { Modal, ModalHelper } from "src/components/modals"; +import { Modal, ModalHelper } from "@/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 3ab65ebd..e7af06eb 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts @@ -1,15 +1,15 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { equipment, inputBox } from "src/modules/base-components/cards"; -import { ToolingService } from "src/services/toolingService"; -import { store, AppModel } from "src/store"; -import { toolingActions } from "src/store/tooling.store"; +import { equipment, inputBox } from "@/modules/base-components/cards"; +import { ToolingService } from "@/services/toolingService"; +import { store, AppModel } from "@/store"; +import { toolingActions } from "@/store/tooling.store"; import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, DepotActionStartNeeded } from "../index"; -import { awaiter } from "src/_base"; -import { Hub } from "src/services/hub"; -import { ModalHelper } from "src/components/modals"; +import { awaiter } from "@/_base"; +import { Hub } from "@/services/hub"; +import { ModalHelper } from "@/components/modals"; declare let $: any; @Component({ components: { equipment, inputBox } }) diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-families.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-families.ts index 128c2bc7..238aa309 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-families.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-families.ts @@ -1,13 +1,13 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { equipment, inputBox } from "src/modules/base-components/cards"; -import { ToolingService } from "src/services/toolingService"; -import { store, AppModel } from "src/store"; -import { toolingActions } from "src/store/tooling.store"; +import { equipment, inputBox } from "@/modules/base-components/cards"; +import { ToolingService } from "@/services/toolingService"; +import { store, AppModel } from "@/store"; +import { toolingActions } from "@/store/tooling.store"; import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, DepotActionStartNeeded } from ".."; -import { ModalHelper,Modal } from "src/components/modals"; -import { awaiter } from "src/_base"; +import { ModalHelper,Modal } from "@/components/modals"; +import { awaiter } from "@/_base"; declare let $: any; 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 1e9a5b2f..8939b276 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-magpos.ts @@ -1,13 +1,13 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { equipment, inputBox } from "src/modules/base-components/cards"; -import { ToolingService } from "src/services/toolingService"; -import { store, AppModel } from "src/store"; -import { toolingActions } from "src/store/tooling.store"; +import { equipment, inputBox } from "@/modules/base-components/cards"; +import { ToolingService } from "@/services/toolingService"; +import { store, AppModel } from "@/store"; +import { toolingActions } from "@/store/tooling.store"; import { Watch } from "vue-property-decorator"; -import { ModalHelper,Modal } from "src/components/modals"; +import { ModalHelper,Modal } from "@/components/modals"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, DepotActionStartNeeded } from "../index"; -import { awaiter } from "src/_base"; +import { awaiter } from "@/_base"; @Component({ components: { equipment, inputBox } }) export default class toolingMagPos extends Vue { diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts index d65b460b..c66938e9 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-shanks.ts @@ -1,14 +1,14 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { equipment, inputBox } from "src/modules/base-components/cards"; -import { ToolingService } from "src/services/toolingService"; -import { store, AppModel } from "src/store"; -import { toolingActions } from "src/store/tooling.store"; -import { DepotService } from "src/services/depotService"; -import { ModalHelper,Modal } from "src/components/modals"; +import { equipment, inputBox } from "@/modules/base-components/cards"; +import { ToolingService } from "@/services/toolingService"; +import { store, AppModel } from "@/store"; +import { toolingActions } from "@/store/tooling.store"; +import { DepotService } from "@/services/depotService"; +import { ModalHelper,Modal } from "@/components/modals"; import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric } from "../index"; -import { awaiter } from "src/_base"; +import { awaiter } from "@/_base"; declare let $: any; diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts index 977115d6..f638cd02 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts @@ -1,14 +1,14 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { card } from "src/modules/base-components"; -import { AppModel, store } from "src/store"; -import { ToolingService } from "src/services/toolingService"; -import { Hub } from "src/services/hub"; +import { card } from "@/modules/base-components"; +import { AppModel, store } from "@/store"; +import { ToolingService } from "@/services/toolingService"; +import { Hub } from "@/services/hub"; import { Watch } from "vue-property-decorator"; import { DepotActionLoading, DepotActionUnloading, DepotActionTransfer, DepotActionGeneric, DepotActionStartNeeded, SelfAdaptivePathDialog } from "../"; -import { awaiter } from "src/_base"; -import { ModalHelper } from "src/components/modals"; -import { DepotService } from "src/services/depotService"; +import { awaiter } from "@/_base"; +import { ModalHelper } from "@/components/modals"; +import { DepotService } from "@/services/depotService"; @Component({ name: "tooling", components: { card: card } }) diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/auto-menu.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/auto-menu.ts index 38a8ddfd..a91f569f 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/auto-menu.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/auto-menu.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; @Component({}) export default class AutoMenu extends Vue{ diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/jog-menu.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/jog-menu.ts index c3cace67..c8e3334d 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/jog-menu.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/jog-menu.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; @Component({}) export default class JogMenu extends Vue{ diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-hmi-menu.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-hmi-menu.ts index e3b26282..f1fe655b 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-hmi-menu.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-hmi-menu.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { DataService } from "src/services/dataService"; -import { awaiter } from "src/_base"; +import { DataService } from "@/services/dataService"; +import { awaiter } from "@/_base"; @Component({}) diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.ts index 51a7b6cf..1c207932 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/nc-softkeys.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; @Component({}) export default class NcSoftkeys extends Vue{ diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts index af4cf0f4..f1fa2a37 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/plc-softkeys.ts @@ -1,10 +1,10 @@ import Vue from "vue"; import Componet from "vue-class-component"; -import { AppModel, machineInfoActions, store, appModelActions } from "src/store"; -import { SoftKeysConfigurationModel } from "src/store/machineInfo.store" -import { Hub } from "src/services/hub"; -import { Factory, messageService, awaiter } from "src/_base"; -import { DataService } from "src/services/dataService"; +import { AppModel, machineInfoActions, store, appModelActions } from "@/store"; +import { SoftKeysConfigurationModel } from "@/store/machineInfo.store" +import { Hub } from "@/services/hub"; +import { Factory, messageService, awaiter } from "@/_base"; +import { DataService } from "@/services/dataService"; import onOffSoftKey from "./soft-key2.vue"; import procedureSoftKey from "./soft-key3.vue"; diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/process-selection.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/process-selection.ts index 25133dc6..b95cacd7 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/process-selection.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/process-selection.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; @Component({}) export default class ProcessSelection extends Vue{ diff --git a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts index 41de9c13..4e87b481 100644 --- a/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts +++ b/Step/wwwroot/src/app_modules/under-the-hood/components/under-the-hood.ts @@ -2,19 +2,19 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { appModelActions } from "src/store"; +import { appModelActions } from "@/store"; import plcSoftKeys from "./plc-softkeys.vue"; import ncSoftKeys from "./nc-softkeys.vue"; -import axesSoftKeys from "src/modules/axes-softkeys.vue"; +import axesSoftKeys from "@/modules/axes-softkeys.vue"; -import mheads from "src/modules/mheads.vue"; +import mheads from "@/modules/mheads.vue"; import jogMenu from "./jog-menu.vue"; import autoMenu from "./auto-menu.vue"; import hmiMenu from "./nc-hmi-menu.vue"; import processSelection from "./process-selection.vue"; -import { Factory, messageService } from "src/_base"; -import { alarmsModelActions, store } from "src/store"; +import { Factory, messageService } from "@/_base"; +import { alarmsModelActions, store } from "@/store"; @Component({ components: { diff --git a/Step/wwwroot/src/app_modules/users/components/users.ts b/Step/wwwroot/src/app_modules/users/components/users.ts index a993fcaa..1ab36aa4 100644 --- a/Step/wwwroot/src/app_modules/users/components/users.ts +++ b/Step/wwwroot/src/app_modules/users/components/users.ts @@ -1,13 +1,13 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { AppModel } from "src/store"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; -import { usersService } from "src/services"; -import { awaiter } from "src/_base"; -import { ModalHelper } from "src/components/modals"; -import { ModalCreateUser, ModalPasswordUser, ModalRoleUser } from "src/modules/base-components"; +import { AppModel } from "@/store"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; +import { usersService } from "@/services"; +import { awaiter } from "@/_base"; +import { ModalHelper } from "@/components/modals"; +import { ModalCreateUser, ModalPasswordUser, ModalRoleUser } from "@/modules/base-components"; import { Watch } from "vue-property-decorator"; -import { store } from "src/store"; +import { store } from "@/store"; declare let $: any; diff --git a/Step/wwwroot/src/business-logic/depot-bl.ts b/Step/wwwroot/src/business-logic/depot-bl.ts index 8bee2826..ba9398b7 100644 --- a/Step/wwwroot/src/business-logic/depot-bl.ts +++ b/Step/wwwroot/src/business-logic/depot-bl.ts @@ -1,8 +1,8 @@ -import { ModalHelper } from "src/components/modals"; -import { assistedTooling1 } from "src/app_modules/tooling"; +import { ModalHelper } from "@/components/modals"; +import { assistedTooling1 } from "@/app_modules/tooling"; export class DepotBusinessLogic { constructor() { diff --git a/Step/wwwroot/src/components/Home.ts b/Step/wwwroot/src/components/Home.ts index 16286b15..9bc4eb10 100644 --- a/Step/wwwroot/src/components/Home.ts +++ b/Step/wwwroot/src/components/Home.ts @@ -1,8 +1,8 @@ -import { store, machineStatusActions } from "src/store"; +import { store, machineStatusActions } from "@/store"; -import { machineService } from "src/services/machineService"; -import { loginService } from "src/services/loginService"; +import { machineService } from "@/services/machineService"; +import { loginService } from "@/services/loginService"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/components/create-queue.ts b/Step/wwwroot/src/components/create-queue.ts index 9dec1ffa..2d12605b 100644 --- a/Step/wwwroot/src/components/create-queue.ts +++ b/Step/wwwroot/src/components/create-queue.ts @@ -1,5 +1,5 @@ -import cardFolderPath from "src/modules/base-components/cards/card-folder-path.vue"; -import cardElementQueue from "src/app_modules/production/components/card-element-queue.vue"; +import cardFolderPath from "@/modules/base-components/cards/card-folder-path.vue"; +import cardElementQueue from "@/app_modules/production/components/card-element-queue.vue"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/components/loader.ts b/Step/wwwroot/src/components/loader.ts index ccc93da2..2b5789ba 100644 --- a/Step/wwwroot/src/components/loader.ts +++ b/Step/wwwroot/src/components/loader.ts @@ -1,6 +1,6 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Modal } from "src/components/modals" +import { Modal } from "@/components/modals" @Component({ name: "loader", diff --git a/Step/wwwroot/src/components/modals/ModalHelper.ts b/Step/wwwroot/src/components/modals/ModalHelper.ts index bcb1b7eb..74b5b5a1 100644 --- a/Step/wwwroot/src/components/modals/ModalHelper.ts +++ b/Step/wwwroot/src/components/modals/ModalHelper.ts @@ -1,10 +1,10 @@ -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; import ConfirmModal from "./modal-confirm.vue"; -import { Deferred } from "src/services/Deferred"; -import { M155Questions } from "src/app_modules/machine"; -import { processStore,processModelActions } from "src/store/runningProcess.store"; -import { store } from "src/store"; +import { Deferred } from "@/services/Deferred"; +import { M155Questions } from "@/app_modules/machine"; +import { processStore,processModelActions } from "@/store/runningProcess.store"; +import { store } from "@/store"; declare let $: any; export class ModalHelper { diff --git a/Step/wwwroot/src/components/utilities.ts b/Step/wwwroot/src/components/utilities.ts index b5d1debe..8aa9154b 100644 --- a/Step/wwwroot/src/components/utilities.ts +++ b/Step/wwwroot/src/components/utilities.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; import { cardutilities } from "../modules/base-components"; -import { ModalHelper } from "src/components/modals"; +import { ModalHelper } from "@/components/modals"; declare let cmsClient: any; diff --git a/Step/wwwroot/src/config.ts b/Step/wwwroot/src/config.ts index 07c70d37..e01bf66c 100644 --- a/Step/wwwroot/src/config.ts +++ b/Step/wwwroot/src/config.ts @@ -5,8 +5,37 @@ export const CONFIGURATION_DEMO = ""; // stabilise quale configurazione deve leggere il client per andare in DEBUG -export const DEBUG_CONFIGURATION = CONFIGURATION_OSAI; +export const DEBUG_CONFIGURATION = CONFIGURATION_DEMO; // stabilisce se leggere la configurazione dal server o // se utilizzare la configurazione locale -export const USE_RUNTIME_CONFIGURATION = true; \ No newline at end of file +export const USE_RUNTIME_CONFIGURATION = false; + +import axios from 'axios'; + +const configpath = "/config.".concat(process.env.NODE_ENV).concat(".json"); + +export var CONFIGURATION: IConfiguration = {} as IConfiguration; + +export const CONFIG_PROMISE = axios.get(configpath).then((response) => { + // //MAGIC: globalThis è lo scopo globale cross platform (node, browser...) polyfillato. + // //è un'opzione per esporre nello scopo globale il valore dell'oggetto di configurazione, ma non è molto elegante + // (globalThis as any).config == config; + // (window as any).config = config; + Object.assign(CONFIGURATION, response.data); + return CONFIGURATION; +}, + () => { + throw "Catastrofic error! unable to load ".concat(configpath); + }); + +export default CONFIGURATION; + + +export interface IConfiguration { + env: string, + api: { + enabled: boolean, + apiServerUrl: string + } +} \ No newline at end of file diff --git a/Step/wwwroot/src/filters/localizeFilter.ts b/Step/wwwroot/src/filters/localizeFilter.ts index c2a32b62..2b6e5fa5 100644 --- a/Step/wwwroot/src/filters/localizeFilter.ts +++ b/Step/wwwroot/src/filters/localizeFilter.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import * as pf from "sprintf-js"; -import { store, LocalizationModel, AppModel } from "src/store"; +import { store, LocalizationModel, AppModel } from "@/store"; Vue.filter("localize", function (key: string, defaultValue: string, ...args): string { let labels = (store.state as AppModel).localization.labels; diff --git a/Step/wwwroot/src/filters/securityFilter.ts b/Step/wwwroot/src/filters/securityFilter.ts index 11fad36e..4397100f 100644 --- a/Step/wwwroot/src/filters/securityFilter.ts +++ b/Step/wwwroot/src/filters/securityFilter.ts @@ -1,6 +1,6 @@ import Vue from "vue"; -import { store, LocalizationModel, AppModel } from "src/store"; +import { store, LocalizationModel, AppModel } from "@/store"; Vue.filter("checkSecurityDisabled", function (key: string): boolean { diff --git a/Step/wwwroot/src/main.ts b/Step/wwwroot/src/main.ts index 4013a7cf..c12928f9 100644 --- a/Step/wwwroot/src/main.ts +++ b/Step/wwwroot/src/main.ts @@ -1,102 +1,112 @@ import Vue from "vue"; -import VueRouter from "vue-router"; -import VeeValidate from "vee-validate"; -import { store, machineStatusActions } from "./store"; -import "./_base/gestures"; -import "./app.business-logic"; -import "./app.modules"; -import { messageService } from "src/_base"; - -// import VueDragDrop from 'vue-drag-drop'; -// Vue.use(VueDragDrop); - -const App = () => - import("./App.vue"); - -import { routes } from "./app.routes"; declare const PRODUCTION; declare const cmsClient; -try { - //debugger - if (PRODUCTION) { - Vue.config.devtools = false; // disabilita i messaggi di debug - Vue.config.performance = false; // disabilita i messaggi di tracing delle performance - } -} catch (err) { } + +import { CONFIG_PROMISE } from "@/config"; +CONFIG_PROMISE.then(async (configuration) => { + + const VueRouter = (await import("vue-router")).default; + const VeeValidate = (await import("vee-validate")).default; + const store = (await import("./store")).store; + const machineStatusActions = (await import("./store")).machineStatusActions; + + await import("./_base/gestures"); + await import("./app.business-logic"); + await import("./app.modules"); + const messageService = (await import("src/_base")).messageService; + + // import VueDragDrop from 'vue-drag-drop'; + // Vue.use(VueDragDrop); + + const App = () => + import("./App.vue"); + + const routes = (await import("./app.routes")).routes; -Vue.use(VueRouter); -Vue.use(VeeValidate); // forms validation for vuejs -// Vue.use(VueGesture); -import VTooltip from 'v-tooltip' -Vue.use(VTooltip) - -let router = new VueRouter({ linkActiveClass: "inpath", linkExactActiveClass: "active" }); -router.addRoutes(routes); - - -// ATTENZIONE : mettere a true durante lo sviluppo e riportare a false per la pubblicazione -let developerMode = true; - -// manipulate the title page -router.beforeEach((to, from, next) => { - if (to.meta && to.meta.area) { - // Check if area is enabled - if (!developerMode && !machineStatusActions.isAreaEnabled(store, to.meta.area)) { - next({ - path: '/' - }) - return; + try { + //debugger + if (PRODUCTION) { + Vue.config.devtools = false; // disabilita i messaggi di debug + Vue.config.performance = false; // disabilita i messaggi di tracing delle performance } + } catch (err) { } + + + Vue.use(VueRouter); + Vue.use(VeeValidate); // forms validation for vuejs + // Vue.use(VueGesture); + + const VTooltip = (await import('v-tooltip')).default; + Vue.use(VTooltip) + + let router = new VueRouter({ linkActiveClass: "inpath", linkExactActiveClass: "active" }); + router.addRoutes(routes); + + + // ATTENZIONE : mettere a true durante lo sviluppo e riportare a false per la pubblicazione + let developerMode = true; + + // manipulate the title page + router.beforeEach((to, from, next) => { + if (to.meta && to.meta.area) { + // Check if area is enabled + if (!developerMode && !machineStatusActions.isAreaEnabled(store, to.meta.area)) { + next({ + path: '/' + }) + return; + } + } + if (to.meta && to.meta.title) { + + if (typeof cmsClient == "undefined") + window.document.title = "CMS Active - " + to.meta.title; + else + window.document.title = to.meta.title; + } + if (store.state.machineInfo.canChangePages) + next(); + else { + messageService.publishToChannel("show-nochange-page"); + next(false); + } + }); + + + // Initialize default language + const LocalizationService = (await import("src/services/localizationService")).LocalizationService; + new LocalizationService().init(); + + + let v = new Vue({ + router: router, + store, + el: "app", + render: (h) => h(App), + }); + + + // Global filters + await import("./filters/searchFilter"); + await import("./filters/localizeFilter"); + await import("./filters/dateFilter"); + await import("./filters/securityFilter"); + await import("./filters/cnFilter"); + await import("./filters/isValidMixin"); + + // polyfills !! + if (!(String.prototype as any).format) { + (String.prototype as any).format = function () { + var args = arguments; + return this.replace(/{(\d+)}/g, function (match, number) { + return typeof args[number] != 'undefined' ? + args[number] : + match; + }); + }; } - if (to.meta && to.meta.title) { - - if (typeof cmsClient == "undefined") - window.document.title = "CMS Active - " + to.meta.title; - else - window.document.title = to.meta.title; - } - if (store.state.machineInfo.canChangePages) - next(); - else { - messageService.publishToChannel("show-nochange-page"); - next(false); - } -}); - - -// Initialize default language -import { LocalizationService } from "src/services/localizationService"; -new LocalizationService().init(); - - -let v = new Vue({ - router: router, - store, - el: "app", - render: (h) => h(App), -}); - - -// Global filters -import "./filters/searchFilter"; -import "./filters/localizeFilter"; -import "./filters/dateFilter"; -import "./filters/securityFilter"; -import "./filters/cnFilter"; -import "./filters/isValidMixin"; - -// polyfills !! -if (!(String.prototype as any).format) { - (String.prototype as any).format = function () { - var args = arguments; - return this.replace(/{(\d+)}/g, function (match, number) { - return typeof args[number] != 'undefined' ? - args[number] : - match; - }); - }; -} +}); \ No newline at end of file diff --git a/Step/wwwroot/src/modules/app-footer.ts b/Step/wwwroot/src/modules/app-footer.ts index a7d19f87..28b4a78f 100644 --- a/Step/wwwroot/src/modules/app-footer.ts +++ b/Step/wwwroot/src/modules/app-footer.ts @@ -1,7 +1,7 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { appModelActions, store, machineStatusActions } from "src/store"; -import { Factory, messageService } from "src/_base"; +import { appModelActions, store, machineStatusActions } from "@/store"; +import { Factory, messageService } from "@/_base"; declare let cmsClient: any; diff --git a/Step/wwwroot/src/modules/app-header.ts b/Step/wwwroot/src/modules/app-header.ts index d9f34603..74dd0584 100644 --- a/Step/wwwroot/src/modules/app-header.ts +++ b/Step/wwwroot/src/modules/app-header.ts @@ -1,12 +1,12 @@ import Vue from "vue"; import Component from "vue-class-component"; import { ProcessInfo } from "./base-components"; -import { AppModel, buttonStatus } from "src/store"; -import { Factory, messageService } from "src/_base"; -import { Hub } from "src/services/hub"; +import { AppModel, buttonStatus } from "@/store"; +import { Factory, messageService } from "@/_base"; +import { Hub } from "@/services/hub"; import { Watch } from "vue-property-decorator"; -import AppRibbon from "src/components/app-ribbon.vue"; -import UserInfo from "src/app_modules/machine/components/user-info.vue" +import AppRibbon from "@/components/app-ribbon.vue"; +import UserInfo from "@/app_modules/machine/components/user-info.vue" declare let $: any; diff --git a/Step/wwwroot/src/modules/axes-softkeys.ts b/Step/wwwroot/src/modules/axes-softkeys.ts index e32ae507..f019db0d 100644 --- a/Step/wwwroot/src/modules/axes-softkeys.ts +++ b/Step/wwwroot/src/modules/axes-softkeys.ts @@ -1,4 +1,4 @@ -import { Hub } from "src/services/hub"; +import { Hub } from "@/services/hub"; import Vue from "vue"; export default class AxesSoftkeys extends Vue { diff --git a/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.ts b/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.ts index ee51449b..b60e1b6a 100644 --- a/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.ts +++ b/Step/wwwroot/src/modules/base-components/cards/process-selection-maintenance.ts @@ -2,8 +2,8 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop} from 'vue-property-decorator'; -import { Hub } from "src/services/hub"; -import { processModelActions } from "src/store/runningProcess.store"; +import { Hub } from "@/services/hub"; +import { processModelActions } from "@/store/runningProcess.store"; @Component({}) export default class ProcessSelectionMaintenance extends Vue{ diff --git a/Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.ts b/Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.ts index d0707b23..4b43db54 100644 --- a/Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.ts +++ b/Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {Prop,Watch} from 'vue-property-decorator'; -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; @Component({}) export default class SoftkeysPrefered extends Vue{ 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 6660bcb6..ecfd599e 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,15 +1,15 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { Factory, messageService, awaiter } from "src/_base"; +import { Factory, messageService, awaiter } from "@/_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"; +import cardElementQueue from "@/app_modules/production/components/card-element-queue.vue"; import * as iziToast from "izitoast"; -import { fileService } from "src/services"; +import { fileService } from "@/services"; import ModalEditJob from "./modal-edit-job.vue"; -import { ModalHelper, Modal } from "src/components/modals"; +import { ModalHelper, Modal } from "@/components/modals"; declare var cmsClient: any; diff --git a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.ts b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.ts index 27b26ec8..13958b34 100644 --- a/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.ts +++ b/Step/wwwroot/src/modules/base-components/modal-add-offset-tool.ts @@ -1,7 +1,7 @@ -import { Modal, ModalHelper } from "src/components/modals"; -import { Factory, messageService } from "src/_base"; -import { inputBox } from "src/modules/base-components/cards"; -import { ToolingService } from "src/services/toolingService"; +import { Modal, ModalHelper } from "@/components/modals"; +import { Factory, messageService } from "@/_base"; +import { inputBox } from "@/modules/base-components/cards"; +import { ToolingService } from "@/services/toolingService"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/modules/base-components/modal-container.ts b/Step/wwwroot/src/modules/base-components/modal-container.ts index e99a9c82..c1889e95 100644 --- a/Step/wwwroot/src/modules/base-components/modal-container.ts +++ b/Step/wwwroot/src/modules/base-components/modal-container.ts @@ -1,4 +1,4 @@ -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; export default { computed: { isVisible: function () { diff --git a/Step/wwwroot/src/modules/base-components/modal-create-user.ts b/Step/wwwroot/src/modules/base-components/modal-create-user.ts index ff5fa6b1..7023795c 100644 --- a/Step/wwwroot/src/modules/base-components/modal-create-user.ts +++ b/Step/wwwroot/src/modules/base-components/modal-create-user.ts @@ -1,11 +1,11 @@ import Vue from "vue"; import { Factory, messageService,awaiter } from 'src/_base'; import Component from "vue-class-component"; -import { ModalHelper, Modal } from "src/components/modals"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; -import { usersService } from "src/services"; +import { ModalHelper, Modal } from "@/components/modals"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; +import { usersService } from "@/services"; import { Watch } from "vue-property-decorator"; -import { AppModel } from "src/store"; +import { AppModel } from "@/store"; @Component({ components: { modal: Modal }, 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 a038521c..a3089ef3 100644 --- a/Step/wwwroot/src/modules/base-components/modal-edit-job.ts +++ b/Step/wwwroot/src/modules/base-components/modal-edit-job.ts @@ -1,13 +1,13 @@ import Vue from "vue"; -import { ModalHelper,Modal } from "src/components/modals"; +import { ModalHelper,Modal } from "@/components/modals"; import { Factory, messageService } from '../../_base'; -import { tool } from "src/modules/base-components/cards"; -import { inputBox } from "src/modules/base-components/cards"; +import { tool } from "@/modules/base-components/cards"; +import { inputBox } from "@/modules/base-components/cards"; import Component from "vue-class-component"; import { Prop } from "vue-property-decorator"; import { Deferred } from "../../services/Deferred"; -import { AppModel } from "src/store"; +import { AppModel } from "@/store"; @Component({ components: { diff --git a/Step/wwwroot/src/modules/base-components/modal-iframe.ts b/Step/wwwroot/src/modules/base-components/modal-iframe.ts index bbf69bc3..76fe7c4e 100644 --- a/Step/wwwroot/src/modules/base-components/modal-iframe.ts +++ b/Step/wwwroot/src/modules/base-components/modal-iframe.ts @@ -1,6 +1,6 @@ -import { ModalHelper, Modal } from "src/components/modals"; +import { ModalHelper, Modal } from "@/components/modals"; import { Factory, messageService } from "../../_base"; -import { MaintenanceService } from "src/services/maintenanceService"; +import { MaintenanceService } from "@/services/maintenanceService"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/modules/base-components/modal-image.ts b/Step/wwwroot/src/modules/base-components/modal-image.ts index a1649da5..d3c4e7e1 100644 --- a/Step/wwwroot/src/modules/base-components/modal-image.ts +++ b/Step/wwwroot/src/modules/base-components/modal-image.ts @@ -1,4 +1,4 @@ -import { Modal, ModalHelper } from "src/components/modals"; +import { Modal, ModalHelper } from "@/components/modals"; import { Factory, messageService } from "../../_base"; import ZoomImage from './zoom-image.vue' import Vue from "vue"; 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 462aeb9f..49f0d62c 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,9 +1,9 @@ import Vue from "vue"; -import { ModalHelper,Modal } from "src/components/modals"; +import { ModalHelper,Modal } from "@/components/modals"; import { Factory, messageService } from 'src/_base'; import Component from "vue-class-component"; -import { Deferred } from "src/services/Deferred"; +import { Deferred } from "@/services/Deferred"; import { Prop } from "vue-property-decorator"; @Component({ 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 74eff804..8ef85a0f 100644 --- a/Step/wwwroot/src/modules/base-components/modal-load-program.ts +++ b/Step/wwwroot/src/modules/base-components/modal-load-program.ts @@ -1,14 +1,14 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { ModalHelper,Modal } from "src/components/modals"; +import { ModalHelper,Modal } from "@/components/modals"; import { Factory, messageService, awaiter } from "../../_base"; // import { MaintenanceService } from "../services/maintenanceService"; -// import { store } from "src/store"; +// import { store } from "@/store"; // import { maintenanceActions } from "../store/maintenance.store"; import moment from "moment"; import cardFolderPath from "./cards/card-folder-path.vue"; -import cardElementQueue from "src/app_modules/production/components/card-element-queue.vue"; +import cardElementQueue from "@/app_modules/production/components/card-element-queue.vue"; import * as iziToast from "izitoast"; import { fileService } from "../../services/fileService"; import ZoomImage from './zoom-image.vue' 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 e9106935..b417b460 100644 --- a/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts +++ b/Step/wwwroot/src/modules/base-components/modal-missing-tools.ts @@ -2,12 +2,12 @@ import Vue from "vue"; import { Factory, messageService } from 'src/_base'; -import missingTool from "src/modules/base-components/cards/missing-tool.vue"; +import missingTool from "@/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, Modal } from "src/components/modals"; +import { ModalHelper, Modal } from "@/components/modals"; diff --git a/Step/wwwroot/src/modules/base-components/modal-nc-container.ts b/Step/wwwroot/src/modules/base-components/modal-nc-container.ts index af653877..04dddfd4 100644 --- a/Step/wwwroot/src/modules/base-components/modal-nc-container.ts +++ b/Step/wwwroot/src/modules/base-components/modal-nc-container.ts @@ -1,4 +1,4 @@ -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; export default { computed: { isVisible: function () { diff --git a/Step/wwwroot/src/modules/base-components/modal-password-user.ts b/Step/wwwroot/src/modules/base-components/modal-password-user.ts index 555f025b..a09f9cfd 100644 --- a/Step/wwwroot/src/modules/base-components/modal-password-user.ts +++ b/Step/wwwroot/src/modules/base-components/modal-password-user.ts @@ -1,11 +1,11 @@ import Vue from "vue"; import { Factory, messageService,awaiter } from 'src/_base'; import Component from "vue-class-component"; -import { ModalHelper, Modal } from "src/components/modals"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; -import { usersService } from "src/services"; +import { ModalHelper, Modal } from "@/components/modals"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; +import { usersService } from "@/services"; import { Watch } from "vue-property-decorator"; -import { AppModel } from "src/store"; +import { AppModel } from "@/store"; @Component({ components: { modal: Modal }, diff --git a/Step/wwwroot/src/modules/base-components/modal-report-select-column.ts b/Step/wwwroot/src/modules/base-components/modal-report-select-column.ts index b175aa14..7a9be3cf 100644 --- a/Step/wwwroot/src/modules/base-components/modal-report-select-column.ts +++ b/Step/wwwroot/src/modules/base-components/modal-report-select-column.ts @@ -1,9 +1,9 @@ import Vue from "vue"; import Component from "vue-class-component"; -import { ModalHelper,Modal } from "src/components/modals"; -import { Factory, messageService } from "src/_base"; +import { ModalHelper,Modal } from "@/components/modals"; +import { Factory, messageService } from "@/_base"; import { Watch, Prop } from "vue-property-decorator"; -import { Deferred } from "src/services"; +import { Deferred } from "@/services"; declare var cmsClient: any; diff --git a/Step/wwwroot/src/modules/base-components/modal-role-user.ts b/Step/wwwroot/src/modules/base-components/modal-role-user.ts index b41d097b..efa6b7e9 100644 --- a/Step/wwwroot/src/modules/base-components/modal-role-user.ts +++ b/Step/wwwroot/src/modules/base-components/modal-role-user.ts @@ -1,11 +1,11 @@ import Vue from "vue"; import { Factory, messageService,awaiter } from 'src/_base'; import Component from "vue-class-component"; -import { ModalHelper, Modal } from "src/components/modals"; -import { getColorFromName,isDarkColor } from "src/_base/utils"; -import { usersService } from "src/services"; +import { ModalHelper, Modal } from "@/components/modals"; +import { getColorFromName,isDarkColor } from "@/_base/utils"; +import { usersService } from "@/services"; import { Watch } from "vue-property-decorator"; -import { AppModel } from "src/store"; +import { AppModel } from "@/store"; @Component({ components: { modal: Modal }, diff --git a/Step/wwwroot/src/modules/base-components/process-info.ts b/Step/wwwroot/src/modules/base-components/process-info.ts index 96bd411c..33463f09 100644 --- a/Step/wwwroot/src/modules/base-components/process-info.ts +++ b/Step/wwwroot/src/modules/base-components/process-info.ts @@ -1,5 +1,5 @@ -import { ModalHelper } from "src/components/modals"; -import { processStore } from "src/store/runningProcess.store"; +import { ModalHelper } from "@/components/modals"; +import { processStore } from "@/store/runningProcess.store"; import Vue from "vue"; import Component from "vue-class-component"; import { Prop } from "vue-property-decorator"; diff --git a/Step/wwwroot/src/modules/create-maintenance.ts b/Step/wwwroot/src/modules/create-maintenance.ts index 13a5e06a..a5d8f560 100644 --- a/Step/wwwroot/src/modules/create-maintenance.ts +++ b/Step/wwwroot/src/modules/create-maintenance.ts @@ -6,7 +6,7 @@ import { MaintenanceService } from "../services/maintenanceService"; import moment from "moment"; import Component from "vue-class-component"; import DatePicker from "vue2-datepicker"; -import { ModalHelper, Modal } from "src/components/modals"; +import { ModalHelper, Modal } from "@/components/modals"; @Component({ components: { modal: Modal, datePicker: DatePicker }, diff --git a/Step/wwwroot/src/modules/history-maintenance.ts b/Step/wwwroot/src/modules/history-maintenance.ts index 270436dc..3baec4cb 100644 --- a/Step/wwwroot/src/modules/history-maintenance.ts +++ b/Step/wwwroot/src/modules/history-maintenance.ts @@ -1,8 +1,8 @@ import Vue from "vue"; import { Factory, messageService,awaiter } from '../_base'; import moment from "moment"; -import { ModalHelper, Modal } from "src/components/modals"; -import { alarmsModelActions, store, AppModel } from "src/store"; +import { ModalHelper, Modal } from "@/components/modals"; +import { alarmsModelActions, store, AppModel } from "@/store"; import Component from "vue-class-component"; @Component({ diff --git a/Step/wwwroot/src/modules/mheads.ts b/Step/wwwroot/src/modules/mheads.ts index 0b94066a..df9ef04b 100644 --- a/Step/wwwroot/src/modules/mheads.ts +++ b/Step/wwwroot/src/modules/mheads.ts @@ -1,6 +1,6 @@ import { headStd, headAwj, headSpindle } from "./heads"; -import { AppModel } from "src/store"; -import { Hub } from "src/services/hub"; +import { AppModel } from "@/store"; +import { Hub } from "@/services/hub"; import Vue from "vue"; import Component from "vue-class-component"; diff --git a/Step/wwwroot/src/services/alarmsService.ts b/Step/wwwroot/src/services/alarmsService.ts index c856251e..d994cd63 100644 --- a/Step/wwwroot/src/services/alarmsService.ts +++ b/Step/wwwroot/src/services/alarmsService.ts @@ -1,11 +1,12 @@ -import { ModalHelper } from "src/components/modals"; -import { baseRestService } from "src/_base/baseRestService"; -import { ModalIframe, ModalImage } from "src/modules/base-components/index"; +import { ModalHelper } from "@/components/modals"; +import { baseRestService } from "@/_base/baseRestService"; +import { ModalIframe, ModalImage } from "@/modules/base-components/index"; import { AlarmModel } from "../store"; +import { CONFIGURATION } from "@/config"; export class AlarmsService extends baseRestService { - BASE_URL = "api/alarm/"; + BASE_URL = CONFIGURATION.api.apiServerUrl + "/api/alarm/"; async getAlarmsData(pagesize: number = 9): Promise<{ firstDate: any, pages: number }> { return (await this.Post(this.BASE_URL + `data?pagesize=${pagesize}`, null, true)) as any; diff --git a/Step/wwwroot/src/services/cmsconnectService.ts b/Step/wwwroot/src/services/cmsconnectService.ts index 2a7ec577..ac8cc139 100644 --- a/Step/wwwroot/src/services/cmsconnectService.ts +++ b/Step/wwwroot/src/services/cmsconnectService.ts @@ -1,8 +1,9 @@ -import { baseRestService } from "src/_base/baseRestService"; -import { store } from "src/store"; +import { baseRestService } from "@/_base/baseRestService"; +import { store } from "@/store"; +import CONFIGURATION from "@/config"; declare var cmsClient: any; export class CmsConnectService extends baseRestService { - BASE_URL = "api/cms_connect/"; + BASE_URL = CONFIGURATION.api.apiServerUrl +"/api/cms_connect/"; async RunConnectionTest() { let result = await this.Get(this.BASE_URL + "runConnectionTest", true); diff --git a/Step/wwwroot/src/services/dataService.ts b/Step/wwwroot/src/services/dataService.ts index 521546fb..8c7552cb 100644 --- a/Step/wwwroot/src/services/dataService.ts +++ b/Step/wwwroot/src/services/dataService.ts @@ -1,43 +1,46 @@ -import { baseRestService } from "src/_base/baseRestService"; -import { store, MachineInfoModel, machineInfoActions } from "src/store"; -import {SoftKeysConfigurationModel} from "../store/machineInfo.store" +import { baseRestService } from "@/_base/baseRestService"; +import { store, MachineInfoModel, machineInfoActions } from "@/store"; +import { SoftKeysConfigurationModel } from "../store/machineInfo.store" +import CONFIGURATION from "@/config"; declare var cmsClient: any; export class DataService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + async GetSoftKeysConfiguration() { - let result = await this.Get("api/configuration/softKeys"); + let result = await this.Get("/api/configuration/softKeys"); machineInfoActions.updateMachineInfo(store, { softKeys: result }) } async GetNcSoftKeysConfiguration() { - let result = await this.Get("api/configuration/nc_softKeys"); + let result = await this.Get("/api/configuration/nc_softKeys"); machineInfoActions.updateMachineInfo(store, { ncSoftKeys: result }) } async GetHeadsConfiguration() { - let result = await this.Get>("api/configuration/heads"); + let result = await this.Get>("/api/configuration/heads"); machineInfoActions.updateMachineInfo(store, { heads: result }); } - async AddUserSoftkeyFavorite(model, array){ + async AddUserSoftkeyFavorite(model, array) { let result = await this.Put("/api/user_softkey/favorite", model, true); - machineInfoActions.updateSoftKeysFavorites(store,array); + machineInfoActions.updateSoftKeysFavorites(store, array); return result; } - async GetUserSoftkeyFavorite(){ + async GetUserSoftkeyFavorite() { let result = await this.Get("/api/user_softkey/favorite", true); - machineInfoActions.updateSoftKeysFavorites(store,result); + machineInfoActions.updateSoftKeysFavorites(store, result); return result; } - async SetCurrentNcLanguage(language){ - return await this.Put("/api/nc/active_language/"+ language,null,true); + async SetCurrentNcLanguage(language) { + return await this.Put("/api/nc/active_language/" + language, null, true); } public async setActiveScreenOnHMI(screen) { - let result = await this.put("/api/nc/active_screen/"+ screen,null, true); - if(typeof cmsClient != "undefined") + let result = await this.put("/api/nc/active_screen/" + screen, null, true); + if (typeof cmsClient != "undefined") cmsClient.forceNcFocus(); return result; } diff --git a/Step/wwwroot/src/services/depotService.ts b/Step/wwwroot/src/services/depotService.ts index 8bb341fd..e334f2ee 100644 --- a/Step/wwwroot/src/services/depotService.ts +++ b/Step/wwwroot/src/services/depotService.ts @@ -1,97 +1,98 @@ -import {baseRestService }from "src/_base/baseRestService"; -import {depotActions }from "../store/depot.store"; -import {store, AppModel }from "../store"; +import { baseRestService } from "@/_base/baseRestService"; +import { depotActions } from "../store/depot.store"; +import { store, AppModel } from "../store"; +import CONFIGURATION from "@/config"; export class DepotService extends baseRestService { - BASE_URL = "api/tool_manager/"; - async GetMagazine(magazineId:any) { - let result = await this.Get < server.DepotModel[] > (this.BASE_URL + "magazine/" + magazineId + "/mounted_tools"); - depotActions.updateDepot(store, result); - return result; - } - async GetNcMagazine(magazineId: any){ - let result = await this.Get(this.BASE_URL + "nc/magazine/" + magazineId + "/mounted_shanks"); - depotActions.updateNcDepot(store, result); - return result; - } + BASE_URL = CONFIGURATION.api.apiServerUrl + "/api/tool_manager/"; + async GetMagazine(magazineId: any) { + let result = await this.Get(this.BASE_URL + "magazine/" + magazineId + "/mounted_tools"); + depotActions.updateDepot(store, result); + return result; + } - async GetToolAvailable() { - let result = await this.Get < any > (this.BASE_URL + "magazine/available_tools"); - depotActions.updateAvailableMultiTool(store, result.multiTools); - depotActions.updateAvailableTool(store, result.tools); - return result; - } + async GetNcMagazine(magazineId: any) { + let result = await this.Get(this.BASE_URL + "nc/magazine/" + magazineId + "/mounted_shanks"); + depotActions.updateNcDepot(store, result); + return result; + } - async GetNcToolAvailable(){ - let result = await this.Get (this.BASE_URL + "nc/magazine/available_tools"); - depotActions.updateNcAvailableTool(store,result); - return result; - } + async GetToolAvailable() { + let result = await this.Get(this.BASE_URL + "magazine/available_tools"); + depotActions.updateAvailableMultiTool(store, result.multiTools); + depotActions.updateAvailableTool(store, result.tools); + return result; + } - async GetNcShankAvailable(){ - let result = await this.Get(this.BASE_URL + "nc/magazine/available_shanks"); - depotActions.updateNcAvailableShank(store, result); - return result; - } + async GetNcToolAvailable() { + let result = await this.Get(this.BASE_URL + "nc/magazine/available_tools"); + depotActions.updateNcAvailableTool(store, result); + return result; + } - async AddToolToDepot(magazineId, positionId, toolId) { - let result = await this.Put < any > (this.BASE_URL + "magazine/" + magazineId + "/load/position/" + positionId, toolId); - depotActions.setDepot(store, result); - this.GetToolAvailable(); - return result; - } + async GetNcShankAvailable() { + let result = await this.Get(this.BASE_URL + "nc/magazine/available_shanks"); + depotActions.updateNcAvailableShank(store, result); + return result; + } - async AddToolToDepotNc(magazineId, positionId, shankId) { - let result = await this.Put < any > (this.BASE_URL + "nc/magazine/" + magazineId + "/load/position/" + positionId, shankId); - depotActions.setNcDepot(store, result); - this.GetNcShankAvailable(); - return result; - } + async AddToolToDepot(magazineId, positionId, toolId) { + let result = await this.Put(this.BASE_URL + "magazine/" + magazineId + "/load/position/" + positionId, toolId); + depotActions.setDepot(store, result); + this.GetToolAvailable(); + return result; + } - async RemoveToolToDepot(magazineId, positionId) { - let result = await this.Put < any > (this.BASE_URL + "magazine/" + magazineId + "/unload/position/" + positionId, {}); - depotActions.removeToolFromDepot(store, {magazineId:magazineId, positionId:positionId}as server.DepotModel); - this.GetToolAvailable(); - return result; - } + async AddToolToDepotNc(magazineId, positionId, shankId) { + let result = await this.Put(this.BASE_URL + "nc/magazine/" + magazineId + "/load/position/" + positionId, shankId); + depotActions.setNcDepot(store, result); + this.GetNcShankAvailable(); + return result; + } - async RemoveToolToDepotNc(magazineId, positionId, model) { - let result = await this.Put < any > (this.BASE_URL + "nc/magazine/" + magazineId + "/unload/position/" + positionId, model); - depotActions.removeNcShankFromDepot(store, {magazineId:magazineId, positionId:positionId}as server.DepotNcModel); - this.GetNcShankAvailable(); - return result; - } + async RemoveToolToDepot(magazineId, positionId) { + let result = await this.Put(this.BASE_URL + "magazine/" + magazineId + "/unload/position/" + positionId, {}); + depotActions.removeToolFromDepot(store, { magazineId: magazineId, positionId: positionId } as server.DepotModel); + this.GetToolAvailable(); + return result; + } - async StartNcEditToolingDepot(magazineId){ - let result = await this.Put(this.BASE_URL + "nc/start_edit_tooling/" + magazineId,{}); - return result; - } + async RemoveToolToDepotNc(magazineId, positionId, model) { + let result = await this.Put(this.BASE_URL + "nc/magazine/" + magazineId + "/unload/position/" + positionId, model); + depotActions.removeNcShankFromDepot(store, { magazineId: magazineId, positionId: positionId } as server.DepotNcModel); + this.GetNcShankAvailable(); + return result; + } - async StopNcEditToolingDepot(magazineId){ - let result = await this.Put(this.BASE_URL + "nc/stop_edit_tooling/" + magazineId, {}); - return result; - } + async StartNcEditToolingDepot(magazineId) { + let result = await this.Put(this.BASE_URL + "nc/start_edit_tooling/" + magazineId, {}); + return result; + } - async StartAssistedToolingProcedure(toolId, magazineId, positionId, action){ - let result = await this.Post(this.BASE_URL + "nc/assisted_tooling", {toolId, magazineId, positionId, action}) - return result - } + async StopNcEditToolingDepot(magazineId) { + let result = await this.Put(this.BASE_URL + "nc/stop_edit_tooling/" + magazineId, {}); + return result; + } - async exportMagazines() - { - let result = await this.Post(this.BASE_URL + "nc/export", {}, true) - - const url = window.URL.createObjectURL(new Blob([JSON.stringify(result, null, 4)])); - const link = document.createElement('a'); - link.href = url; - link.setAttribute('download', 'toolTableExport.json'); - document.body.appendChild(link); - link.click(); - } + async StartAssistedToolingProcedure(toolId, magazineId, positionId, action) { + let result = await this.Post(this.BASE_URL + "nc/assisted_tooling", { toolId, magazineId, positionId, action }) + return result + } - async sendImportFile(file) { - let result = await this.upload(this.BASE_URL + "nc/import", file, file.name, {}); - return result; - } + async exportMagazines() { + let result = await this.Post(this.BASE_URL + "nc/export", {}, true) + + const url = window.URL.createObjectURL(new Blob([JSON.stringify(result, null, 4)])); + const link = document.createElement('a'); + link.href = url; + link.setAttribute('download', 'toolTableExport.json'); + document.body.appendChild(link); + link.click(); + } + + async sendImportFile(file) { + let result = await this.upload(this.BASE_URL + "nc/import", file, file.name, {}); + return result; + } } diff --git a/Step/wwwroot/src/services/fileService.ts b/Step/wwwroot/src/services/fileService.ts index 3bc13e4f..07e4cbcb 100644 --- a/Step/wwwroot/src/services/fileService.ts +++ b/Step/wwwroot/src/services/fileService.ts @@ -1,9 +1,11 @@ -import { baseRestService } from "src/_base/baseRestService"; +import { baseRestService } from "@/_base/baseRestService"; import { productionActions } from "../store/production.store"; import { store } from "../store"; +import CONFIGURATION from "@/config"; export class FileService extends baseRestService { - BASE_URL = "api/file_manager/"; + + BASE_URL = CONFIGURATION.api.apiServerUrl + "/api/file_manager/"; async getFiles(path: string): Promise> { var result = await this.Get(this.BASE_URL + "files", true, { @@ -28,7 +30,7 @@ export class FileService extends baseRestService { return result; } - + async getActiveFileInfo(path: string) { var result = await this.Get(this.BASE_URL + "file/active/info", true, { filePath: path diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts index 7510a50a..dd96c8da 100644 --- a/Step/wwwroot/src/services/hub.ts +++ b/Step/wwwroot/src/services/hub.ts @@ -3,12 +3,12 @@ import Vue from "vue"; import { AlarmsModelActionsInterface } from "../store/alarms.store" import iziToast, { IziToastSettings } from "izitoast"; -import { store, alarmsModelActions, machineStatusActions, machineInfoActions, AppModel, appModelActions } from "src/store"; -import { Factory, messageService } from "src/_base"; -import { signalr_alarms } from "src/@types/signalr.alarms"; -import { AuthToken } from "src/_base/baseRestService"; -import { machineService } from "src/services/machineService"; -import { processModelActions, processStore } from "src/store/runningProcess.store"; +import { store, alarmsModelActions, machineStatusActions, machineInfoActions, AppModel, appModelActions } from "@/store"; +import { Factory, messageService } from "@/_base"; +import { signalr_alarms } from "@/@types/signalr.alarms"; +import { AuthToken } from "@/_base/baseRestService"; +import { machineService } from "@/services/machineService"; +import { processModelActions, processStore } from "@/store/runningProcess.store"; import { ModalHelper } from "../components/modals"; import { depotActions } from "../store/depot.store"; diff --git a/Step/wwwroot/src/services/jobService.ts b/Step/wwwroot/src/services/jobService.ts index 2da9714d..8ea357c6 100644 --- a/Step/wwwroot/src/services/jobService.ts +++ b/Step/wwwroot/src/services/jobService.ts @@ -1,9 +1,12 @@ -import { baseRestService } from "src/_base/baseRestService"; +import { baseRestService } from "@/_base/baseRestService"; +import CONFIGURATION from "@/config"; export class JobService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + async GetMacroList(): Promise> { - return await this.Get("api/file_manager/macros"); + return await this.Get(this.BASE_URL + "/api/file_manager/macros"); } } diff --git a/Step/wwwroot/src/services/localizationService.ts b/Step/wwwroot/src/services/localizationService.ts index 2e6dfb80..f820939b 100644 --- a/Step/wwwroot/src/services/localizationService.ts +++ b/Step/wwwroot/src/services/localizationService.ts @@ -1,42 +1,45 @@ import Vue from "vue"; -import { baseRestService } from "src/_base/baseRestService"; -import { store, languageModel, localizationModelActions, AppModel } from "src/store"; -import Factory from "src/_base/factoryService"; -import { awaiter } from "src/_base"; +import { baseRestService } from "@/_base/baseRestService"; +import { store, languageModel, localizationModelActions, AppModel } from "@/store"; +import Factory from "@/_base/factoryService"; +import { awaiter } from "@/_base"; +import CONFIGURATION from "@/config"; export class LocalizationService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + constructor() { super(); } async init() { // preload all avaiable languages - await awaiter (this.getLanguages()); + await awaiter(this.getLanguages()); let state = store.state as AppModel; localizationModelActions.changeCurrentLanguage(store, state.localization.currentLanguage); } - public async changeCurrentLanguage(language){ + public async changeCurrentLanguage(language) { localizationModelActions.changeCurrentLanguage(store, language); await this.getLabels(language); } public async setUserLanguage(language) { - return await this.put("/api/user/language", { language: language }, true); + return await this.put(this.BASE_URL + "/api/user/language", { language: language }, true); } public async getLanguages() { - let result = await this.Get("/api/language/languages"); + let result = await this.Get(this.BASE_URL + "/api/language/languages"); if (result) { localizationModelActions.setLanguages(store, result); } } public async getLabels(language: string): Promise { - let result = await this.Get<{ [id: string]: string }>("/api/language/" + language); + let result = await this.Get<{ [id: string]: string }>(this.BASE_URL +"/api/language/" + language); localizationModelActions.setLabels(store, result); return result; } diff --git a/Step/wwwroot/src/services/loginService.ts b/Step/wwwroot/src/services/loginService.ts index c436bb4a..25918003 100644 --- a/Step/wwwroot/src/services/loginService.ts +++ b/Step/wwwroot/src/services/loginService.ts @@ -1,12 +1,14 @@ -import { baseRestService, AuthToken, to } from "src/_base/baseRestService"; -import Factory from "src/_base/factoryService"; -import { store, appModelActions, machineStatusActions } from "src/store"; +import { baseRestService, AuthToken, to } from "@/_base/baseRestService"; +import Factory from "@/_base/factoryService"; +import { store, appModelActions, machineStatusActions } from "@/store"; import { machineService } from "./machineService"; -import {Hub} from "src/services/hub" +import { Hub } from "@/services/hub" +import CONFIGURATION from "@/config"; class LoginService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; public isAuthenticated: boolean = false; @@ -24,25 +26,25 @@ class LoginService extends baseRestService { } async getUserInfo(): Promise { - let result = await this.Get("api/user/info", true).catch(() => { + let result = await this.Get(this.BASE_URL + "/api/user/info", true).catch(() => { appModelActions.SetCurrentUser(store, null); }) appModelActions.SetCurrentUser(store, result); await this.getAuthorizationFunction(); new machineService().getMachineCNInfo(); - + Hub.Current.updateAuthToken() } async getAuthorizationFunction(): Promise { - let result = await this.Get("api/authorization/functions", true).catch(() => { + let result = await this.Get(this.BASE_URL + "/api/authorization/functions", true).catch(() => { appModelActions.SetCurrentUser(store, null); }); machineStatusActions.setSecurityFunction(store, result); } async getAllUsers(): Promise { - let result = await this.Get("api/user/list",true); + let result = await this.Get(this.BASE_URL + "/api/user/list", true); return result; } @@ -50,7 +52,7 @@ class LoginService extends baseRestService { var formdata = "grant_type=password&username=" + data.username + "&password=" + data.password; - var result = await this.http.post("/token", formdata, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }); + var result = await this.http.post(this.BASE_URL + "/token", formdata, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }); if (result.status == 200) { this.isAuthenticated = true; @@ -68,7 +70,7 @@ class LoginService extends baseRestService { } public async Logout(): Promise { - var response = await this.post("/api/user/logout", null, true); + var response = await this.post(this.BASE_URL + "/api/user/logout", null, true); this.deleteAuthenticationToken(); appModelActions.SetCurrentUser(store, null); diff --git a/Step/wwwroot/src/services/machineService.ts b/Step/wwwroot/src/services/machineService.ts index e0749a8a..6e50cc27 100644 --- a/Step/wwwroot/src/services/machineService.ts +++ b/Step/wwwroot/src/services/machineService.ts @@ -1,28 +1,31 @@ -import { baseRestService } from "src/_base/baseRestService"; -import { AreaModel } from "src/store/machineStatus.store"; -import { store, machineInfoActions, MachineInfoModel } from "src/store"; -import { Factory, messageService } from "src/_base"; +import { baseRestService } from "@/_base/baseRestService"; +import { AreaModel } from "@/store/machineStatus.store"; +import { store, machineInfoActions, MachineInfoModel } from "@/store"; +import { Factory, messageService } from "@/_base"; +import CONFIGURATION from "@/config"; export class machineService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + async getAreasConfiguration(): Promise { return await this.Get("/api/configuration/areas"); } async getCmsContactConfiguration(): Promise { - return await this.Get("/api/configuration/cmscontact") + return await this.Get(this.BASE_URL + "/api/configuration/cmscontact") } async getScmContactConfiguration(): Promise { - return await this.Get("/api/configuration/scmcontact") + return await this.Get(this.BASE_URL + "/api/configuration/scmcontact") } async getMachineConfiguration(): Promise { - return await this.Get("/api/configuration/client") + return await this.Get(this.BASE_URL + "/api/configuration/client") } async getMachineCNInfo(): Promise { - let result = await this.Get("/api/nc/generic_data", true).catch(r => { + let result = await this.Get(this.BASE_URL + "/api/nc/generic_data", true).catch(r => { }); if (result) { @@ -66,7 +69,7 @@ export interface ContactConfigurationModel { ContactInfoError: string } -export interface ContactModel{ +export interface ContactModel { visible: boolean, name: string, company: string, diff --git a/Step/wwwroot/src/services/maintenanceService.ts b/Step/wwwroot/src/services/maintenanceService.ts index 6ac81647..c44ef07a 100644 --- a/Step/wwwroot/src/services/maintenanceService.ts +++ b/Step/wwwroot/src/services/maintenanceService.ts @@ -1,12 +1,13 @@ -import { baseRestService } from "src/_base/baseRestService"; -import { maintenanceActions } from "src/store/maintenance.store"; -import { ModalHelper } from "src/components/modals"; -import { Factory, messageService } from "src/_base"; -import { store, AppModel } from "src/store"; -import { ModalIframe, ModalImage } from "src/modules/base-components/index"; +import { baseRestService } from "@/_base/baseRestService"; +import { maintenanceActions } from "@/store/maintenance.store"; +import { ModalHelper } from "@/components/modals"; +import { Factory, messageService } from "@/_base"; +import { store, AppModel } from "@/store"; +import { ModalIframe, ModalImage } from "@/modules/base-components/index"; +import CONFIGURATION from "@/config"; export class MaintenanceService extends baseRestService { - BASE_URL = "api/maintenance_manager/"; + BASE_URL = CONFIGURATION.api.apiServerUrl + "/api/maintenance_manager/"; async GetMaintenances() { let result = await this.Get(this.BASE_URL + "maintenances", true); diff --git a/Step/wwwroot/src/services/reportService.ts b/Step/wwwroot/src/services/reportService.ts index 299eb411..e1afaaf7 100644 --- a/Step/wwwroot/src/services/reportService.ts +++ b/Step/wwwroot/src/services/reportService.ts @@ -1,33 +1,35 @@ import { baseRestService } from "../_base/baseRestService"; import { reportActions } from "../store/report.store"; import { store } from "../store"; +import CONFIGURATION from "@/config"; export class ReportService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; async Data(): Promise { - let result = await this.Get('/api/report/data'); - reportActions.updateReportData(store,result); + let result = await this.Get(this.BASE_URL + '/api/report/data'); + reportActions.updateReportData(store, result); return result; } async PieChart(filterInterval: Array): Promise { let filter = { - startDate: filterInterval[0], - endDate: filterInterval[1] + startDate: filterInterval[0], + endDate: filterInterval[1] } - let result = await this.Post('/api/report/pieChart',filter,true); - reportActions.updateReportPieChart(store,result); + let result = await this.Post(this.BASE_URL + '/api/report/pieChart', filter, true); + reportActions.updateReportPieChart(store, result); return result; } async TimeLine(filterInterval: Array, name: string): Promise { let filter = { - name: name || "", - startDate: filterInterval[0], - endDate: filterInterval[1] + name: name || "", + startDate: filterInterval[0], + endDate: filterInterval[1] }; - let result = await this.Post('/api/report/timeLine',filter,true); + let result = await this.Post(this.BASE_URL + '/api/report/timeLine', filter, true); reportActions.updateReportTimeLineChart(store, result); return result; } @@ -40,8 +42,8 @@ export class ReportService extends baseRestService { startDate: filterInterval[0], endDate: filterInterval[1] } - let result = await this.Post('/api/report/programs', filter, true); - reportActions.updateReportTableProduction(store,result.occurrences); + let result = await this.Post(this.BASE_URL + '/api/report/programs', filter, true); + reportActions.updateReportTableProduction(store, result.occurrences); return result; } } diff --git a/Step/wwwroot/src/services/scadaService.ts b/Step/wwwroot/src/services/scadaService.ts index ed6cda5d..c1f9c00c 100644 --- a/Step/wwwroot/src/services/scadaService.ts +++ b/Step/wwwroot/src/services/scadaService.ts @@ -1,14 +1,17 @@ import { baseRestService } from "../_base/baseRestService"; import { scadaActions } from "../store/scada"; import { store } from "../store"; +import CONFIGURATION from "@/config"; export class ScadaService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + async ListScada(): Promise { - let result = await this.Get('/api/scada/list'); + let result = await this.Get(this.BASE_URL + '/api/scada/list'); scadaActions.setScada(store, result); - let prodresult = await this.Get('/api/scada/production'); + let prodresult = await this.Get(this.BASE_URL + '/api/scada/production'); result = prodresult.schemes as scada.ScadaInterface[]; scadaActions.addScada(store, result); @@ -18,24 +21,24 @@ export class ScadaService extends baseRestService { } async SendInputValue(scadaId: number, inputId: number, value: any) { - let result = await this.Post(`/api/scada/write?scadaId=${scadaId}&elementType=2&elementId=${inputId}`, value); + let result = await this.Post(this.BASE_URL + `/api/scada/write?scadaId=${scadaId}&elementType=2&elementId=${inputId}`, value); return result; } async SendButtonValue(scadaId: number, buttonId: number) { - let result = await this.Post(`/api/scada/write?scadaId=${scadaId}&elementType=0&elementId=${buttonId}`, 1); + let result = await this.Post(this.BASE_URL + `/api/scada/write?scadaId=${scadaId}&elementType=0&elementId=${buttonId}`, 1); return result; } async SendImageValue(scadaId: number, imageId: number) { - let result = await this.Post(`/api/scada/write?scadaId=${scadaId}&elementType=1&elementId=${imageId}`, 1); + let result = await this.Post(this.BASE_URL + `/api/scada/write?scadaId=${scadaId}&elementType=1&elementId=${imageId}`, 1); return result; } async Subscribe(scadaId: number): Promise { - return await this.Get(`/api/scada/subscribe/${scadaId}`) + return await this.Get(this.BASE_URL + `/api/scada/subscribe/${scadaId}`) } async Unsubscribe(scadaId: number): Promise { - return await this.Get(`/api/scada/unsubscribe/${scadaId}`) + return await this.Get(this.BASE_URL + `/api/scada/unsubscribe/${scadaId}`) } } diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts index f586455a..c584262c 100644 --- a/Step/wwwroot/src/services/toolingService.ts +++ b/Step/wwwroot/src/services/toolingService.ts @@ -1,16 +1,17 @@ -import { baseRestService } from "src/_base/baseRestService"; +import { baseRestService } from "@/_base/baseRestService"; import { toolingActions } from "../store/tooling.store"; import { store, AppModel } from "../store"; +import CONFIGURATION from "@/config"; export class ToolingService extends baseRestService { - BASE_URL = "api/tool_manager/"; + BASE_URL = CONFIGURATION.api.apiServerUrl + "/api/tool_manager/"; async GetTools() { let result = await this.Get(this.BASE_URL + "tools"); toolingActions.updateTools(store, result); } - async GetNcTools(){ + async GetNcTools() { let result = await this.Get(this.BASE_URL + "nc/tools"); toolingActions.updateNcTools(store, result); } @@ -21,7 +22,7 @@ export class ToolingService extends baseRestService { toolingActions.updateFamilies(store, result); } - async GetNcFamilies(){ + async GetNcFamilies() { let result = await this.Get(this.BASE_URL + "nc/families"); // toolingActions.clearFamilies(store); toolingActions.updateNcFamilies(store, result); @@ -32,7 +33,7 @@ export class ToolingService extends baseRestService { toolingActions.updateShanks(store, result); } - async GetNcShanks(){ + async GetNcShanks() { let result = await this.Get(this.BASE_URL + "nc/shanks"); toolingActions.updateNcShanks(store, result); } @@ -44,7 +45,7 @@ export class ToolingService extends baseRestService { toolingActions.updateMagazinesPositions(store, result); } - async GetNcMagazinesPositions(){ + async GetNcMagazinesPositions() { let result = await this.Get(this.BASE_URL + "nc/magazines_positions"); toolingActions.updateMagazinesPositions(store, result); } @@ -56,7 +57,7 @@ export class ToolingService extends baseRestService { toolingActions.updateMagPos(store, result); } - async GetNcMagazinePosition(id){ + async GetNcMagazinePosition(id) { let result = await this.Get(this.BASE_URL + "nc/magazine/" + id + "/positions"); toolingActions.updateMagPos(store, result); } @@ -67,8 +68,8 @@ export class ToolingService extends baseRestService { ); var ts = (store.state as any).tooling; - - if(!ts.magazines || ts.magazines.length ==0) + + if (!ts.magazines || ts.magazines.length == 0) toolingActions.updateMagazine(store, result.magazines); toolingActions.setMaxTools(store, result.maxTools); toolingActions.setMaxOffset(store, result.maxOffsets); @@ -82,7 +83,7 @@ export class ToolingService extends baseRestService { toolingActions.setOffsetOptionActive(store, result.offsetOptionActive); toolingActions.setMagPositionOptionActive(store, result.magPositionOptionActive); toolingActions.updateToolsConfigurations(store, result.toolsConfiguration); - + toolingActions.setLifeOption(store, result.lifeOption); toolingActions.updateMagazinePosConfigurations( store, @@ -120,7 +121,7 @@ export class ToolingService extends baseRestService { return response; } // old method - async SetNcFamily(model: any){ + async SetNcFamily(model: any) { var response = await this.Post(this.BASE_URL + "nc/family", model); toolingActions.updateNcFamily(store, response); return response; @@ -139,8 +140,8 @@ export class ToolingService extends baseRestService { return response; } - async UpdateFamily(model: server.Families){ - var response = await this.Put(this.BASE_URL + "family/" + (model as any).oldName , model); + async UpdateFamily(model: server.Families) { + var response = await this.Put(this.BASE_URL + "family/" + (model as any).oldName, model); // debo salvare il modello perch� le families non hanno ID e quindi devo utilizzare il vecchio ID che mi genero lato client. model.name = response.name; @@ -148,7 +149,7 @@ export class ToolingService extends baseRestService { return response; } - async UpdateNcFamily(model: server.FamiliesNc){ + async UpdateNcFamily(model: server.FamiliesNc) { var response = await this.Put(this.BASE_URL + "nc/family/" + model.id, model); toolingActions.updateNcFamily(store, model); return response; @@ -160,7 +161,7 @@ export class ToolingService extends baseRestService { return response; } - async SetNcShank(shankId: any){ + async SetNcShank(shankId: any) { var response = await this.Post(this.BASE_URL + "nc/shank/" + shankId, {}); toolingActions.updateNcShank(store, response); return response; @@ -172,20 +173,20 @@ export class ToolingService extends baseRestService { return response; } // old method - async SetNcTool(model: any){ + async SetNcTool(model: any) { var response = await this.Post(this.BASE_URL + "nc/tool", model); toolingActions.updateNcTool(store, response); return response; } - async UpdateSiemensTool(model: any){ + async UpdateSiemensTool(model: any) { var response = await this.Put(this.BASE_URL + "siemens/tool/" + model.id, model); // devo salvare il modello perchè le families non hanno ID e quindi devo utilizzare il vecchio ID che mi genero lato client. toolingActions.updateTool(store, model); return response; } - async UpdateNcTool(model: any){ + async UpdateNcTool(model: any) { var response = await this.Put(this.BASE_URL + "nc/tool/" + model.id, model); toolingActions.updateNcTool(store, response); return response; @@ -198,40 +199,40 @@ export class ToolingService extends baseRestService { return result; } - async DeleteNcTool(model: any){ + async DeleteNcTool(model: any) { var result = await this.Delete(this.BASE_URL + "nc/tool/" + model.id); toolingActions.deleteNcTool(store, model); return result; } - async SetEdgeData(tool: any,model: any){ + async SetEdgeData(tool: any, model: any) { var result = await this.Post(this.BASE_URL + "tool/" + tool.id + "/edge", model); - toolingActions.setEdgeData(store, {tool,result}); + toolingActions.setEdgeData(store, { tool, result }); return result; } - async UpdateEdgeData(tool: any, model: any){ + async UpdateEdgeData(tool: any, model: any) { - var result = await this.Put(this.BASE_URL + "tool/"+ tool.id + "/edge/" + model.id, model); + var result = await this.Put(this.BASE_URL + "tool/" + tool.id + "/edge/" + model.id, model); toolingActions.updateEdgeData(store, model); return result; } - async UpdateNcEdgeData(tool: any, model: any){ - var result = await this.Put(this.BASE_URL + "nc/offset/" + model.id,model); + async UpdateNcEdgeData(tool: any, model: any) { + var result = await this.Put(this.BASE_URL + "nc/offset/" + model.id, model); toolingActions.updateNcTool(store, tool); return result; } - async DeleteEdgeData(tool: any, model: any){ + async DeleteEdgeData(tool: any, model: any) { var result = await this.Delete(this.BASE_URL + "tool/" + tool.id + "/edge/" + model.id); - toolingActions.deleteEdgeData(store, {tool,model}); + toolingActions.deleteEdgeData(store, { tool, model }); return result; } - async DeleteOffsetFromTool(pos,toolId){ - let result = await this.Put(this.BASE_URL + "nc/tool/" + toolId + "/position/" + pos + "/offset/" + 0,{}); + async DeleteOffsetFromTool(pos, toolId) { + let result = await this.Put(this.BASE_URL + "nc/tool/" + toolId + "/position/" + pos + "/offset/" + 0, {}); return result; } @@ -242,9 +243,9 @@ export class ToolingService extends baseRestService { return result; } - async DeleteNcFamily(model: any){ + async DeleteNcFamily(model: any) { var result = await this.Delete(this.BASE_URL + "nc/family/" + model.id); - toolingActions.deleteNcFamily(store,model); + toolingActions.deleteNcFamily(store, model); return result; } @@ -254,60 +255,60 @@ export class ToolingService extends baseRestService { return result; } - async DeleteNcShank(model: any){ + async DeleteNcShank(model: any) { var result = await this.Delete(this.BASE_URL + "nc/shank/" + model.id); toolingActions.deleteNcShank(store, model); return result; } - async UpdateShank(model: server.Shanks){ + async UpdateShank(model: server.Shanks) { var response = await this.Put(this.BASE_URL + "shank/" + model.id, model); toolingActions.updateShank(store, model); return response; } - async UpdateNcShank(model: any){ + async UpdateNcShank(model: any) { var response = await this.Put(this.BASE_URL + "nc/shank/" + model.id, model); toolingActions.updateNcShank(store, model); return response; } - async UpdateMagPos(model: server.MagazinesPositions){ + async UpdateMagPos(model: server.MagazinesPositions) { var response = await this.Put(this.BASE_URL + "magazine/" + model.magazineId + "/position/" + model.positionId, model); toolingActions.updateMagazinePosition(store, model); return response; } - async UpdateNcMagPos(model: server.MagazinesPositions){ + async UpdateNcMagPos(model: server.MagazinesPositions) { var response = await this.Put(this.BASE_URL + "nc/magazine/" + model.magazineId + "/position/" + model.positionId, model); toolingActions.updateMagazinePosition(store, model); return response; } - async addToolToShank(shank: any, model: any){ - var response = await this.Put(this.BASE_URL + "shank/"+ shank.id + "/load/" + model.multitoolId + "/tool/" + model.id, model); + async addToolToShank(shank: any, model: any) { + var response = await this.Put(this.BASE_URL + "shank/" + shank.id + "/load/" + model.multitoolId + "/tool/" + model.id, model); - toolingActions.addToolToShank(store,{shank, model}); + toolingActions.addToolToShank(store, { shank, model }); return response; } - async addToolToShankNc(shank: any, model: any){ - var response = await this.Put(this.BASE_URL + "nc/shank/"+ shank.id + "/load/tool/" + model.id, model); - toolingActions.addToolToShankNc(store,{shank, model}); + async addToolToShankNc(shank: any, model: any) { + var response = await this.Put(this.BASE_URL + "nc/shank/" + shank.id + "/load/tool/" + model.id, model); + toolingActions.addToolToShankNc(store, { shank, model }); return response; } - async removeToolToShank(shank: any, model: any){ + async removeToolToShank(shank: any, model: any) { - var response = await this.Put(this.BASE_URL + "shank/"+ shank.id + "/unload/" + model.multitoolId, model); - toolingActions.removeToolToShank(store,{shank, model}); + var response = await this.Put(this.BASE_URL + "shank/" + shank.id + "/unload/" + model.multitoolId, model); + toolingActions.removeToolToShank(store, { shank, model }); return response; } - async removeToolToShankNc(shank: any, model: any){ + async removeToolToShankNc(shank: any, model: any) { - var response = await this.Put(this.BASE_URL + "nc/shank/"+ shank.id + "/unload/tool/" + model.id, model); - toolingActions.removeToolToNcShank(store,{shank, model}); + var response = await this.Put(this.BASE_URL + "nc/shank/" + shank.id + "/unload/tool/" + model.id, model); + toolingActions.removeToolToNcShank(store, { shank, model }); return response; } async GetMagazinePositionDepot(id) { @@ -324,8 +325,8 @@ export class ToolingService extends baseRestService { toolingActions.setMagPosNcDepot(store, result); } - async AddOffsetToToolPosition(pos,toolId,offsetId){ - let result = await this.Put(this.BASE_URL + "nc/tool/" + toolId + "/position/" + pos + "/offset/" + offsetId,{}); + async AddOffsetToToolPosition(pos, toolId, offsetId) { + let result = await this.Put(this.BASE_URL + "nc/tool/" + toolId + "/position/" + pos + "/offset/" + offsetId, {}); return result; } @@ -339,5 +340,5 @@ export class ToolingService extends baseRestService { let result = await this.Put(this.BASE_URL + "nc/selfadaptivepathstep", model); return result; } - + } diff --git a/Step/wwwroot/src/services/usersService.ts b/Step/wwwroot/src/services/usersService.ts index 2a02f699..d5538e4f 100644 --- a/Step/wwwroot/src/services/usersService.ts +++ b/Step/wwwroot/src/services/usersService.ts @@ -1,62 +1,65 @@ -import { baseRestService } from "src/_base/baseRestService"; +import { baseRestService } from "@/_base/baseRestService"; import { usersActions } from "../store/users.store"; -import Factory from "src/_base/factoryService"; +import Factory from "@/_base/factoryService"; import { store, AppModel } from "../store"; -import { loginService } from "src/app.modules"; +import { loginService } from "@/app.modules"; +import CONFIGURATION from "@/config"; export class UsersService extends baseRestService { + BASE_URL = CONFIGURATION.api.apiServerUrl; + async getUsers(): Promise { - let result = await this.Get("api/user/manager/list",true); + let result = await this.Get(this.BASE_URL + "/api/user/manager/list", true); usersActions.updateUsers(store, result); return result; } async getRoles(): Promise { - let result = await this.Get("api/user/manager/role/list",true); + let result = await this.Get(this.BASE_URL + "/api/user/manager/role/list", true); return result; } - async createUser(model: any){ - var result = await this.Post("api/user/manager/user/", model,true); + async createUser(model: any) { + var result = await this.Post(this.BASE_URL + "/api/user/manager/user/", model, true); usersActions.updateUser(store, result); return result; - } - - async editUser(model: any){ - var result = await this.Put("api/user/manager/user/" + model.id , model,true); + } + + async editUser(model: any) { + var result = await this.Put(this.BASE_URL + "/api/user/manager/user/" + model.id, model, true); usersActions.updateUser(store, result); //if is logged update info - if((store.state as AppModel).currentUser.id == model.id){ + if ((store.state as AppModel).currentUser.id == model.id) { await loginService.getUserInfo(); } return result; } - async editPassword(id: number,model: any){ - var result = await this.Put("api/user/manager/password/" + id , model,true); + async editPassword(id: number, model: any) { + var result = await this.Put(this.BASE_URL + "/api/user/manager/password/" + id, model, true); usersActions.updateUser(store, result); return result; } - - async deleteUser(model: any){ - var result = await this.Delete("api/user/manager/user/" + model.id ,true); + + async deleteUser(model: any) { + var result = await this.Delete(this.BASE_URL + "/api/user/manager/user/" + model.id, true); usersActions.deleteUser(store, model.id); return result; } - - async editRole(model: any,roleId:number){ - var result = await this.Put("api/user/manager/user/" + model.id +"/role/" + roleId , null,true); + + async editRole(model: any, roleId: number) { + var result = await this.Put(this.BASE_URL + "/api/user/manager/user/" + model.id + "/role/" + roleId, null, true); usersActions.updateUser(store, result); - + //if is logged update info - if((store.state as AppModel).currentUser.id == model.id){ + if ((store.state as AppModel).currentUser.id == model.id) { await loginService.getUserInfo(); } return result; } - + } diff --git a/Step/wwwroot/src/store/alarms.store.ts b/Step/wwwroot/src/store/alarms.store.ts index 4b18d392..7b50e607 100644 --- a/Step/wwwroot/src/store/alarms.store.ts +++ b/Step/wwwroot/src/store/alarms.store.ts @@ -1,6 +1,6 @@ -import { UUID } from "src/_base/utils"; -import { Hub } from "src/services/hub"; -import { signalr_alarms } from "src/@types/signalr.alarms"; +import { UUID } from "@/_base/utils"; +import { Hub } from "@/services/hub"; +import { signalr_alarms } from "@/@types/signalr.alarms"; export interface AlarmsModel { alarms: Array, diff --git a/Step/wwwroot/src/store/app.store.ts b/Step/wwwroot/src/store/app.store.ts index 585179e2..a8fe29a1 100644 --- a/Step/wwwroot/src/store/app.store.ts +++ b/Step/wwwroot/src/store/app.store.ts @@ -10,7 +10,7 @@ import { toolingStore, ToolingStoreModel } from "./tooling.store"; import { depotStore, DepotStoreModel } from "./depot.store"; import { maintenanceStore, MaintenanceStoreModel } from "./maintenance.store"; -import { LocalizationService, localizationService } from "src/services/localizationService"; +import { LocalizationService, localizationService } from "@/services/localizationService"; import { ProductionStoreModel, productionStore } from "./production.store"; import { jobEditorStore } from "./jobEditor.store"; import { scadaStore, ScadaModel } from "./scada"; diff --git a/Step/wwwroot/src/store/localization.store.ts b/Step/wwwroot/src/store/localization.store.ts index 263523c4..edd924ac 100644 --- a/Step/wwwroot/src/store/localization.store.ts +++ b/Step/wwwroot/src/store/localization.store.ts @@ -1,8 +1,8 @@ -import { Factory } from "src/_base"; +import { Factory } from "@/_base"; -import { appModelActions, AppModel } from "src/store/app.store"; +import { appModelActions, AppModel } from "@/store/app.store"; import { VuexPersistance } from "./storePersistance"; -import { messageService } from "src/_base"; +import { messageService } from "@/_base"; export class languageModel { public name: string; diff --git a/Step/wwwroot/src/store/machineStatus.store.ts b/Step/wwwroot/src/store/machineStatus.store.ts index 729e2ed1..0a7e52b1 100644 --- a/Step/wwwroot/src/store/machineStatus.store.ts +++ b/Step/wwwroot/src/store/machineStatus.store.ts @@ -1,4 +1,4 @@ -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; // Check if declare let cmsClient: any; diff --git a/Step/wwwroot/src/store/scada.ts b/Step/wwwroot/src/store/scada.ts index e71e0827..31b4365c 100644 --- a/Step/wwwroot/src/store/scada.ts +++ b/Step/wwwroot/src/store/scada.ts @@ -1,4 +1,4 @@ -import { Factory, messageService } from "src/_base"; +import { Factory, messageService } from "@/_base"; // Check if declare let cmsClient: any; diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts index dd6d368d..977e619d 100644 --- a/Step/wwwroot/src/store/tooling.store.ts +++ b/Step/wwwroot/src/store/tooling.store.ts @@ -1,6 +1,6 @@ -import { UUID } from "src/_base/utils"; +import { UUID } from "@/_base/utils"; -import { machineInfoStore } from "src/store/machineInfo.store"; +import { machineInfoStore } from "@/store/machineInfo.store"; export interface ToolingStoreModel { magazines: Array diff --git a/Step/wwwroot/tsconfig.json b/Step/wwwroot/tsconfig.json index f0c8cfd8..6a98a128 100644 --- a/Step/wwwroot/tsconfig.json +++ b/Step/wwwroot/tsconfig.json @@ -1,38 +1,44 @@ { - "compileOnSave": false, - "compilerOptions": { - "allowSyntheticDefaultImports": true, - "outDir": "./bin/ts-out", - "allowJs": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "esNext", - "moduleResolution": "node", - "sourceMap": true, - "target": "es5", - "noImplicitReturns": true, - "baseUrl": ".", - "paths": { - "@/*": ["*"] - }, - "types": [ - - ], - "typeRoots": [ - "node_modules/**/types", - "node_modules/@types", - "./@types" - ], - "lib": ["dom", "es2015", "es2015.promise"] + "compileOnSave": false, + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "outDir": "./bin/ts-out", + "allowJs": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "module": "esNext", + "moduleResolution": "node", + "sourceMap": true, + "target": "es5", + "noImplicitReturns": true, + "baseUrl": ".", + "paths": { + "@/*": [ + "src/*" + ] }, - "exclude": [ - "node_modules", - "libs", - "bower_components", - "bin", - "obj" + "types": [ + "webpack-env" ], - "include": [ - "./src/**/*.ts" + "typeRoots": [ + "node_modules/**/types", + "node_modules/@types", + "./@types" + ], + "lib": [ + "dom", + "es2015", + "es2015.promise" ] -} + }, + "exclude": [ + "node_modules", + "libs", + "bower_components", + "bin", + "obj" + ], + "include": [ + "./src/**/*.ts" + ] +} \ No newline at end of file