diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index afc6456c..d8b9f3d5 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -734,7 +734,11 @@ &.more9{ margin-right: 5px; } - + } + .umeasure{ + width: 32px; + margin-left: 5px; + text-align: left; } } .axes:nth-child(odd) .number{ diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 65578609..d1e77d88 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -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; diff --git a/Step/wwwroot/src/@types/signalr.process.d.ts b/Step/wwwroot/src/@types/signalr.process.d.ts index 8daa3c88..f97c924b 100644 --- a/Step/wwwroot/src/@types/signalr.process.d.ts +++ b/Step/wwwroot/src/@types/signalr.process.d.ts @@ -20,6 +20,7 @@ declare module signalr_process { id:number; name: string; isSelectable: string; + type: string; } interface AxisValueData{ diff --git a/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue b/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue index 2925734a..b19805f2 100644 --- a/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue +++ b/Step/wwwroot/src/app_modules/production/components/card-axes-production.vue @@ -7,8 +7,9 @@ {{a.name}}
- {{a.value.toFixed(3)}} -
+ {{a.value.toFixed(3)}} + {{a.umeas}} +
@@ -20,30 +21,33 @@
- {{a.name}} + {{a.name}}
- {{a.value.toFixed(3)}} + {{a.value.toFixed(3)}} + {{a.umeas}}
- {{a.name}} + {{a.name}}
- {{a.value.toFixed(3)}} + {{a.value.toFixed(3)}} + {{a.umeas}}
- {{a.name}} + {{a.name}}
- {{a.value.toFixed(3)}} + {{a.value.toFixed(3)}} + {{a.umeas}}
@@ -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 "--"; + } } } };