add

Strides-Admin/.env.production

@@ -3,5 +3,5 @@ NODE_ENV = 'production'
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://chargeco.global/'
+VUE_APP_BASE_API = 'https://csms.chargeco.global/'
 VUE_APP_API_PREFIX = 'chargeco/crmApi'

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

@@ -119,18 +119,15 @@
           <div style="font-size: 0.8em; margin-top: -5px;">(In Use/Total)</div>
         </template>
           <template slot-scope="{row}">
-            <span>{{ "0/0" }}</span>
+            <span>{{row.inUse || "0" }}/{{row.all || "0"}}</span>
           </template>
       </el-table-column>
-      <!--el-table-column
+      <el-table-column
         label="Status"
         align="center"
         width="120px"
-        class-name="fixed-width">
-          <template slot-scope="{row}">
-            <span>{{ "Active" }}</span>
-          </template>
-      </el-table-column-->
+        prop="dataStatus"
+        class-name="fixed-width"/>
       <el-table-column
         v-if="!$route.meta.onlyView"
         label="Action"

Strides-Admin/src/views/site/SiteManagement.vue

@@ -52,7 +52,7 @@
         label="Site ID"
         prop="sitePk"
         align="center"
-        width="120">
+        width="80">
           <template slot-scope="{row}">
             <span>{{ row.sitePk }}</span>
           </template>
@@ -80,13 +80,14 @@
         prop="siteName"
         align="center">
         <template slot-scope="{row}">
-          <span>{{ row.serviceProvider }}</span>
+          <div v-for="item in row.serviceProviders" :key="item">{{item}}</div>
         </template>
       </el-table-column>
       <el-table-column
         label="Total Stations"
         prop="stationNo"
-        align="center">
+        align="center"
+        width="100">
           <template slot="header" slot-scope="scope">
             <div>Stations</div>
             <div style="font-size: 0.8em; margin-top: -5px;">(In Use/Total)</div>
@@ -107,6 +108,7 @@
         label="Total Connectors"
         prop="connectorNo"
         align="center"
+        width="100"
         class-name="fixed-width">
           <template slot="header" slot-scope="scope">
             <div>Connectors</div>
@@ -129,7 +131,7 @@
         v-if="visible.actions"
         label="Action"
         align="center"
-        width="240">
+        width="200">
           <template slot-scope="{row, $index}">
             <TableAction
               :showDel="visible.actionDelete"

Strides-Admin/src/views/site/components/Summary.vue

@@ -29,7 +29,7 @@
     
     <div v-if="info.consumption">
       <div class="summary-view">
-        <div class="summary-text">Total Consumption 2023</div>
+        <div class="summary-text">Total Consumption {{year}}</div>
         <div class="summary-text">{{info.consumption.thisYearTotalConsumption}}</div>
       </div>
       <div class="summary-sub-view">
@@ -48,28 +48,28 @@
     
     <div v-if="info.revenue">
       <div class="summary-view">
-        <div class="summary-text">Total Revenue 2023</div>
-        <div class="summary-text">{{currency}}1900</div>
+        <div class="summary-text">Total Revenue {{year}}</div>
+        <div class="summary-text">{{currency}}{{info.revenue.thisYearTotalRevenue}}</div>
       </div>
       <div class="summary-sub-view">
         <div class="summary-text">Transaction Completed</div>
-        <div class="summary-text">12</div>
+        <div class="summary-text">{{info.revenue.thisDayTransactionsCompleted}}</div>
       </div>
       <div class="summary-sub-view">
         <div class="summary-text">Transactions Ongoing</div>
-        <div class="summary-text">12</div>
+        <div class="summary-text">{{info.revenue.thisDayTransactionsOngoing}}</div>
       </div>
       <div class="summary-sub-view">
         <div class="summary-text">Highest transaction</div>
-        <div class="summary-text">{{currency}}20</div>
+        <div class="summary-text">{{currency}}{{info.revenue.thisDayHighestTransaction}}</div>
       </div>
       <div class="summary-sub-view">
         <div class="summary-text">Lowest Transaction</div>
-        <div class="summary-text">{{currency}}65</div>
+        <div class="summary-text">{{currency}}{{info.revenue.thisDayLowestTransaction}}</div>
       </div>
       <div class="summary-sub-view">
         <div class="summary-text">Average Transaction</div>
-        <div class="summary-text">{{currency}}20</div>
+        <div class="summary-text">{{currency}}{{info.revenue.thisDayAverageTransaction}}</div>
       </div>
     </div>
   </div>
@@ -90,11 +90,11 @@
     },
     data() {
       return {
-        
+        year: "2023"
       };
     },
     mounted() {
-      
+      this.year = ("" + new Date().getFullYear());
     },
     methods: {
       

Strides-Admin/vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/csms',
+  publicPath: process.env.ENV === 'development' ? '/csms' : '',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',