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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Paolo Possanzini
2018-05-23 11:31:39 +02:00
parent 82fac90b53 ceb4114ea6
commit 0ae4194169
3 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/tooling-shanks.vue
+16 -12
View File
@@ -20,7 +20,7 @@
</div>
</div>
<div class="list-vertical scrollable" ref="shankList" :class="{'avoid-clicks': disableList}">
<equipment v-for="s in shanks.filter(i => ($options.filters.localize('shank','Codolo') + ' ' + i.id).indexOf(currentFilter) >=0)" :key="s.id" :title="$options.filters.localize('shank','Codolo') + ' ' + s.id"
<equipment v-for="s in shanks.filter(i => ($options.filters.localize('tooling_shanks_name','Codolo %d',i.id)).indexOf(currentFilter) >=0)" :key="s.id" :title="'tooling_shanks_name' | localize('Codolo %d', s.id)"
v-if="s.id != null"
:img-source="'../assets/images/list-shank.PNG'"
:class="{selected: selectedTool && selectedTool.id == s.id}"
@@ -36,11 +36,11 @@
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens() || isDemo()) && selectedTool">
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">{{'tooling_parameters_tab' | localize("Parametri")}}</button>
<div class="tab-box-scroll scrollable">
<button v-for="ct in selectedTool.childsTools" :key="ct.id" class="tab" :class="{'active': selectedEquipment == ct}" v-if="ct.id != null" @click="selectTab(ct)">
<span v-if="ct.id>0">{{'tooling_childtoolsfamily_skill_tools' | localize("Utensile")}} {{ct.id}}</span>
<span v-if="!ct.id || ct.id<=0">{{'tooling_childtoolsfamily_new' | localize("Aggiungi Utensile")}}</span>
<span v-if="ct.id>0">{{'tooling_childtoolsshanks_skill_tools' | localize("Utensile %d",ct.id)}}</span>
<span v-if="!ct.id || ct.id<=0">{{'tooling_childtoolsshanks_new' | localize("Aggiungi Utensile")}}</span>
</button>
<div class="tab plus">
<button class="btn" @click="addToolToShank()"><i class="fa fa-plus"></i></button>
@@ -49,7 +49,8 @@
</div>
<div class="box-right-body" v-if="enableParameters">
<button class="btn deleteElement" @click="deleteShank(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}</div>
<div class="box-right-label-header" v-if="selectedTool.id>0">{{'tooling_shanks_editlabel' | localize("Modifica di Codolo %d",selectedTool.id)}}</div>
<div class="box-right-label-header" v-if="!selectedTool.id || selectedTool.id<=0">{{'tooling_shanks_label_new' | localize("Creazione Utensile")}}</div>
<div class="list-skill-shanks scrollable">
<div class="list-skill-shanks-category" v-for="c in categories" :key="c" :class="{'avoid-clicks': !disableList}">
<div class="skill-shanks-category">{{'tooling_shanks_list_category_' + c | localize(c)}}</div>
@@ -57,7 +58,8 @@
v-if="s.name != '' && s.category == c"
v-model="selectedTool[s.name]"
:read-only="s.readOnly"
:title="s.name | localize(s.name)" :type="s.type">
:title="'tooling_equipment_param_' + s.name | localize(s.name)"
:type="s.type">
<option v-for="v in s.selectValues" :key="v" :value="v">{{v}}</option>
</input-box>
</div>
@@ -65,7 +67,8 @@
<div class="tooling-equipment-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="buttonSave(selectedTool)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<button class="btn blue-reverse" v-if="enableModify && selectedTool.id>0" @click="buttonSave(selectedTool)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<button class="btn blue-reverse" v-if="enableModify && (!selectedTool.id || selectedTool.id<=0)" @click="addToolsToShank(selectedTool)">{{'tooling_equipment_button_add' | localize("Aggiungi")}}</button>
</div>
</div>
<div class="box-right-body" v-if="enableAddToolToShank">
@@ -74,7 +77,7 @@
<div class="list-skill-shanks-category">
<div class="skill-shanks-category">
<input-box type="select" title="Utensile con id" v-model="toolSelected">
<input-box type="select" :title="'tooling_equipment_param_id' | localize('Id Utensile')" v-model="toolSelected">
<option v-for="(s, k) in availableTools" :key="k" :value="s">{{s.id}}</option>
</input-box>
</div>
@@ -83,12 +86,12 @@
<div class="tooling-equipment-footer">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="addToolsToShank(selectedTool)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="addToolsToShank(selectedTool)">{{'tooling_equipment_button_add' | localize("Aggiungi")}}</button>
</div>
</div>
<div class="box-right-body" v-if="enableEquipment">
<button class="btn deleteElement" @click="removeToolsToShank(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header">{{'tooling_childtoolsshank_skill_tools' | localize("Utensile")}} {{(selectedEquipment.id > 0 ? selectedEquipment.id : "")}}</div>
<div class="box-right-label-header">{{'tooling_shanks_edittoollabel' | localize("Modifica utensile %d del Codolo %d",selectedEquipment.id,selectedTool.id)}}</div>
<div class="list-skill-shanks scrollable">
<div class="list-skill-shanks-category">
<div v-for="ct in selectedTool.childsTools" :key="ct.id" v-if="selectedEquipment == ct" class="skill-shanks-category">
@@ -97,8 +100,9 @@
v-if="c.name != ''"
v-model="ct[c.name]"
:read-only="c.readOnly"
:title="c.name | localize(c.name)" :type="c.type">
<option v-for="(s, k) in c.selectValues" :key="k" :selected="ct.toolType" :value="k">{{s}}</option>
:title="'tooling_equipment_param_' + c.name | localize(c.name)"
:type="c.type">
<option v-for="(s, k) in c.selectValues" :key="k" :selected="ct.toolType" :value="k">{{k}} - {{'tooling_equipment_list_select_' + s | localize(s)}}</option>
</input-box>
</div>
</div>