vbea 3 лет назад
Родитель
Сommit
4fe0c8f87c

+ 2 - 1
Strides-Admin/src/router/index.js

@@ -12,6 +12,7 @@ import OCPPRouter from './OCPPRouter'
 import driver from './driver'
 import fleetCompanyRoute from './fleetCompany'
 import CreditLimit from './CreditLimit'
+import FinancialRouter from './FinancialRouter'
 
 Vue.use(VueRouter)
 
@@ -121,7 +122,7 @@ const constantRoutes = [
     ]
   },
   ChargingProfile,
-  /*FinancialRouter,*/
+  FinancialRouter,
   UserRouter,
   driver,
   {

+ 17 - 0
Strides-Admin/src/styles/index.scss

@@ -331,4 +331,21 @@ aside {
   flex: 1;
   padding: 10px 0;
   margin-left: 20px;
+}
+
+.filter-view {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+.filter-view > * {
+  margin: 10px 5px;
+}
+.filter-view .el-form-item {
+  margin: 10px 5px !important;
+}
+.filter-flex-button {
+  flex: 1;
+  text-align: right;
+  margin-bottom: 0;
 }

+ 3 - 1
Strides-Admin/src/views/Reports.vue

@@ -31,7 +31,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="Site:" v-if="reportFilter.reportType == 'MAF'">
+          <el-form-item
+            label="Site:"
+            v-if="reportFilter.reportType == 'MAF'">
             <el-select
               class="add-text"
               filterable

+ 0 - 16
Strides-Admin/src/views/charge/Connectors.vue

@@ -248,22 +248,6 @@
       }
     }
   }
-  .filter-view {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-  }
-  .filter-view > * {
-    margin: 10px 5px;
-  }
-  .filter-view .el-form-item {
-    margin: 10px 5px;
-  }
-  .filter-flex-button {
-    flex: 1;
-    text-align: right;
-    margin-bottom: 0;
-  }
   .back-icon {
     width: 30px;
     height: 30px;

+ 0 - 16
Strides-Admin/src/views/charge/RegisteredChargeStations.vue

@@ -273,22 +273,6 @@ export default {
 }
 </script>
 <style>
-  .filter-view {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-  }
-  .filter-view > * {
-    margin: 10px 5px;
-  }
-  .filter-view .el-form-item {
-    margin: 10px 5px;
-  }
-  .filter-flex-button {
-    flex: 1;
-    text-align: right;
-    margin-bottom: 0;
-  }
   .back-icon {
     width: 30px;
     height: 30px;

+ 2 - 2
Strides-Admin/src/views/dashboard/Dashboard.vue

@@ -3,7 +3,7 @@
     <div class="filter">
       <el-select
         v-model="providerPk"
-        class="filter-view"
+        class="filter-item"
         @change="changeProvider">
         <el-option 
           v-for="(item, index) in providerList"
@@ -312,7 +312,7 @@
     padding-top: 15px;
     justify-content: space-between;
   }
-  .filter-view {
+  .filter-item {
     width: 100%;
     max-width: 300px;
   }

+ 5 - 0
Strides-Admin/src/views/login/index.vue

@@ -76,6 +76,7 @@ import { validUsername } from '@/utils/validate'
 import VueRouter from 'vue-router'
 import { Message } from 'element-ui'
 import settings from '../../settings.js'
+import {getUserName} from '../../utils/auth.js'
 const { isNavigationFailure, NavigationFailureType } = VueRouter
 
 export default {
@@ -138,6 +139,10 @@ export default {
   },
   created() {
     // window.addEventListener('storage', this.afterQRScan)
+    const user = getUserName()
+    if (user) {
+      this.loginForm.username = user;
+    }
   },
   mounted() {
     if (this.loginForm.username === '') {