diff --git a/Thermo.Active.Utils/languages/IT.xml b/Thermo.Active.Utils/languages/IT.xml index d2459f9d..efbb32bb 100644 --- a/Thermo.Active.Utils/languages/IT.xml +++ b/Thermo.Active.Utils/languages/IT.xml @@ -1,5 +1,5 @@ - + Italiano Effettuare manutenzione @@ -420,4 +420,14 @@ Produzione Invia messaggio Riavvia + Info Asse + Id: + Nome: + In coppia: + Gantry: + In movimento: + Azzerato: + In posizione: + In errore: + Allarme test freno: \ No newline at end of file diff --git a/Thermo.Active.Utils/languages/en.xml b/Thermo.Active.Utils/languages/en.xml index d547e7c3..acb7fc67 100644 --- a/Thermo.Active.Utils/languages/en.xml +++ b/Thermo.Active.Utils/languages/en.xml @@ -1,5 +1,5 @@ - + English Maintenance request @@ -420,4 +420,14 @@ Production Send Message Reboot + Axis Info + Id: + Name: + In Torque: + Gantry: + Is Moving: + Zeroed: + In Position: + In Error: + Brake Test Alarm: \ No newline at end of file diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.ts index aec39f93..566dd95b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.ts @@ -3,6 +3,8 @@ import { AppModel } from "@/store"; import { underTheHoodService } from "@/services/underTheHoodService"; import { Prop, Watch } from "vue-property-decorator"; import { awaiter, messageService } from "@/_base"; +import { ModalHelper } from "@/components/modals"; +import { ModalInfoAxis } from "@/modules/base-components"; @Component({}) export default class AsseRowItem extends Vue { @@ -37,11 +39,23 @@ export default class AsseRowItem extends Vue { getNumber(value){ return value.toFixed(1); } + + hexNumber(num){ + return num.toString(16); + } openCollapse(){ this.$emit("openCollapse"); } + + details() { + ModalHelper.selectedAxisModal.id = this.item.id; + ModalHelper.selectedAxisModal.name = this.item.name; + ModalHelper.selectedAxisModal.status = this.item.statusCode; + ModalHelper.ShowModal(ModalInfoAxis); + } + async sendCommand(cmd,ax){ if(!this.isEditable) return; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.vue index 034ac25b..8e74bc8b 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.vue @@ -14,8 +14,10 @@ {{ getNumber(item.position) }} {{ getNumber(item.speed) }} {{ getNumber(item.load) }} - {{ item.statusCode }} - {{ item.errorCode }} + + 0x{{ hexNumber(item.statusCode) }} + + 0x{{ hexNumber(item.errorCode) }} {{ item.movPhase }} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.css b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.css index 712dc15b..9610a58f 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.css +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.css @@ -26,6 +26,13 @@ .assi-table td.left { text-align: end; } +.assi-table th.status, +.assi-table td.status { + display: flex; + flex-flow: row; + align-items: center; + justify-content: flex-end; +} .assi-table .transpRow { background-color: #657178; height: 10px; diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less index 3bd1825b..5cf8c142 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less @@ -28,6 +28,12 @@ &.left{ text-align: end; } + &.status{ + display: flex; + flex-flow: row; + align-items: center; + justify-content: flex-end; + } } .transpRow{ diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.ts index d09d3f6e..f37932ae 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.ts +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.ts @@ -36,5 +36,6 @@ export default class AssiTable extends Vue { else this.groupVisible.push(group); } + } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue index 758a07c0..d3539d21 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue @@ -5,12 +5,12 @@   {{'underthehood_label_axes' | localize("Asse")}} - {{'underthehood_label_position' | localize("Position")}} - {{'underthehood_label_speed' | localize("Velocity")}} - {{'underthehood_label_torque' | localize("Torque")}} - {{'underthehood_label_status' | localize("Status")}} - {{'underthehood_label_errorcode' | localize("Error Code")}} - {{'underthehood_label_motion' | localize("Fase Motion")}} + {{'underthehood_label_position' | localize("Position")}} + {{'underthehood_label_speed' | localize("Velocity")}} + {{'underthehood_label_torque' | localize("Torque")}} + {{'underthehood_label_status' | localize("Status")}} + {{'underthehood_label_errorcode' | localize("Error Code")}} + {{'underthehood_label_motion' | localize("Fase Motion")}} diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.css b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.css index 3cc94d41..d309c349 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.css +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.css @@ -1,3 +1,14 @@ +.main-container .button-details { + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4) !important; + background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%) !important; + color: #e8e8e8 !important; +} +.main-container .button-details.small { + height: 24px; + width: 24px; + margin-right: 0; + padding: 0; +} .main-container .log-ciclo-automatico-table tbody tr:nth-child(odd) { background-color: #747f85; } diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less index 97baea30..1563c89a 100644 --- a/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less +++ b/Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less @@ -9,6 +9,13 @@ #42494e 98% ) !important; color: @very-light-pink !important; + + &.small{ + height: 24px; + width: 24px; + margin-right: 0; + padding: 0; + } } .log-ciclo-automatico-table { diff --git a/Thermo.Active/wwwroot/src/components/modals/ModalHelper.ts b/Thermo.Active/wwwroot/src/components/modals/ModalHelper.ts index f801327c..9a735c4f 100644 --- a/Thermo.Active/wwwroot/src/components/modals/ModalHelper.ts +++ b/Thermo.Active/wwwroot/src/components/modals/ModalHelper.ts @@ -19,6 +19,12 @@ export class ModalHelper { status: 0 }; + public static selectedAxisModal = { + id: -1, + name: "--", + status: 0 + }; + public static loadDepotModal = { positionId: 0, positionType: 0, diff --git a/Thermo.Active/wwwroot/src/modules/base-components/index.ts b/Thermo.Active/wwwroot/src/modules/base-components/index.ts index 44f0bfa4..12a74ace 100644 --- a/Thermo.Active/wwwroot/src/modules/base-components/index.ts +++ b/Thermo.Active/wwwroot/src/modules/base-components/index.ts @@ -23,6 +23,7 @@ import ModalMissingTools from "./modal-missing-tools.vue"; import ModalJobAddParameter from "./modal-job-add-parameter.vue"; import ModalNcContainer from "./modal-nc-container.vue"; import ModalInfoResistance from "./modal-info-resistance.vue"; +import ModalInfoAxis from "./modal-info-axis.vue"; export { @@ -45,5 +46,6 @@ export { ModalMissingTools, ModalJobAddParameter, HistoryMaintenance, - ModalInfoResistance + ModalInfoResistance, + ModalInfoAxis }; diff --git a/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.ts b/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.ts new file mode 100644 index 00000000..f634b62c --- /dev/null +++ b/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.ts @@ -0,0 +1,39 @@ +import Vue from "vue"; +import { Factory, messageService } from 'src/_base'; +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 "@/components/modals"; + + + +@Component({ + components: { + modal: Modal, + } +}) +export default class ModalInfoAxis extends Vue { + + @Prop() + deferred: Deferred; + + get axis(){ + return ModalHelper.selectedAxisModal; + } + + + getBitVal(number){ + if((this.axis.status & number) == number) + return true; + else + return false + } + + close() { + + messageService.deleteChannel("esc_pressed"); + ModalHelper.HideModal(); + }; + +}; diff --git a/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.vue b/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.vue new file mode 100644 index 00000000..70b91112 --- /dev/null +++ b/Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.vue @@ -0,0 +1,53 @@ + + + + + + + +