Skip to content
Snippets Groups Projects
Commit ebbac898 authored by Nils Brinckmann's avatar Nils Brinckmann
Browse files

Merge branch '463-add-offsets-to-tsm-linking-table' into 'develop'

Add offsets to submit overview & linking table

See merge request !503
parents 61579474 544807dc
No related branches found
No related tags found
2 merge requests!507Develop,!503Add offsets to submit overview & linking table
...@@ -127,6 +127,9 @@ export default class TsmLinkingOverviewTable extends Vue { ...@@ -127,6 +127,9 @@ export default class TsmLinkingOverviewTable extends Vue {
}, { }, {
text: 'Measured Quantity', text: 'Measured Quantity',
value: 'measuredQuantity' value: 'measuredQuantity'
}, {
text: 'Offsets (X | Y | Z)',
value: 'offsets'
}, { }, {
text: 'Start date', text: 'Start date',
value: 'startDate' value: 'startDate'
...@@ -162,6 +165,7 @@ export default class TsmLinkingOverviewTable extends Vue { ...@@ -162,6 +165,7 @@ export default class TsmLinkingOverviewTable extends Vue {
return { return {
id: linking.id, id: linking.id,
tsmdlEntityNames: this.generateTsmdlEntityNames(linking), tsmdlEntityNames: this.generateTsmdlEntityNames(linking),
offsets: `(${linking?.deviceMountAction?.offsetX} | ${linking?.deviceMountAction?.offsetY} | ${linking?.deviceMountAction?.offsetZ})`,
startDate: this.$root.$options.filters!.toUtcDateTimeStringHHMM(linking.startDate), startDate: this.$root.$options.filters!.toUtcDateTimeStringHHMM(linking.startDate),
endDate: this.$root.$options.filters!.toUtcDateTimeStringHHMM(linking.endDate), endDate: this.$root.$options.filters!.toUtcDateTimeStringHHMM(linking.endDate),
measuredQuantity: this.generatePropertyTitle(linking.deviceProperty), measuredQuantity: this.generatePropertyTitle(linking.deviceProperty),
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<tr> <tr>
<th>Device</th> <th>Device</th>
<th>Mount range</th> <th>Mount range</th>
<th>Offsets (X | Y | Z)</th>
<th>Measured Quantity</th> <th>Measured Quantity</th>
<th>Datasource</th> <th>Datasource</th>
<th>Thing</th> <th>Thing</th>
...@@ -63,6 +64,9 @@ ...@@ -63,6 +64,9 @@
:to="formLinking.deviceMountAction.endDate" :to="formLinking.deviceMountAction.endDate"
/> />
</td> </td>
<td>
({{ formLinking.deviceMountAction.offsetX }} | {{ formLinking.deviceMountAction.offsetY }} | {{ formLinking.deviceMountAction.offsetZ }})
</td>
<td> <td>
{{ formLinking.deviceProperty | generatePropertyTitle }} {{ formLinking.deviceProperty | generatePropertyTitle }}
</td> </td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment