Hide ID columns

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Thu May 18 15:20:34 CST 2023
-VERSION_CODE=225
+#Fri May 19 11:33:17 CST 2023
+VERSION_CODE=227

Strides-APP/app/utils/themes.js

@@ -4,10 +4,10 @@ const enableDarkMode = false;//启用黑暗模式
 //theme
 global.pageTitleTint = '#000000';
 global.pageBackground = '#fafafa';
-global.colorThemes = '#FFFFFF';//#FFFFFF
+global.colorThemes = '#FFFFFF';//toolbar color
 global.colorAccent = '#A3C93A';//56D905
 global.colorPrimary = '#001489';
-global.colorPrimaryDark = '#FFFFFF';//#FFFFFF
+global.colorPrimaryDark = '#FFFFFF';//statusbar color
 //background
 global.colorDark = "#303030";
 global.colorLight = "#FFFEFE";

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

@@ -48,7 +48,7 @@
       :data="list"
       fit
       style="width: 100%;">
-      <el-table-column
+      <!--el-table-column
         label="Site ID"
         prop="sitePk"
         align="center"
@@ -56,7 +56,7 @@
           <template slot-scope="{row}">
             <span>{{ row.sitePk }}</span>
           </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column
         label="Site Name"
         prop="siteName"

Strides-Admin/src/views/transaction/transactions.vue

@@ -73,14 +73,14 @@
           <router-link :to="'/transactions-reservations/transactions/'+row.transactionPk" class="table-link">{{ row.transactionPk }}</router-link>
         </template>
       </el-table-column>
-      <el-table-column
+      <!--el-table-column
         label="User ID"
         align="center"
         width="80">
           <template slot-scope="{row}">
             <span>{{ row.userPk }}</span>
           </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column
         label="Email"
         align="center">
@@ -88,13 +88,13 @@
           <span :title="row.email">{{ row.email }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!--el-table-column
         label="Phone No."
         align="center">
         <template slot-scope="{row}">
           <span :title="row.phoneNo">{{ row.phoneNo }}</span>
         </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column
         label="User Type"
         align="center">
@@ -121,7 +121,12 @@
         align="center"
         class-name="fixed-width">
           <template slot-scope="{row}">
-            <router-link :to="'/transactions-reservations/transactions/'+row.transactionPk" class="table-link" :title="row.chargeBoxId">{{ row.chargeBoxId }}</router-link>
+            <router-link
+              :to="'/transactions-reservations/transactions/'+row.transactionPk"
+              class="table-link"
+              :title="row.chargeBoxId">
+              {{ row.chargeBoxId }}
+            </router-link>
           </template>
       </el-table-column>
       <el-table-column
@@ -154,7 +159,7 @@
         align="center"
         class-name="fixed-width">
           <template slot-scope="{row}">
-            <span>{{ row.power  }}</span>
+            <span :title="row.power">{{ row.power  }}</span>
           </template>
       </el-table-column>
       <el-table-column
@@ -165,12 +170,28 @@
             <span :title="row.rate">{{ row.rate }}</span>
           </template>
       </el-table-column>
+      <el-table-column
+        label="Duration"
+        align="center"
+        class-name="fixed-width">
+          <template slot-scope="{row}">
+            <span :title="row.totalHour">{{ row.totalHour }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column
+        label="Total Min"
+        align="center"
+        class-name="fixed-width">
+          <template slot-scope="{row}">
+            <span :title="row.totalMin">{{ row.totalMin }}</span>
+          </template>
+      </el-table-column>
       <el-table-column
         label="Charges"
         align="center"
         class-name="fixed-width">
           <template slot-scope="{row}">
-            <span>{{ row.charges }}</span>
+            <span :title="row.charges">{{ row.charges }}</span>
           </template>
       </el-table-column>
       <!--<el-table-column