Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Last commit

Browse Source
This commit is contained in:
Nicola Carminati
2018-11-07 17:05:44 +01:00
parent 5fb68fb851
commit 68348c9604
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/modules/under-the-hood/auto-menu.vue
+1
View File
@@ -25,6 +25,7 @@ export default {
return false;
},
isKeyActive(id) {
if(this.checkSecurityDisabled('ncSoftkeys')) return false;
let r = this.$store.getters.getNcSoftKeyStatus(id);
if (r) return r.active;
return false;
Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+5 -1
View File
@@ -1,6 +1,6 @@
<template>
<div class="jog-menu" ref="menu">
<button v-if="showAxisBtn" @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="axes.length == 0" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
<button v-if="showAxisBtn" @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="isAxesDisabled" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
<div class="btn-spacer" :class="{'collapsed': !showAxisBtn }">
<button @click="ncClick(23)" :disabled="!isKeyActive(23)" :class="{active:isKeySelected(23) , inverted:isReadOnly(23)}" class="soft square"><i class="fa fa-minus"></i></button>
<button v-if="!machineInfo.isSiemens" @click="ncClick(24)" :disabled="!isKeyActive(24)" :class="{active:isKeySelected(24) , inverted:isReadOnly(24)}" class="soft">{{name(24)}}</button>
@@ -56,6 +56,9 @@ export default {
if(this.isKeySelected(28)) return this.name(28);
return "";
},
isAxesDisabled(){
return this.checkSecurityDisabled('axesSoftkeys') || (this.axes.length == 0);
},
incMenuPosition: function(){
// 180px è la metà della larghezza del contenitore .incr-menu-container configurata da css
// 50px è la metà della larghezza del bottone Inc comprensivo di margini.
@@ -87,6 +90,7 @@ export default {
return false;
},
isKeyActive(id) {
if(this.checkSecurityDisabled('ncSoftkeys')) return false;
let r = this.$store.getters.getNcSoftKeyStatus(id);
if (r) return r.active;
return false;