Added Unit-Measure on Axes quotes

This commit is contained in:
Nicola Carminati
2018-12-17 14:04:18 +01:00
parent 1e71a07778
commit 501f2e7f3f
4 changed files with 43 additions and 9 deletions
+5 -1
View File
@@ -734,7 +734,11 @@
&.more9{
margin-right: 5px;
}
}
.umeasure{
width: 32px;
margin-left: 5px;
text-align: left;
}
}
.axes:nth-child(odd) .number{
+6
View File
@@ -6366,6 +6366,12 @@ footer .container button.big:before {
.card-axes-production .second-box-axes .axes .number.more9 {
margin-right: 5px;
}
.card-axes-production .first-box-axes .axes .umeasure,
.card-axes-production .second-box-axes .axes .umeasure {
width: 32px;
margin-left: 5px;
text-align: left;
}
.card-axes-production .first-box-axes .axes:nth-child(odd) .number,
.card-axes-production .second-box-axes .axes:nth-child(odd) .number {
background-color: #f3f3f3;
+1
View File
@@ -20,6 +20,7 @@ declare module signalr_process {
id:number;
name: string;
isSelectable: string;
type: string;
}
interface AxisValueData{
@@ -7,8 +7,9 @@
{{a.name}}
</div>
<div class="number" :class="numAxes">
{{a.value.toFixed(3)}}
</div>
{{a.value.toFixed(3)}}
<span class="umeasure">{{a.umeas}}</span>
</div>
</div>
</div>
<div class="second-box-axes">
@@ -20,30 +21,33 @@
<div class="content-box scrollable" v-if="enableOm">
<div class="axes" v-for="a in axes(nameAxes,axesMachine)" :key="a.id" :class="numAxes">
<div class="variable" :class="numAxes">
{{a.name}}
{{a.name}}
</div>
<div class="number" :class="numAxes">
{{a.value.toFixed(3)}}
{{a.value.toFixed(3)}}
<span class="umeasure">{{a.umeas}}</span>
</div>
</div>
</div>
<div class="content-box scrollable" v-if="enableGoto">
<div class="axes" v-for="a in axes(nameAxes,axesToGo)" :key="a.id" :class="numAxes">
<div class="variable" :class="numAxes">
{{a.name}}
{{a.name}}
</div>
<div class="number" :class="numAxes">
{{a.value.toFixed(3)}}
{{a.value.toFixed(3)}}
<span class="umeasure">{{a.umeas}}</span>
</div>
</div>
</div>
<div class="content-box scrollable" v-if="enableProg">
<div class="axes" v-for="a in axes(nameAxes,axesProgrammePos)" :key="a.id" :class="numAxes">
<div class="variable" :class="numAxes">
{{a.name}}
{{a.name}}
</div>
<div class="number" :class="numAxes">
{{a.value.toFixed(3)}}
{{a.value.toFixed(3)}}
<span class="umeasure">{{a.umeas}}</span>
</div>
</div>
@@ -70,6 +74,9 @@ export default {
nameAxes: function() {
return this.$store.state.process.axes;
},
CNCumeas: function() {
return this.$store.state.machineInfo.unitOfMeasurement;
},
numAxes: function() {
if (!this.followAxesNumber) return null;
@@ -125,6 +132,7 @@ export default {
if (element.id == key) {
var axesElement = {
name: element.name,
umeas: this.uMeasure(element.type),
value: valueAxes[key]
};
newAxis.push(axesElement);
@@ -132,6 +140,21 @@ export default {
}
});
return newAxis;
},
uMeasure: function(type) {
if(type==="ROTATING")
return "°";
else{
if(type==="LINEAR" && this.CNCumeas){
if(this.CNCumeas === "mm")
return "mm"
if(this.CNCumeas === "inches")
return "In"
return "--"
}
else
return "--";
}
}
}
};