Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@bimdata/design-system": "^1.4.0-rc.89",
"@bimdata/typescript-fetch-api-client": "^9.6.7",
"@bimdata/viewer": "^2.0.0-beta.24",
"@bimdata/viewer": "^2.0.0-beta.94",
"@vue/compat": "^3.1.0",
"oidc-client": "^1.11.5",
"vue": "^3.2.45",
Expand Down
5,392 changes: 5,391 additions & 1 deletion src/plugins/iot/dist/iot.plugin.js

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions src/plugins/iot/src/Graph.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
<h4 class="m-x-12">
{{ title }}
</h4>
<div
:id="index"
class="chartist ct-chart ct-perfect-fourth m-y-12"
></div>
<div :id="index" class="chartist ct-chart ct-perfect-fourth m-y-12"></div>
<BIMDataButton
class="bimdata-btn__fill bimdata-btn__fill--primary bimdata-btn__radius"
@click="onResetZoomClick"
Expand Down
62 changes: 27 additions & 35 deletions src/plugins/iot/src/Iot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@

<script>
import Graph from "./Graph.vue";
import elementData1 from "./eco1.json";
import elementData2 from "./eco2.json";
import {
BIMDataIcon,
BIMDataLoading,
Expand All @@ -80,7 +82,7 @@ export default {
},
data() {
return {
series: [],
series: {},
monitoredElements: [],
selectedElement: null,
errorValue: "Tableau éléctrique:L1000XH800 P300:631661",
Expand All @@ -91,14 +93,14 @@ export default {
};
},
watch: {
async selectedElement(newSelectedElement) {
selectedElement(newSelectedElement) {
if (newSelectedElement) {
this.viewer3dPlugin.fitViewObjects([newSelectedElement.uuid]);
this.viewer3dPlugin.fitView([newSelectedElement.uuid]);
this.$viewer.state.selectObjects([newSelectedElement.id], {
exclusive: true,
});
this.loading = true;
await this.getElementData(newSelectedElement.uuid);
this.getElementData(newSelectedElement.uuid);
this.loading = false;
}
},
Expand All @@ -121,19 +123,6 @@ export default {
"Content-Type": "application/json",
};
},
getIotUrl() {
const url = new URL(this.$viewer.api.apiUrl);
const hostname = url.hostname;
let env = "";
const [apiEnv, ...domainPath] = hostname.split(".");
const domain = domainPath.join(".");
if (apiEnv.includes("-staging")) {
env = "-staging";
} else if (apiEnv.includes("-next")) {
env = "-next";
}
return url.protocol + "//iot" + env + "." + domain;
},
onObjectsSelected(uuids) {
const selectedAndMonitoredElements = uuids.filter(uuid =>
this.monitoredElements.some(element => element.uuid === uuid)
Expand All @@ -150,31 +139,34 @@ export default {
},
getSeries(meters) {
let series = [];
meters.forEach(meter => {
const records = meter.measurements.map(({ records }) =>
records.map(record => ({
x: Date.parse(record.timestamp),
y: record.value,
meta: record.timestamp,
}))
);
for (let name in meters) {
let records = [];
for (let measurement in meters[name].measurements) {
records.push(
meters[name].measurements[measurement].map(record => ({
x: Date.parse(record.timestamp),
y: record.value,
meta: record.timestamp,
}))
);
}
series.push({
meterName: meter.meter_name,
meterName: name,
series: { series: records },
meterId: meter.meter_id,
meterId: meters[name].meter_id,
});
});
}
return series;
},
async getElementData(elementId) {
const res = await fetch(
`${this.getIotUrl()}/element-records/${elementId}?days=7`,
{ headers: this.getHeaders() }
);
this.series = this.getSeries(await res.json());
getElementData(elementId) {
if (elementId === "0vNFceMkb8dezQiQhWAOcS") {
this.series = this.getSeries(elementData1);
} else {
this.series = this.getSeries(elementData2);
}
},
async getMonitoredElements() {
const ifcs = this.$viewer.state.ifcs;
const ifcs = this.$viewer.state.models;
const ifc = ifcs.find(ifc => ifc.name.startsWith("Mirabeau_ELEC")); // When there is more than one ifc
if (ifc) {
const apiClient = this.$viewer.api.apiClient.modelApi;
Expand Down
Loading