refactoring accesso ai dati

This commit is contained in:
=
2020-03-12 12:32:59 +01:00
parent f90b3a9074
commit e13b88905f
119 changed files with 785 additions and 697 deletions
+7
View File
@@ -0,0 +1,7 @@
{
"env": "production",
"api": {
"enabled": true,
"apiServerUrl": "https://localhost"
}
}
+7
View File
@@ -0,0 +1,7 @@
{
"env": "development",
"api": {
"enabled": false,
"apiServerUrl": "https://localhost"
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
import { processModelActions } from "src/store";
import { processModelActions } from "@/store";
declare module signalr_alarms {
+7 -7
View File
@@ -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";
+1 -1
View File
@@ -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; }
+5 -5
View File
@@ -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";
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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";
@@ -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";
@@ -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({
@@ -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";
@@ -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 {
@@ -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 } })
@@ -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";
@@ -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 {
@@ -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 {
@@ -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({
@@ -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;
@@ -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";
@@ -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";
@@ -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";
@@ -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({
@@ -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";
@@ -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({
@@ -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;
@@ -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 } })
@@ -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 } })
@@ -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 } })
@@ -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({
@@ -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({
@@ -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;
@@ -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: {
@@ -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";
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 } })
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 } })
@@ -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 {
@@ -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 {
@@ -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",
@@ -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 {
@@ -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 } })
@@ -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";
@@ -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;
@@ -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 } })
@@ -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;
@@ -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 {
@@ -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;
@@ -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 } })
@@ -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{
@@ -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{
@@ -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({})
@@ -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{
@@ -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";
@@ -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{
@@ -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: {
@@ -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;
+2 -2
View File
@@ -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() {
+3 -3
View File
@@ -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";
+2 -2
View File
@@ -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";
+1 -1
View File
@@ -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",
@@ -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 {
+1 -1
View File
@@ -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;
+31 -2
View File
@@ -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;
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
}
}
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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 {
+102 -92
View File
@@ -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;
});
};
}
});
+2 -2
View File
@@ -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;
+5 -5
View File
@@ -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;
+1 -1
View File
@@ -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 {
@@ -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{
@@ -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{
@@ -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;
@@ -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";
@@ -1,4 +1,4 @@
import { Factory, messageService } from "src/_base";
import { Factory, messageService } from "@/_base";
export default {
computed: {
isVisible: function () {
@@ -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 },
@@ -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: {
@@ -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";
@@ -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";
@@ -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({
@@ -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'
@@ -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";
@@ -1,4 +1,4 @@
import { Factory, messageService } from "src/_base";
import { Factory, messageService } from "@/_base";
export default {
computed: {
isVisible: function () {
@@ -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 },
@@ -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;
@@ -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 },
@@ -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";
@@ -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 },
@@ -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({
+2 -2
View File
@@ -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";
+5 -4
View File
@@ -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;
@@ -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<any>(this.BASE_URL + "runConnectionTest", true);
+17 -14
View File
@@ -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<object>("api/configuration/softKeys");
let result = await this.Get<object>("/api/configuration/softKeys");
machineInfoActions.updateMachineInfo(store, { softKeys: result })
}
async GetNcSoftKeysConfiguration() {
let result = await this.Get<object>("api/configuration/nc_softKeys");
let result = await this.Get<object>("/api/configuration/nc_softKeys");
machineInfoActions.updateMachineInfo(store, { ncSoftKeys: result })
}
async GetHeadsConfiguration() {
let result = await this.Get<Array<signalr_heads.headConfiguration>>("api/configuration/heads");
let result = await this.Get<Array<signalr_heads.headConfiguration>>("/api/configuration/heads");
machineInfoActions.updateMachineInfo(store, { heads: result });
}
async AddUserSoftkeyFavorite(model, array){
async AddUserSoftkeyFavorite(model, array) {
let result = await this.Put<SoftKeysConfigurationModel>("/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<SoftKeysConfigurationModel[]>("/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;
}

Some files were not shown because too many files have changed in this diff Show More