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

Fix problems

Browse Source
This commit is contained in:
Nicola Carminati
2018-09-05 17:26:37 +02:00
parent 726fd1242d
commit 101140df8a
8 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/card.less
+2 -4
View File
@@ -889,10 +889,9 @@
width: 100%;
height: 100%;
border-radius: 2px;
background-color: rgba(75, 75, 75, 0.9);
background-color: rgba(255, 255, 255, 0.9);
font-size: 30px;
color: #fff;
border: 2px solid #fff;
color: #4b4b4b;
box-sizing: border-box;
display: flex;
align-items: center;
@@ -901,7 +900,6 @@
text-align:center;
font-weight: bold;
max-width: 60%;
text-shadow: 0px 0px 20px #000;
}
.btn{
margin-top: 20px;
Step/wwwroot/assets/styles/base/tooling-equipment.less
+2 -2
View File
@@ -196,9 +196,9 @@
}
}
.tooling-families-container, .tooling-magpos-container{
.tooling-families-container, .tooling-magpos-container, .tooling-tools-container, .tooling-shanks-container{
.text-body div + div{
.singleline{
margin-top: 11px;
}
Step/wwwroot/assets/styles/style.css
+6 -6
View File
@@ -5703,10 +5703,9 @@ footer .container button.big:before {
width: 100%;
height: 100%;
border-radius: 2px;
background-color: rgba(75, 75, 75, 0.9);
background-color: rgba(255, 255, 255, 0.9);
font-size: 30px;
color: #fff;
border: 2px solid #fff;
color: #4b4b4b;
box-sizing: border-box;
display: flex;
align-items: center;
@@ -5716,7 +5715,6 @@ footer .container button.big:before {
text-align: center;
font-weight: bold;
max-width: 60%;
text-shadow: 0px 0px 20px #000;
}
.card-production-cms .overlay-noauto .btn {
margin-top: 20px;
@@ -10127,8 +10125,10 @@ footer .container button.big:before {
color: #dfdfdf;
background-image: none;
}
.tooling-families-container .text-body div + div,
.tooling-magpos-container .text-body div + div {
.tooling-families-container .singleline,
.tooling-magpos-container .singleline,
.tooling-tools-container .singleline,
.tooling-shanks-container .singleline {
margin-top: 11px;
}
.tab-box-right {
Step/wwwroot/src/components/tooling/tooling-equipment.vue
+3 -3
View File
@@ -29,7 +29,7 @@
@click="selectTool(t)"></equipment>
</div>
<div class="list-vertical scrollable" ref="toolList" v-if="!isSiemens">
<equipment v-for="t in ncTools.filter(t => String(t.familyId).indexOf(currentFilter) >=0)" :key="t.id" :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" :title="t.familyId"
<equipment v-for="t in ncTools.filter(t => String(t.familyId).indexOf(currentFilter) >=0)" :key="t.id" :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" :title="'tooling_family_abbreviation' | localize('F%d',t.familyId)"
:img-source="getToolIcon(t.toolType)"
:class="{selected: selectedTool == t}"
@click="selectTool(t)"></equipment>
@@ -63,7 +63,7 @@
<div class="box-right-body" v-if="enableParameters">
<button class="btn deleteElement" @click="deleteTool(selectedTool)"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header" v-if="selectedTool.id" >{{'tooling_equipment_editlabel' | localize("Modifica utensile %d - %s",selectedTool.id,selectedTool.familyName)}}</div>
<div class="box-right-label-header" v-if="selectedTool.id" >{{'tooling_equipment_editlabel' | localize("Modifica utensile %d",selectedTool.id)}}</div>
<div class="box-right-label-header" v-if="!selectedTool.id" >{{'tooling_equipment_newlabel' | localize("Creazione Nuovo Utensile")}}</div>
<div class="list-skill-equipment scrollable">
<form>
@@ -174,7 +174,7 @@
</div>
<div class="box-right-body" v-if="enableAddOffsetToTool && !isSiemens">
<div class="box-right-label-header">{{'tooling_addoffset_label' | localize("Scegliere posizione e id dell'Offset da aggiungere")}}</div>
<div class="box-right-label-header">{{'tooling_edgesdata_label_new' | localize("Scegliere posizione e id dell'Offset da aggiungere")}}</div>
<!-- <div class="box-right-label-header" v-if="!selectedEquipment.id || selectedEquipment.id<0">{{'tooling_edgesdata_label_new' | localize("Creazione nuovo Tagliente")}}</div> -->
<div class="list-skill-equipment scrollable">
<div class="list-skill-equipment-category" >
Step/wwwroot/src/components/tooling/tooling-families.vue
+2 -1
View File
@@ -43,8 +43,9 @@
</div>
</div>
<div class="list-vertical scrollable" ref="familyList" >
<equipment v-for="f in ncFamilies.filter(f => f.name.toLowerCase().indexOf(currentFilter) >=0)" :key="f.uid" :title="f.name || f.oldName"
<equipment v-for="f in ncFamilies.filter(f => f.name.toLowerCase().indexOf(currentFilter) >=0)" :key="f.id" :title="f.name || f.oldName"
:class="{selected: selectedTool && selectedTool.id == f.id}"
:code="'tooling_family_abbreviation' | localize('F%d',f.id)"
:img-source="'../assets/icons/Tools/Families.png'"
@click="selectTool(f)"></equipment>
</div>
Step/wwwroot/src/components/tooling/tooling-shanks.vue
+5 -6
View File
@@ -48,11 +48,10 @@
</div>
</div>
<div class="list-vertical scrollable" ref="shankList">
<equipment v-for="s in ncShanks.filter(i => String(i.id).toLowerCase().indexOf(currentFilter) >=0)"
:key="s.id"
<equipment v-for="s in ncShanks.filter(i => String(i.id).toLowerCase().indexOf(currentFilter) >=0)"
v-if="s.id != null"
:code="'tooling_shank_abbreviation' | localize('S%d',s.id)"
:title="s.id"
:key="s.id"
:title="'tooling_shank_abbreviation' | localize('S%d',s.id)"
:img-source="'../assets/icons/Tools/Shanks.png'"
:magPosition="s.magazineId"
:class="{selected: selectedTool && selectedTool.id == s.id}"
@@ -65,7 +64,7 @@
<!-- Decidere come gestire le diverse macchine -->
<!-- Siemens -->
<!-- Siemens -->
<div class="box-right" v-if="(isSiemens) && selectedTool" :class="{'selected': disableList}" >
<div class="tab-box-right" :class="{'avoid-clicks': disableList}">
<button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">{{'tooling_parameters_tab' | localize("Parametri")}}</button>
@@ -178,7 +177,7 @@
:disabled-control="!enableModify"
:minValue="s.minValue"
:maxValue="s.maxValue"
:read-only="s.readOnly"
:read-only="s.readOnly || !disableList"
: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>
Step/wwwroot/src/modules/base-components/cards/card-job-production.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<div class="card-job-production-body-bottom" :class="{'width-body-bottom':noQueue}">
<div class="tabs">
<button class="tab" :class="{'active': enableIsoLines}" @click="selectTab('IsoLines')">Linee ISO</button>
<button class="tab" :class="{'active': enableFileSections}" @click="selectTab('FileSections')">Sezioni File</button>
<button class="tab" :class="{'active': enableFileSections}" @click="selectTab('FileSections')" v-if="false">Sezioni File</button>
</div>
<div class="content-box" v-if="enableIsoLines && currentProgram">
<div class="row" :class="{'selected': idx==indexofActiveLine,'width-100':noQueue}" v-for="(l, idx) in currentProgram.isoLines" :key="idx" >
Step/wwwroot/src/modules/base-components/cards/equipment.vue
+1 -1
View File
@@ -6,7 +6,7 @@
</div>
<div class="text-body">
<div>{{code}}</div>
<div>{{title}}</div>
<div :class="{'singleline':!code }">{{title}}</div>
</div>
<div v-if="magPosition" class="text-body-position">
<div>{{'tooling_magazine_abbreviation' | localize("Mag. %d", magPosition)}}</div>