Fix head style

Added Siemens tool mounted data
Fix fanuc getFileList()
This commit is contained in:
Lucio Maranta
2019-09-24 16:21:50 +02:00
parent b2c13d8d82
commit 4be7e1c736
5 changed files with 18 additions and 4 deletions
Binary file not shown.
+1 -1
View File
@@ -145,7 +145,7 @@ namespace Step.Model.DTOModels
return false;
// Call Parent equals
return true;
return base.Equals(item);
}
public override int GetHashCode()
@@ -229,6 +229,12 @@
color: #fff;
}
}
.detail-box{
border-left: 2px solid;
border-top: 2px solid;
border-bottom: 2px solid;
}
}
.detail-box {
@@ -238,6 +244,7 @@
display: flex;
position: absolute;
right: 154px;
span {
width: 156px;
font-size: 18px;
+7
View File
@@ -6970,6 +6970,13 @@ footer .container button.big:before {
border-color: #fff !important;
color: #fff;
}
.head-spindle.selected .detail-box,
.head-production.selected .detail-box,
.head-awj.selected .detail-box {
border-left: 2px solid;
border-top: 2px solid;
border-bottom: 2px solid;
}
.head-spindle .detail-box,
.head-production .detail-box,
.head-awj .detail-box {
@@ -48,8 +48,8 @@
<!-- Tool Id -->
<div class="tool-box" @click="toggleDetail" :class="{detailBoxOpened: detailBoxOpened && toolData}" v-if="type == 'SPINDLE'">
<div class="arrow-box">
<span v-if="!detailBoxOpened && toolData"><i class="fa fa-angle-left"></i></span>
<span v-if="detailBoxOpened && toolData"><i class="fa fa-angle-right"></i></span>
<span v-if="!detailBoxOpened && tool"><i class="fa fa-angle-left"></i></span>
<span v-if="detailBoxOpened && tool"><i class="fa fa-angle-right"></i></span>
</div>
<div class="tool-box-data">
<label>{{'head_label_tool' | localize("Tool")}}</label>
@@ -178,7 +178,7 @@ export default {
return ore+ ":"+minuti+":"+secondi+"\nhh:mm:ss";
},
toggleDetail() {
if(this.toolData)
if(this.tool)
this.detailBoxOpened = !this.detailBoxOpened
}
},