VedirectView becomes component

* move Vedirect in the component folder * VedirectView is now component of BasePage * /vedirectlivedata connectable through vue proxy
helgeerbe · Feb 15, 2023 · 0ac5291 · 0ac5291
1 parent a529c91
commit 0ac5291
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/webapp/src/views/VedirectView.vue → webapp/src/components/VedirectView.vue b/webapp/src/views/VedirectView.vue → webapp/src/components/VedirectView.vue
@@ -203,6 +203,7 @@ export default defineComponent({
     },
     methods: {
         getInitialData() {
+            console.log("Get initalData for VeDirect");
             this.dataLoading = true;
             fetch("/api/vedirectlivedata/status", { headers: authHeader() })
                 .then((response) => handleResponse(response, this.$emitter, this.$router))
@@ -212,7 +213,7 @@ export default defineComponent({
                 });
         },
         initSocket() {
-            console.log("Starting connection to WebSocket Server");
+            console.log("Starting connection to VeDirect WebSocket Server");
 
             const { protocol, host } = location;
             const authString = authUrl();
@@ -230,7 +231,7 @@ export default defineComponent({
 
             this.socket.onopen = function (event) {
                 console.log(event);
-                console.log("Successfully connected to the echo websocket server...");
+                console.log("Successfully connected to the VeDirect websocket server...");
             };
 
             // Listen to window events , When the window closes , Take the initiative to disconnect websocket Connect

diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue
@@ -106,10 +106,9 @@
                 </div>
             </div>
         </div>
+        <VedirectView />
     </BasePage>
-
-    <VedirectView />
-
+
     <div class="modal" id="eventView" tabindex="-1">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
@@ -318,7 +317,7 @@ import EventLog from '@/components/EventLog.vue';
 import HintView from '@/components/HintView.vue';
 import InverterChannelInfo from "@/components/InverterChannelInfo.vue";
 import InverterTotalInfo from '@/components/InverterTotalInfo.vue';
-import VedirectView from '@/views/VedirectView.vue';
+import VedirectView from '@/components/VedirectView.vue';
 import type { DevInfoStatus } from '@/types/DevInfoStatus';
 import type { EventlogItems } from '@/types/EventlogStatus';
 import type { LimitConfig } from '@/types/LimitConfig';

diff --git a/webapp/vite.config.ts b/webapp/vite.config.ts
@@ -49,6 +49,11 @@ export default defineConfig({
         ws: true,
         changeOrigin: true
       },
+      '^/vedirectlivedata': {
+        target: 'ws://192.168.178.78/',
+        ws: true,
+        changeOrigin: true
+      },
       '^/console': {
         target: 'ws://192.168.20.110/',
         ws: true,

diff --git a/webapp_dist/js/app.js.gz b/webapp_dist/js/app.js.gz