Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
This commit is contained in:
Alessandro Francia
@@ -1,9 +1,13 @@
|
||||
<template>
|
||||
<div class="alarm-detail content scrollable" :class="alarm.type">
|
||||
<h2 v-if="alarm.title">{{alarm.title}}</h2>
|
||||
<h2 v-if="!alarm.title">{{'alarm_'+ alarm.id | localize("")}}</h2>
|
||||
<h2 v-if="!alarm.title">{{'alarm_'+ alarm.id | localize('alarm_'+ alarm.id)}}</h2>
|
||||
<div class="sources" v-if="alarm.source">
|
||||
<span class="source">{{alarm.process}} {{alarm.source}}</span>
|
||||
<span class="source">{{alarm.source}}</span>
|
||||
<span class="source" v-if="alarm.source === 'PLC' && alarm.process.length>0">
|
||||
<span v-for="p in alarm.process" :key="p" >{{ p }} </span>
|
||||
</span>
|
||||
<span class="source" v-if="alarm.source !== 'PLC' && alarm.process">{{ alarm.process }}</span>
|
||||
</div>
|
||||
<time>{{alarm.date | date("DD/MM/YYYY - hh:mm")}}</time>
|
||||
<span class="summary">{{alarm.description}}</span>
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
<template>
|
||||
<div class="alarm-item" :class="type">
|
||||
<div class="content">
|
||||
<h2 v-if="title">{{title}}</h2>
|
||||
<h2 v-if="!title">{{'alarm_'+ alarmid | localize("")}}</h2>
|
||||
<h2 v-if="title.length>0">{{title}}</h2>
|
||||
<h2 v-if="!title || title.length==0">{{'alarm_'+ alarmid | localize('alarm_'+ alarmid)}}</h2>
|
||||
<div class="summary">
|
||||
<span v-if="source">{{source}} {{processid}}</span>
|
||||
|
||||
<time>{{dateprefix}} {{date | date("DD/MM/YYYY HH:mm")}}</time>
|
||||
</div>
|
||||
<div class="summary" v-if="source">
|
||||
<span class="sourcecontainer">
|
||||
<span class="source">{{source}}</span>
|
||||
<span class="source" v-if="source === 'PLC' && processid.length>0">
|
||||
<span v-for="p in processid" :key="p" >{{ p }} </span>
|
||||
</span>
|
||||
<span class="source" v-if="source !== 'PLC' && processid">{{ processid }}</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn" @click="showDetail">{{'alarm_item_btn_show' | localize('Vedi')}}</button>
|
||||
|
||||
@@ -90,8 +90,8 @@ export default class AppHeader extends Vue {
|
||||
}
|
||||
|
||||
public manageClick(btn: buttonStatus) {
|
||||
if (btn.Clickable)
|
||||
Hub.Current.sendPowerCommand(btn.Id);
|
||||
if (btn.clickable)
|
||||
Hub.Current.sendPowerCommand(btn.id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,9 +9,14 @@
|
||||
<i class="fa fa-exclamation" slot="icon" v-if="ribbonStatus >1"></i>
|
||||
<div slot="content" class="content" v-if="ribbonStatus>1">
|
||||
<strong v-if="!showDetails">{{alarmTitle | localize(alarmTitle,alarmCount)}}</strong>
|
||||
<strong v-if="showDetails">{{alarms[0].title}}</strong>
|
||||
<div class="processes" v-if="showDetails">
|
||||
<span>{{alarms[0].process}} {{alarms[0].source}}</span>
|
||||
<strong v-if="showDetails && alarms[0].title">{{alarms[0].title}}</strong>
|
||||
<strong v-if="showDetails && !alarms[0].title">{{'alarm_'+ alarms[0].id | localize('alarm_'+ alarms[0].id)}}</strong>
|
||||
<div v-if="showDetails">
|
||||
<span class="processes">{{alarms[0].source}}</span>
|
||||
<span class="processes" v-if="alarms[0].source === 'PLC' && alarms[0].process.length>0">
|
||||
<span v-for="p in alarms[0].process" :key="p" >{{ p }} </span>
|
||||
</span>
|
||||
<span class="processes" v-if="alarms[0].source !== 'PLC' && alarms[0].process">{{ alarms[0].process }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div slot="service" class="content" v-if="serviceRequired">
|
||||
@@ -23,37 +28,37 @@
|
||||
<button :class="{ red: mainStatus, blue: !mainStatus }">
|
||||
<img class="h-24" src="assets/icons/png/switch-icon@2x.png">
|
||||
</button>
|
||||
<button class="power-on" :disabled="!state.powerOnAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.powerOnAlarm && state.powerOnAlarm.Active" @click="manageClick(state.powerOnAlarm)"><img src="assets/icons/png/control-icon-error@2x.png"></button>
|
||||
<button class="power-on" :disabled="!state.powerOnAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.powerOnAlarm && state.powerOnAlarm.active" @click="manageClick(state.powerOnAlarm)"><img src="assets/icons/png/control-icon-error@2x.png"></button>
|
||||
|
||||
<button class="airflow" :disabled="!state.airPressureAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.airPressureAlarm && state.airPressureAlarm.Active" @click="manageClick(state.airPressureAlarm)"><img src="assets/icons/png/air-icon@2x.png"></button>
|
||||
<button class="airflow" :disabled="!state.airPressureAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.airPressureAlarm && state.airPressureAlarm.active" @click="manageClick(state.airPressureAlarm)"><img src="assets/icons/png/air-icon@2x.png"></button>
|
||||
|
||||
<button class="protections" :disabled="!state.protectionsAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.protectionsAlarm && state.protectionsAlarm.Active" @click="manageClick(state.protectionsAlarm)"><img src="assets/icons/png/lock-icon-error@2x.png"></button>
|
||||
<button class="protections" :disabled="!state.protectionsAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.protectionsAlarm && state.protectionsAlarm.active" @click="manageClick(state.protectionsAlarm)"><img src="assets/icons/png/lock-icon-error@2x.png"></button>
|
||||
|
||||
<button class="emergency" :disabled="!state.emergencyAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.emergencyAlarm && state.emergencyAlarm.Active" @click="manageClick(state.emergencyAlarm)"><img src="assets/icons/png/refresh-icon-error@2x.png"></button>
|
||||
<button class="emergency" :disabled="!state.emergencyAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.emergencyAlarm && state.emergencyAlarm.active" @click="manageClick(state.emergencyAlarm)"><img src="assets/icons/png/refresh-icon-error@2x.png"></button>
|
||||
|
||||
<button class="settings-mode" :disabled="!state.settingsModeAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.settingsModeAlarm && state.settingsModeAlarm.Active" @click="manageClick(state.settingsModeAlarm)"><img src="assets/icons/png/no-settings@2x.png"></button>
|
||||
<button class="settings-mode" :disabled="!state.settingsModeAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.settingsModeAlarm && state.settingsModeAlarm.active" @click="manageClick(state.settingsModeAlarm)"><img src="assets/icons/png/no-settings@2x.png"></button>
|
||||
|
||||
<button class="key" :disabled="!state.keyReadyAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.keyReadyAlarm && state.keyReadyAlarm.Active" @click="manageClick(state.keyReadyAlarm)"><img src="assets/icons/png/key-icon-error@2x.png"></button>
|
||||
<button class="key" :disabled="!state.keyReadyAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.keyReadyAlarm && state.keyReadyAlarm.active" @click="manageClick(state.keyReadyAlarm)"><img src="assets/icons/png/key-icon-error@2x.png"></button>
|
||||
|
||||
<button :class="{ red: powerOnStatus, blue: !powerOnStatus }">
|
||||
<img src="assets/icons/png/ok-white.png" class="h-20" v-if="!powerOnStatus">
|
||||
<img src="assets/icons/png/not-ok-white.png" class="h-20" v-if="powerOnStatus">
|
||||
</button>
|
||||
<button class="key" :disabled="!state.resetAxesAlarm.Clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.resetAxesAlarm && state.resetAxesAlarm.Active"
|
||||
<button class="key" :disabled="!state.resetAxesAlarm.clickable || checkSecurityDisabled('startupIcons')"
|
||||
v-if="state.resetAxesAlarm && state.resetAxesAlarm.active"
|
||||
@click="manageClick(state.resetAxesAlarm)"><img src="assets/icons/png/taratura-icon-error@2x.png"></button>
|
||||
<button class="key" :disabled="!state.waterJet1Alarm.Clickable || checkSecurityDisabled('startupIcons')" v-if="state.waterJet1Alarm && state.waterJet1Alarm.Active" @click="manageClick(state.waterJet1Alarm)"></button>
|
||||
<button class="key" :disabled="!state.waterJet2Alarm.Clickable || checkSecurityDisabled('startupIcons')" v-if="state.waterJet2Alarm && state.waterJet2Alarm.Active" @click="manageClick(state.waterJet2Alarm)"></button>
|
||||
<button class="key" :disabled="!state.waterJet1Alarm.clickable || checkSecurityDisabled('startupIcons')" v-if="state.waterJet1Alarm && state.waterJet1Alarm.active" @click="manageClick(state.waterJet1Alarm)"></button>
|
||||
<button class="key" :disabled="!state.waterJet2Alarm.clickable || checkSecurityDisabled('startupIcons')" v-if="state.waterJet2Alarm && state.waterJet2Alarm.active" @click="manageClick(state.waterJet2Alarm)"></button>
|
||||
<div class="process-container">
|
||||
<process-info v-for="p in processes" :key="p.id" v-if="p.Visible && !mainStatus"
|
||||
:counter="p.Reps" :status="p.Status" :id="p.Id">
|
||||
<strong>{{p.PartProgramName}}</strong>
|
||||
<process-info v-for="p in processes" :key="p.id" v-if="p.visible && !mainStatus"
|
||||
:counter="p.reps" :status="p.status" :id="p.id">
|
||||
<strong>{{p.partProgramName}}</strong>
|
||||
</process-info>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ export default {
|
||||
Factory.Get(MessageService).publishToChannel("HMI-hide-alarms",300);
|
||||
},
|
||||
status:function() {
|
||||
if(this.$store.state.alarms.opened || this.$store.state.alarms.serviceOpened)
|
||||
if((this.expanded && this.$store.state.alarms.opened) || (this.hasService && this.$store.state.alarms.serviceOpened))
|
||||
Factory.Get(MessageService).publishToChannel("HMI-show-alarms");
|
||||
else
|
||||
Factory.Get(MessageService).publishToChannel("HMI-hide-alarms",300);
|
||||
@@ -77,7 +77,6 @@ export default {
|
||||
this.serviceExpanded = false;
|
||||
alarmsModelActions.toggleServiceOpened(this.$store, false);
|
||||
|
||||
|
||||
if(this.$store.state.alarms.opened || this.$store.state.alarms.serviceOpened)
|
||||
Factory.Get(MessageService).publishToChannel("HMI-show-alarms");
|
||||
else
|
||||
|
||||
@@ -54,10 +54,10 @@
|
||||
</aside>
|
||||
|
||||
<aside v-if="type == 'WJ' ">
|
||||
<div class="tool">
|
||||
<div class="tool-box">
|
||||
|
||||
</div>
|
||||
<div class="load">
|
||||
<div class="load-box">
|
||||
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
<template>
|
||||
<div class="heads-container scrollable_auto" :class="{'heads-container-lt4':(heads.length <=4)}">
|
||||
<head-std :title="h.name" v-for="h in heads" :key="h.id"
|
||||
:rpm="getHeadsProperty(h.id).ActualSpeed"
|
||||
:tool="getHeadsProperty(h.id).MountedTool"
|
||||
:load="getHeadsProperty(h.id).Load"
|
||||
:process="getHeadsProperty(h.id).Process"
|
||||
:type="getHeadsProperty(h.id).Type"
|
||||
:rpm="getHeadsProperty(h.id).actualSpeed"
|
||||
:tool="getHeadsProperty(h.id).mountedTool"
|
||||
:load="getHeadsProperty(h.id).load"
|
||||
:process="getHeadsProperty(h.id).process"
|
||||
:type="getHeadsProperty(h.id).type"
|
||||
:inAlarm="getHeadsProperty(h.id).inAlarm"
|
||||
:inWarning="getHeadsProperty(h.id).inWarning"
|
||||
:percentage="getHeadsProperty(h.id).Override"
|
||||
:abrasive="getHeadsProperty(h.id).Abrasive"
|
||||
:vacuum="getHeadsProperty(h.id).Vacum"
|
||||
:overrideDisabled="!getHeadsProperty(h.id).OverrideEditable"
|
||||
:pressure="getHeadsProperty(h.id).ActualPressure"
|
||||
:isSelected="getHeadsProperty(h.id).IsSelected"
|
||||
:isActive="getHeadsProperty(h.id).IsActive"
|
||||
:percentage="getHeadsProperty(h.id).override"
|
||||
:abrasive="getHeadsProperty(h.id).abrasive"
|
||||
:vacuum="getHeadsProperty(h.id).vacum"
|
||||
:overrideDisabled="!getHeadsProperty(h.id).overrideEditable"
|
||||
:pressure="getHeadsProperty(h.id).actualPressure"
|
||||
:isSelected="getHeadsProperty(h.id).isSelected"
|
||||
:isActive="getHeadsProperty(h.id).isActive"
|
||||
@overridePlus="overridePlus(h.id)" @overrideMinus="overrideMinus(h.id)"
|
||||
></head-std>
|
||||
<div class="head-place-holder" v-if="heads.length <4"></div>
|
||||
|
||||
@@ -1,42 +1,42 @@
|
||||
<template>
|
||||
<div id="nc-softkeys-container">
|
||||
<div v-if="machineInfo.isFanuc ">
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{'nc_softkey_auto' |localize("Auto") }}</button>
|
||||
<button @click="ncClick(2)" :disabled="!isKeyActive(2)" :class="{active:isKeySelected(2) , readonly:isReadOnly(2)}" class="soft icon"><img src="assets/icons/under-hood-png/edit-blue@2x.png">{{'nc_softkey_edit' |localize("Edit") }}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{'nc_softkey_mdi' |localize("MDI") }}</button>
|
||||
<button @click="ncClick(4)" :disabled="!isKeyActive(4)" :class="{active:isKeySelected(4) , readonly:isReadOnly(4)}" class="soft icon"><img src="assets/icons/under-hood-png/dnc-blue@2x.png">{{'nc_softkey_dnc' |localize("DNC") }}</button>
|
||||
<button @click="ncClick(9)" :disabled="!isKeyActive(9)" :class="{active:isKeySelected(9) , readonly:isReadOnly(9)}" class="soft icon"><img src="assets/icons/under-hood-png/teach-blue@2x.png">{{'nc_softkey_teach' |localize("Teach") }}</button>
|
||||
<button @click="ncClick(8)" :disabled="!isKeyActive(8)" :class="{active:isKeySelected(8) , readonly:isReadOnly(8)}" class="soft icon"><img src="assets/icons/under-hood-png/restart-blue@2x.png">{{'nc_softkey_restart' |localize("Restart") }}</button>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(5)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{'nc_softkey_ref' |localize("Ref") }}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{'nc_softkey_jog' |localize("Jog") }}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{'nc_softkey_joginc' |localize("Jog Inc") }}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{'nc_softkey_reset' |localize("Reset") }}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/retract-blue@2x.png">{{'nc_softkey_retract' |localize("Retract") }}</button>
|
||||
<button @click="ncClick(12)" :disabled="!isKeyActive(12)" :class="{active:isKeySelected(12) , readonly:isReadOnly(12)}" class="soft icon"><img src="assets/icons/under-hood-png/handle-blue@2x.png">{{'nc_softkey_handle' |localize("Handle") }}</button>
|
||||
<div v-if="machineInfo.isFanuc">
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{name(1)}}</button>
|
||||
<button @click="ncClick(2)" :disabled="!isKeyActive(2)" :class="{active:isKeySelected(2) , readonly:isReadOnly(2)}" class="soft icon"><img src="assets/icons/under-hood-png/edit-blue@2x.png">{{name(2)}}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{name(3)}}</button>
|
||||
<button @click="ncClick(4)" :disabled="!isKeyActive(4)" :class="{active:isKeySelected(4) , readonly:isReadOnly(4)}" class="soft icon"><img src="assets/icons/under-hood-png/dnc.png">{{name(4)}}</button>
|
||||
<button @click="ncClick(9)" :disabled="!isKeyActive(9)" :class="{active:isKeySelected(9) , readonly:isReadOnly(9)}" class="soft icon"><img src="assets/icons/under-hood-png/teach-blue@2x.png">{{name(9)}}</button>
|
||||
<button @click="ncClick(8)" :disabled="!isKeyActive(8)" :class="{active:isKeySelected(8) , readonly:isReadOnly(8)}" class="soft icon"><img src="assets/icons/under-hood-png/restart-blue@2x.png">{{name(8)}}</button>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(5)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{name(5)}}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{name(6)}}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{name(7)}}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{name(13)}}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/repos2.png">{{name(10)}}</button>
|
||||
<button @click="ncClick(12)" :disabled="!isKeyActive(12)" :class="{active:isKeySelected(12) , readonly:isReadOnly(12)}" class="soft icon"><img src="assets/icons/under-hood-png/handle2.png">{{name(12)}}</button>
|
||||
</div>
|
||||
<div v-if="machineInfo.isSiemens">
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{'nc_softkey_auto' |localize("Auto") }}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{'nc_softkey_mdi' |localize("MDI") }}</button>
|
||||
<div v-if="machineInfo.isSiemens ">
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{name(1)}}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{name(3)}}</button>
|
||||
<div class="empty-space"></div>
|
||||
<button @click="ncClick(11)" :disabled="!isKeyActive(11)" :class="{active:isKeySelected(11) , readonly:isReadOnly(11)}" class="soft icon"><img src="assets/icons/under-hood-png/wcsmcs-blue@2x.png">{{'nc_softkey_wcsmcs' |localize("WcsMcs") }}</button>
|
||||
<button @click="ncClick(9)" :disabled="!isKeyActive(9)" :class="{active:isKeySelected(9) , readonly:isReadOnly(9)}" class="soft icon"><img src="assets/icons/under-hood-png/teach-blue@2x.png">{{'nc_softkey_teach' |localize("Teach") }}</button>
|
||||
<button @click="ncClick(11)" :disabled="!isKeyActive(11)" :class="{active:isKeySelected(11) , readonly:isReadOnly(11)}" class="soft icon"><img src="assets/icons/under-hood-png/wcs2.png">{{name(11)}}</button>
|
||||
<button @click="ncClick(9)" :disabled="!isKeyActive(9)" :class="{active:isKeySelected(9) , readonly:isReadOnly(9)}" class="soft icon"><img src="assets/icons/under-hood-png/teach-blue@2x.png">{{name(9)}}</button>
|
||||
<div class="empty-space"></div>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(5)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{'nc_softkey_ref' |localize("Ref") }}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{'nc_softkey_jog' |localize("Jog") }}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{'nc_softkey_joginc' |localize("Jog Inc") }}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{'nc_softkey_reset' |localize("Reset") }}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/repos-blue@2x.png">{{'nc_softkey_repos' |localize("Repos") }}</button>
|
||||
<button @click="ncClick(12)" :disabled="!isKeyActive(12)" :class="{active:isKeySelected(12) , readonly:isReadOnly(12)}" class="soft icon"><img src="assets/icons/under-hood-png/handle-blue@2x.png">{{'nc_softkey_handle' |localize("Handle") }}</button>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(5)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{name(5)}}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{name(6)}}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{name(7)}}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{name(13)}}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/repos2.png">{{name(10)}}</button>
|
||||
<button @click="ncClick(12)" :disabled="!isKeyActive(12)" :class="{active:isKeySelected(12) , readonly:isReadOnly(12)}" class="soft icon"><img src="assets/icons/under-hood-png/handle2.png">{{name(12)}}</button>
|
||||
</div>
|
||||
<div v-if="machineInfo.isOsai || isDemo" >
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{'nc_softkey_auto' |localize("Auto") }}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{'nc_softkey_mdi' |localize("MDI") }}</button>
|
||||
<button @click="ncClick(1)" :disabled="!isKeyActive(1)" :class="{active:isKeySelected(1) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/automatic-blue@2x.png">{{name(1)}}</button>
|
||||
<button @click="ncClick(3)" :disabled="!isKeyActive(3)" :class="{active:isKeySelected(3) , readonly:isReadOnly(3)}" class="soft icon"><img src="assets/icons/under-hood-png/MDI-blue@2x.png">{{name(3)}}</button>
|
||||
<div class="empty-space"></div>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{'nc_softkey_ref' |localize("Ref") }}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{'nc_softkey_jog' |localize("Jog") }}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{'nc_softkey_joginc' |localize("Jog Inc") }}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{'nc_softkey_reset' |localize("Reset") }}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/retrpof-blue@2x.png">{{'nc_softkey_retrpof' |localize("Retrpof") }}</button>
|
||||
<button @click="ncClick(5)" :disabled="!isKeyActive(5)" :class="{active:isKeySelected(5) , readonly:isReadOnly(1)}" class="soft icon"><img src="assets/icons/under-hood-png/ref-blue@2x.png">{{name(1)}}</button>
|
||||
<button @click="ncClick(6)" :disabled="!isKeyActive(6)" :class="{active:isKeySelected(6) , readonly:isReadOnly(6)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-blue@2x.png">{{name(6)}}</button>
|
||||
<button @click="ncClick(7)" :disabled="!isKeyActive(7)" :class="{active:isKeySelected(7) , readonly:isReadOnly(7)}" class="soft icon"><img src="assets/icons/under-hood-png/jog-inc-blue@2x.png">{{name(7)}}</button>
|
||||
<button @click="ncClick(13)" :disabled="!isKeyActive(13)" :class="{active:isKeySelected(13) , readonly:isReadOnly(13)}" class="soft icon"><img src="assets/icons/under-hood-png/reset-blue@2x.png">{{name(13)}}</button>
|
||||
<button @click="ncClick(10)" :disabled="!isKeyActive(10)" :class="{active:isKeySelected(10) , readonly:isReadOnly(10)}" class="soft icon"><img src="assets/icons/under-hood-png/repos2.png">{{name(10)}}</button>
|
||||
<div class="empty-space"></div>
|
||||
<div class="empty-space"></div>
|
||||
<div class="empty-space"></div>
|
||||
@@ -73,13 +73,18 @@ export default {
|
||||
if(this.checkSecurityDisabled('ncSoftkeys')) return false;
|
||||
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Active;
|
||||
if (r) return r.active;
|
||||
return false;
|
||||
},
|
||||
isKeySelected(id) {
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Value;
|
||||
if (r) return r.value;
|
||||
return false;
|
||||
},
|
||||
name(id){
|
||||
let r = this.$store.getters.getNcSoftKeyInfo(id);
|
||||
if(r) return r.visualizedName;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -28,7 +28,7 @@ export default class softKeys extends Vue {
|
||||
public getSoftKeyStatus(id: number): boolean {
|
||||
var sk = this.$store.getters.getSoftKeyStatus(id);
|
||||
if (sk)
|
||||
return sk.Value;
|
||||
return sk.value;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ export default class softKeys extends Vue {
|
||||
public getSoftKeyActive(id: number): boolean {
|
||||
var sk = this.$store.getters.getSoftKeyStatus(id);
|
||||
if (sk)
|
||||
return sk.Active;
|
||||
return sk.active;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,9 +8,14 @@
|
||||
<button v-if="isSectionVisible(4)" :class="{active:selectedSection==4}" @click="selectSection(4)"><span class="number">4.</span><img src="assets/icons/under-hood-png/cat-4.png"></button>
|
||||
<button v-if="isSectionVisible(5)" :class="{active:selectedSection==5}" @click="selectSection(5)"><span class="number">5.</span><img src="assets/icons/under-hood-png/cat-5.png"></button>
|
||||
<button v-if="isSectionVisible(6)" :class="{active:selectedSection==6}" @click="selectSection(6)"><span class="number">6.</span><img src="assets/icons/under-hood-png/cat-6.png"></button>
|
||||
<button v-if="isSectionVisible(7)" :class="{active:selectedSection==7}" @click="selectSection(7)"><span class="number">7.</span></button>
|
||||
<button v-if="isSectionVisible(7)" :class="{active:selectedSection==7}" @click="selectSection(7)"><span class="number">7.</span>
|
||||
<div class="fa-icons">
|
||||
<i class="fa fa-arrow-up"></i>
|
||||
<i class="fa fa-arrow-down"></i>
|
||||
</div>
|
||||
</button>
|
||||
</header>
|
||||
<div class="title" >{{'maint_' + selectedSection | localize('maint_' + selectedSection) }}</div>
|
||||
<div class="title" >{{'sfk_category_' + selectedSection | localize('sfk_category_' + selectedSection) }}</div>
|
||||
<section class="scrollable" ref="scrollable">
|
||||
<div v-for="(b, index) in sectionButtons(selectedSection)" :key="b.id">
|
||||
<group-soft-key
|
||||
|
||||
@@ -25,12 +25,12 @@ export default {
|
||||
},
|
||||
isKeyActive(id) {
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Active;
|
||||
if (r) return r.active;
|
||||
return false;
|
||||
},
|
||||
isKeySelected(id) {
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Value;
|
||||
if (r) return r.value;
|
||||
return false;
|
||||
},
|
||||
},
|
||||
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
<div class="axes-menu-container" v-if="showAxesMenu">
|
||||
<div class="menu">
|
||||
<button @click="setAxes(a.Id)"
|
||||
<button @click="setAxes(a.id)"
|
||||
v-for="a in axes"
|
||||
:key="a.Id"
|
||||
:class="{active: a.Id == selectedAxisId}">{{a.Name}}</button>
|
||||
:key="a.id"
|
||||
:class="{active: a.id == selectedAxisId}">{{a.name}}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -81,12 +81,12 @@ export default {
|
||||
},
|
||||
isKeyActive(id) {
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Active;
|
||||
if (r) return r.active;
|
||||
return false;
|
||||
},
|
||||
isKeySelected(id) {
|
||||
let r = this.$store.getters.getNcSoftKeyStatus(id);
|
||||
if (r) return r.Value;
|
||||
if (r) return r.value;
|
||||
return false;
|
||||
},
|
||||
toggleAxes() {
|
||||
@@ -94,8 +94,6 @@ export default {
|
||||
this.showAxesMenu = !this.showAxesMenu;
|
||||
},
|
||||
toggleIncr() {
|
||||
console.log(this.$refs);
|
||||
|
||||
this.showAxesMenu = false;
|
||||
this.showIncrMenu = !this.showIncrMenu;
|
||||
},
|
||||
@@ -103,7 +101,7 @@ export default {
|
||||
let id = this.$store.state.process.selectedAxis;
|
||||
for (const k in this.$store.state.process.axes) {
|
||||
let a = this.$store.state.process.axes[k];
|
||||
if (a.Id == id) return a.Name;
|
||||
if (a.id == id) return a.name;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div class="process-selection" v-if="processes.length > 1 && checkSecurityEnabled('processCmd')">
|
||||
<div class="process" v-for="p in processes" :key="p.Id" :class="{selected: p.Id == selectedProcess}" @click="selectProcess(p.Id)">
|
||||
<span>{{p.Id}}</span>
|
||||
<small v-if="p.Type == 'AUX'">AUX</small>
|
||||
<div class="process" v-for="p in processes" :key="p.id" :class="{selected: p.id == selectedProcess}" @click="selectProcess(p.id)">
|
||||
<span>{{p.id}}</span>
|
||||
<small v-if="p.type == 'AUX'">AUX</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user