100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
make everything work with Robin's work
Vincentdb3e02f2c8d9
diff --git a/ui/app/main/src/components/pages/page-insights.ts b/ui/app/main/src/components/pages/page-insights.tsindex 8953312a0..ca1ea944b 100644--- a/ui/app/main/src/components/pages/page-insights.ts+++ b/ui/app/main/src/components/pages/page-insights.ts@@ -3,10 +3,80 @@ import {store} from "../../store";import {connect} from "pwa-helpers/connect-mixin";import "@openremote/or-data-viewer";import {DataViewerConfig} from "@openremote/or-data-viewer";-import {DefaultBoxShadow} from "@openremote/core";+import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5} from "@openremote/core";++import "@openremote/or-attribute-card";// language=CSSconst style = css`++ :host {+ --internal-or-asset-viewer-background-color: var(--or-asset-viewer-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));+ --internal-or-asset-viewer-panel-margin: var(--or-asset-viewer-panel-margin, 20px);+ --internal-or-asset-viewer-panel-padding: var(--or-asset-viewer-panel-padding, 24px);+ --internal-or-asset-viewer-text-color: var(--or-asset-viewer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));+ --internal-or-asset-viewer-title-text-color: var(--or-asset-viewer-title-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));+ --internal-or-asset-viewer-panel-color: var(--or-asset-viewer-panel-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));+ --internal-or-asset-viewer-line-color: var(--or-asset-viewer-line-color, var(--or-app-color5, ${unsafeCSS(DefaultColor5)}));++ height: 100%;+ width: 100%;+ background-color: var(--internal-or-asset-viewer-background-color);+ }++ *[hidden] {+ display: none;+ }++ #wrapper {+ height: 100%;+ width: 100%;+ display: flex;+ flex-direction: column;+ overflow: auto;+ }++ @media only screen and (max-width: 767px) {+ #wrapper {+ position: absolute;+ left: 0;+ right: 0;+ }+ }++ #container {+ box-sizing: border-box;+ display: grid;+ padding: 20px 20px;+ grid-gap: 10px;+ grid-template-columns: 1fr 1fr 1fr 1fr;++ width: 100%;+ max-width: 1400px;+ margin-left: auto;+ margin-right: auto;++ -webkit-animation: fadein 0.3s; /* Safari, Chrome and Opera > 12.1 */+ -moz-animation: fadein 0.3s; /* Firefox < 16 */+ -ms-animation: fadein 0.3s; /* Internet Explorer */+ -o-animation: fadein 0.3s; /* Opera < 12.1 */+ animation: fadein 0.3s;+ }+ @media only screen and (max-width: 1023px) {+ #container {+ grid-template-columns: 1fr 1fr;+ }+ }+ @media only screen and (max-width: 779px) {+ #container {+ grid-template-columns: 1fr;+ }+ }++ .row {+ grid-column-start: 1;+ grid-column-end: -1;+ }or-asset-tree {align-items: stretch;@@ -71,8 +141,18 @@ class PageInsights extends connect(store)(LitElement) {protected _assetId;protected render(): TemplateResult | void {++ const attributeName: string = "light1PowerConsumption";+return html`- <or-data-viewer .config="${viewerConfig}"></or-data-viewer>+ <div id="wrapper">+ <div id="container">+ <div class="row">+ <or-data-viewer .config="${viewerConfig}"></or-data-viewer>+ </div>+ <or-attribute-card .assetId="${this._assetId}" .attributeName="${attributeName}"></or-attribute-card>+ </div>+ </div>`;}diff --git a/ui/app/main/src/index.ts b/ui/app/main/src/index.tsindex 173ec5796..09e9e6b32 100644--- a/ui/app/main/src/index.ts+++ b/ui/app/main/src/index.ts@@ -42,9 +42,6 @@ router.on({store.dispatch(updateRule(params.id));store.dispatch(updatePage("rules"));},- "insights": (params, query) => {- store.dispatch(updatePage("insights"));- },"*": (params, query) => {store.dispatch(updatePage("map"));}