Эх сурвалжийг харах

enhancement & fixed issues

vbea 2 жил өмнө
parent
commit
c705a1a740

+ 2 - 2
Strides-Admin/src/router/SiteRouter.js

@@ -130,7 +130,7 @@ export default {
       hidden: true,
       hidden: true,
       meta: {
       meta: {
         title: 'Manage Chargers',
         title: 'Manage Chargers',
-        activeMenu: '/site-management/site-configuration'
+        activeMenu: '/site-management-v2/site-configuration',
       }
       }
     },
     },
     {
     {
@@ -140,7 +140,7 @@ export default {
       hidden: true,
       hidden: true,
       meta: {
       meta: {
         title: 'Manage Connectors',
         title: 'Manage Connectors',
-        activeMenu: '/site-management/site-configuration'
+        activeMenu: '/site-management-v2/site-configuration',
       }
       }
     },
     },
     {
     {

+ 1 - 1
Strides-Admin/src/views/charge/Connectors.vue

@@ -257,7 +257,7 @@ export default {
   methods: {
   methods: {
     goBack() {
     goBack() {
       this.$router.push({
       this.$router.push({
-        path: "/site-management/edit/" + this.sitePk
+        path: "/site-management-v2/edit/" + this.sitePk
       })
       })
     },
     },
     handleFilter() {
     handleFilter() {

+ 1 - 1
Strides-Admin/src/views/charge/RegisteredChargeStations.vue

@@ -221,7 +221,7 @@ export default {
   methods: {
   methods: {
     goBack() {
     goBack() {
       this.$router.push({
       this.$router.push({
-        path: "/site-management/edit/" + this.sitePk
+        path: "/site-management-v2/edit/" + this.sitePk
       })
       })
     },
     },
     handleFilter() {
     handleFilter() {

+ 22 - 6
Strides-Admin/src/views/site/components/Dashboard.vue

@@ -26,6 +26,10 @@
       enable: {
       enable: {
         type: Boolean,
         type: Boolean,
         default: false
         default: false
+      },
+      v2: {
+        type: Boolean,
+        default: false
       }
       }
     },
     },
     data() {
     data() {
@@ -59,14 +63,26 @@
     },
     },
     methods: {
     methods: {
       toStations() {
       toStations() {
-        this.$router.push({
-          path: "/site-management/stations/" + this.siteId
-        })
+        if (this.v2) {
+          this.$router.push({
+            path: "/site-management/stations/" + this.siteId
+          })
+        } else {
+          this.$router.push({
+            path: "/charge-station-management/registered-charge-stations"
+          })
+        }
       },
       },
       toConnectors() {
       toConnectors() {
-        this.$router.push({
-          path: "/site-management/connectors/" + this.siteId
-        })
+        if (this.v2) {
+          this.$router.push({
+            path: "/site-management/connectors/" + this.siteId
+          })
+        } else {
+          this.$router.push({
+            path: "/charge-station-management/connectors"
+          })
+        }
       },
       },
       toTransactions() {
       toTransactions() {
         this.$router.push({
         this.$router.push({

+ 1 - 0
Strides-Admin/src/views/site2/detail.vue

@@ -134,6 +134,7 @@
         <div class="flexl flex1">
         <div class="flexl flex1">
           <div class="view-content" style="padding: 15px;">
           <div class="view-content" style="padding: 15px;">
             <dashboard
             <dashboard
+              v2
               :enable="isEdit"
               :enable="isEdit"
               :info="summaryInfo"
               :info="summaryInfo"
               :siteId="siteForm.sitePk"/>
               :siteId="siteForm.sitePk"/>