show 2 years

webapp/src/components/CalendarChart.vue

@@ -11,7 +11,7 @@ import { authHeader, handleResponse } from '@/utils/authentication';
 var data_cal: any;
 
 export const options_cal = {
-    height: 270,
+    height: 480,
     colorAxis: {
         minValue: 0,
         colors: ['#FFFFFF', '#0000FF']

webapp/src/views/HomeView.vue

@@ -4,10 +4,8 @@
         <InverterTotalInfo :totalData="liveData.total" /><br />
         <div class="card">
             <div class="card-body">
-                <div class="row">
+                <BarChart />
-                    <BarChart />
+                <CalendarChart />
-                    <CalendarChart />
-                </div>
             </div>
         </div>
         <div class="row gy-3">
@@ -90,7 +88,8 @@
 
                                 <div class="btn-group me-2" role="group">
                                     <button type="button" class="btn btn-sm btn-info"
-                                        @click="onShowGridProfile(inverter.serial)" v-tooltip :title="$t('home.ShowGridProfile')">
+                                        @click="onShowGridProfile(inverter.serial)" v-tooltip
+                                        :title="$t('home.ShowGridProfile')">
                                         <BIconOutlet style="font-size:24px;" />
 
                                     </button>
@@ -200,12 +199,13 @@
                         </div>
                     </div>
 
-                    <GridProfile v-if="!gridProfileLoading" :gridProfileList="gridProfileList" :gridProfileRawList="gridProfileRawList" />
+                    <GridProfile v-if="!gridProfileLoading" :gridProfileList="gridProfileList"
+                        :gridProfileRawList="gridProfileRawList" />
                 </div>
 
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" @click="onHideGridProfile"
+                    <button type="button" class="btn btn-secondary" @click="onHideGridProfile" data-bs-dismiss="modal">{{
-                        data-bs-dismiss="modal">{{ $t('home.Close') }}</button>
+                        $t('home.Close') }}</button>
                 </div>
             </div>
         </div>
@@ -639,11 +639,11 @@ export default defineComponent({
                     this.gridProfileList = data;
 
                     fetch("/api/gridprofile/rawdata?inv=" + serial, { headers: authHeader() })
-                    .then((response) => handleResponse(response, this.$emitter, this.$router))
+                        .then((response) => handleResponse(response, this.$emitter, this.$router))
-                    .then((data) => {
+                        .then((data) => {
-                        this.gridProfileRawList = data;
+                            this.gridProfileRawList = data;
-                        this.gridProfileLoading = false;
+                            this.gridProfileLoading = false;
-                    })
+                        })
                 });
 
             this.gridProfileView.show();

webapp/vite.config.ts

@@ -14,7 +14,7 @@ let proxy_target;
 try {
     proxy_target = require('./vite.user.ts').proxy_target;
 } catch (error) {
-    proxy_target = '192.168.20.110';
+    proxy_target = '192.168.2.93';
 }
 
 // https://vitejs.dev/config/

webapp/yarn.lock

@@ -1830,6 +1830,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 magic-string@^0.30.0, magic-string@^0.30.5:
   version "0.30.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
@@ -2098,7 +2105,7 @@ postcss-selector-parser@^6.0.13:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss@^8.4.32:
+postcss@^8.1.10, postcss@^8.4.32:
   version "8.4.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9"
   integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==
@@ -2320,11 +2327,16 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 spark-md5@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"