add

Strides-APP/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
 
-def myVersionName = "0.2.0 Alpha" //★★★★★版本号★★★★★
+def myVersionName = "0.3.1 Alpha" //★★★★★版本号★★★★★
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Tue Dec 27 17:46:25 CST 2022
-VERSION_CODE=63
+#Tue Dec 27 18:13:18 CST 2022
+VERSION_CODE=65

Strides-APP/app.json

@@ -2,7 +2,7 @@
   "name": "JuicePlus",
   "displayName": "ChargEco",
   "versionCode": 60,
-  "versionName": "V0.2.0 Alpha",
+  "versionName": "V0.3.1 Alpha",
   "product": false,
-  "debug": true
+  "debug": false
 }

Strides-APP/app/pages/home/Home.js

@@ -204,6 +204,11 @@ export default class HomePage extends Component {
     this.getStationList();
   }
 
+  /**
+   * 获取所有充电桩
+   * @param {Location} region 当前位置
+   * @param {boolean} first 是否初始化
+   */
   getStationList(region, first) {
     Dialog.showProgressDialog('Loading...');
     apiStation.getAllStation(this.filter).then(res => {
@@ -223,9 +228,7 @@ export default class HomePage extends Component {
             siteType: item.siteType,
             latitude: item.locationLatitude,
             longitude: item.locationLongitude,
-            /*latitude: item.locationLatitude,
-            longitude: item.locationLongitude,
-            acConnector: item.acConnector,
+            /*acConnector: item.acConnector,
             allConnector: item.allConnector,
             dcConnector: item.dcConnector,
             distance: utils.getDistance(item.distance)*/

Strides-Admin/src/http/api/site.js

@@ -45,6 +45,12 @@ const site = {
   getChargingProfiles() {
     return get(MODULE_NAME+ '/getChargingProfiles')
   },
+  getBalancingChargingProfiles(params) {
+    return get(MODULE_NAME+ '/getLoadBalancingChargingProfiles', params)
+  },
+  getBalancingOptions() {
+    return get(MODULE_NAME+ '/getLoadBalancingList')
+  },
   deleteChargingProfile(id) {
     return get(MODULE_NAME+ '/delSiteChargingProfile', {siteChargingProfileId: id})
   }

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

@@ -51,6 +51,10 @@
               <span>Unavailable</span>
               <label>{{stationsData.unAvailable ? stationsData.unAvailable : 0}}</label>
             </div>
+            <div class="total-list-item mini">
+              <span>Finishing</span>
+              <label>{{stationsData.finishing ? stationsData.finishing : 0}}</label>
+            </div>
           </div>
         </div>
       </div>
@@ -384,7 +388,7 @@
     content: " ";
     border-radius: 10px;
     position: absolute;
-    background-image: linear-gradient(to right, #001489, #FFFAE8);
+    background-image: linear-gradient(to right, #F3B901, #FFFAE8);
   }
   .total-power {
     color: #3179E4;
@@ -406,7 +410,7 @@
   .total-list-item {
     display: flex;
     padding: 6px;
-    line-height: 21px;
+    line-height: 22px;
     align-items: center;
     justify-content: space-between;
   }
@@ -422,6 +426,7 @@
     font-size: 15px;
   }
   .total-list-item.mini {
+    padding: 4px 6px;
     line-height: 14px;
   }
   .total-list-item.mini span {

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

@@ -390,21 +390,18 @@
         <div class="section-title">
           LOAD BALANCING
         </div>
-        <el-row
+        <Balancing v-model="balancingForm"/>
+        <!-- <el-row
           :gutter="20"
-          v-for="(item, index) in siteForm.siteChargingProfiles"
-          :key="index"
-        >
+          v-for="(item, index) in balancingForm.siteChargingProfiles"
+          :key="index">
           <el-col :span="6" :offset="0">
             <el-form-item
               label="Chargers In-Use:"
               label-width="150px">
-              <!--:prop="'siteChargingProfiles.' + index + '.boxInUse'"
-              :rules="rules.siteChargingProfiles.boxInUse"
-            -->
               <el-select v-model="item.boxInUse">
                 <el-option
-                  v-for="(item,index) in boxUseOptions"
+                  v-for="(item,index) in [1,2]"
                   :key="index"
                   :label="item"
                   :value="item"
@@ -416,9 +413,6 @@
             <el-form-item
               label="Charging Profile:"
               label-width="150px">
-              <!--:prop="'siteChargingProfiles.' + index + '.chargingProfilePk'"
-              :rules="rules.siteChargingProfiles.chargingProfilePk"
-            -->
               <el-select v-model="item.chargingProfilePk" filterable>
                 <el-option
                   v-for="(item,index) in chargingProfileOPtions"
@@ -436,13 +430,13 @@
               src="../../assets/form-list-sub.png"
             />
             <img
-              v-if="siteForm.siteChargingProfiles.length - 1 === index"
+              v-if="balancingForm.siteChargingProfiles.length - 1 === index"
               class="list-item-icon"
               @click="handleAddSiteChargingProfiles"
               src="../../assets/form-list-add.png"
             />
           </el-col>
-        </el-row>
+        </el-row> -->
       </div>
       <div v-if="enableFleetWhiteList()">
         <div class="sparator"></div>
@@ -605,6 +599,7 @@
 </template>
 
 <script>
+import Balancing from './components/Balancing'
 import Reservation from './components/Reservation'
 import waves from '@/directive/waves' // waves directive
 import site from '../../http/api/site'
@@ -613,15 +608,15 @@ import { fetchFleetCompanyOptions } from '@/http/api/driver'
 export default {
   name: 'AddSite',
   directives: { waves },
-  components: { Reservation },
+  components: { Balancing, Reservation },
   async created() {
     this.pageLoading = true;
     this.getChargeTypeOptions()
     this.getRateTypeOptions()
     this.getSiteTypeOptions()
     this.getCountryOptions()
-    this.getCompanyOptions()
-    await this.getChargingProfileOPtions()
+    await this.getCompanyOptions()
+    //this.getChargingProfileOPtions()
     this.pageLoading = false;
   },
   data() {
@@ -633,7 +628,7 @@ export default {
       countryOptions: [],
       companyOptions: [],
       chargingProfileOPtions: [],
-      boxUseOptions: [1,2,3,4,5,6,7,8,9,10],
+      
       siteTypeTable: [{
         siteType: "",
         allDay: false,
@@ -644,7 +639,14 @@ export default {
         minRows: 3,
         maxRows: 6,
       },
-
+      balancingForm: {
+        loadBalancing: 'dynamic',
+        staticMaxAmpere: 0,
+        siteChargingProfiles: [{
+          boxInUse: '',
+          chargingProfilePk: ''
+        }],
+      },
       siteForm: {
         specialChargeRates: [
           {
@@ -654,19 +656,12 @@ export default {
             rateType: '',
           }
         ],
-        siteChargingProfiles: [
-          {
-            boxInUse: '',
-            chargingProfilePk: ''
-          }
-        ],
         siteInformation: {
           siteName: '',
           latitude: '',
           longitude: '',
           type: '',
         },
-
         additionalInformation: {
           operatingHours: '',
           parkingFee: '',
@@ -896,18 +891,6 @@ export default {
         )
       }
     },
-    handelSubSiteChargingProfiles(index) {
-      this.siteForm.siteChargingProfiles.splice(index, 1)
-      if (this.siteForm.siteChargingProfiles.length === 0) {
-        this.handleAddSiteChargingProfiles()
-      }
-    },
-    handleAddSiteChargingProfiles() {
-      this.siteForm.siteChargingProfiles.push({
-        boxInUse: '',
-        chargingProfilePk: ''
-      })
-    },
     reservationTimeLimitEnable(enable) {
       this.siteForm.reservation.enable = enable
     },
@@ -1108,7 +1091,7 @@ export default {
         })
       }
 
-      this.siteForm.siteChargingProfiles.forEach(item => {
+      this.balancingForm.siteChargingProfiles.forEach(item => {
         if (item.boxInUse && item.chargingProfilePk)
           chargeProfiles.push(item)
       })
@@ -1158,6 +1141,8 @@ export default {
         operatingHours,
         parkingFee,
         additionalNotes,
+        loadBalancing: this.balancingForm.loadBalancing,
+        staticMaxAmpere: this.balancingForm.staticMaxAmpere,
         ...this.siteForm.idle
       };
 

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

@@ -0,0 +1,280 @@
+<template>
+  <div class="vbe-balancing">
+    <el-row :gutter="20">
+      <el-col :sm="24">
+        <el-form-item
+          label="Load Balancing Type:"
+          label-width="160px">
+          <el-select
+            style="max-width: 150px;"
+            v-model="balancingForm.loadBalancing"
+            @change="changeBalance">
+            <el-option
+              v-for="(item,index) in balancingTypes"
+              :key="index"
+              :label="item"
+              :value="item"/>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" v-if="balancingForm.loadBalancing == 'static'">
+      <el-col :sm="24">
+        <el-form-item
+          label="Max Current At Site:"
+          label-width="160px">
+          <el-input
+            style="max-width: 100px;"
+            v-model.number="balancingForm.staticMaxAmpere"
+            maxlength="5"
+            @change="changeAmpere"/>
+          <span class="text-unit">A</span>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row
+      :gutter="30"
+      v-for="(item, index) in balancingForm.siteChargingProfiles"
+      :key="index">
+      <el-col :sm="8" :md="7" :lg="6">
+        <el-form-item
+          label="Chargers In-Use:"
+          label-width="130px">
+          <el-select
+            v-model="item.boxInUse"
+            @change="changeInUse(index)">
+            <el-option
+              v-for="(item, idx) in boxUseOptions"
+              :key="idx"
+              :label="item"
+              :value="item"/>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :sm="10" :md="9" :lg="8">
+        <el-form-item
+          label="Charging Profile:"
+          label-width="130px">
+          <el-select 
+            v-model="item.chargingProfilePk"
+            v-if="balancingForm.loadBalancing == 'static'"
+            filterable
+            v-loading="balancingPrifileList[index].loading">
+            <el-option
+              v-for="(item,idx) in balancingPrifileList[index].options"
+              :key="idx"
+              :label="item.description"
+              :value="item.chargingProfilePk"/>
+          </el-select>
+          <el-select
+            v-model="item.chargingProfilePk"
+            v-else
+            filterable>
+            <el-option
+              v-for="(item,idx) in chargingProfileOptions"
+              :key="idx"
+              :label="item.description"
+              :value="item.chargingProfilePk"/>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :sm="6" :md="5" :lg="4">
+        <img
+          class="list-item-icon"
+          @click="handelSubSiteChargingProfiles(index)"
+          src="../../../assets/form-list-sub.png"/>
+        <img
+          v-if="balancingForm.siteChargingProfiles.length - 1 === index"
+          class="list-item-icon"
+          @click="handleAddSiteChargingProfiles"
+          src="../../../assets/form-list-add.png"/>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import site from '../../../http/api/site'
+export default {
+  name: "Balancing",
+  props: {
+    value: {
+      type: Object,
+      default: {
+        loadBalancing: 'dynamic',
+        staticMaxAmpere: 0,
+        siteChargingProfiles: []
+      },
+      required: true
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  data() {
+    return {
+      balancingTypes: [],
+      boxUseOptions: [1,2,3,4,5,6,7,8,9,10],
+      chargingProfileOptions: [],
+      balancingPrifileList: [{
+        loading: false,
+        options: []
+      }],
+      balancingForm: {
+        loadBalancing: 'dynamic',
+        staticMaxAmpere: 0,
+        siteChargingProfiles: [{
+          boxInUse: '',
+          chargingProfilePk: ''
+        }]
+      },
+      oldConfig: {
+        dynamic: [],
+        static: []
+      }
+    }
+  },
+  mounted() {
+    this.balancingForm = this.value
+    this.getBalancingTypeOptions()
+    this.getChargingProfileOptions()
+  },
+  methods: {
+    onChange() {
+      //console.log(event);
+      this.$emit('change', this.balancingForm);
+    },
+    /**
+     * 切换均衡类型
+     */
+    changeBalance() {
+      let list = [];
+      if (this.balancingForm.loadBalancing == "dynamic") {
+        this.oldConfig.static = [...this.balancingForm.siteChargingProfiles];
+        list = this.oldConfig.dynamic;
+      } else {
+        this.oldConfig.dynamic = [...this.balancingForm.siteChargingProfiles];
+        list = this.oldConfig.static
+      }
+      if (list.length > 0) {
+        this.balancingForm.siteChargingProfiles = list;
+      } else {
+        this.balancingPrifileList = [];
+        this.balancingForm.staticMaxAmpere = 0;
+        this.balancingForm.siteChargingProfiles = [];
+        this.handleAddSiteChargingProfiles()
+      }
+    },
+    /**
+     * 改变最大电流输入值
+     */
+    changeAmpere() {
+      if (this.balancingForm.staticMaxAmpere == "" || typeof this.balancingForm.staticMaxAmpere == 'string') {
+        this.balancingForm.staticMaxAmpere = 0;
+      }
+      this.getAllBalancingChargingProfiles(true)
+      /*this.balancingForm.siteChargingProfiles = [];
+      this.handleAddSiteChargingProfiles()*/
+    },
+    /**
+     * 改变InUse下拉框
+     * @param {Object} index ChargeProfile项目索引
+     */
+    changeInUse(index) {
+      if (this.balancingForm.loadBalancing == 'static') {
+        this.balancingForm.siteChargingProfiles[index].chargingProfilePk = "";
+        this.getBalancingChargingProfiles(index)
+      }
+    },
+    /**
+     * 获取均衡类型选项
+     */
+    getBalancingTypeOptions() {
+      site.getBalancingOptions().then(({ data }) => {
+        this.balancingTypes = data
+      })
+    },
+    /**
+     * 获取充电配置选项
+     */
+    getChargingProfileOptions() {
+      site.getChargingProfiles().then(({ data }) => {
+        this.chargingProfileOptions = data
+      })
+    },
+    /**
+     * 遍历获取均衡充电配置选项
+     * @param {Object} clear 是否清除之前的选项
+     */
+    getAllBalancingChargingProfiles(clear) {
+      this.balancingPrifileList.forEach((item, index) => {
+        if (clear) {
+          this.balancingForm.siteChargingProfiles[index].chargingProfilePk = ""
+        }
+        if (clear || item.options.length == 0) {
+          this.getBalancingChargingProfiles(index)
+        }
+      })
+    },
+    /**
+     * 动态获取均衡充电配置选项
+     */
+    getBalancingChargingProfiles(index) {
+      if (this.balancingForm.siteChargingProfiles[index].boxInUse && this.balancingForm.staticMaxAmpere > 0) {
+        this.balancingPrifileList[index].loading = true;
+        site.getBalancingChargingProfiles({
+          inUse: this.balancingForm.siteChargingProfiles[index].boxInUse,
+          loadBalancing: this.balancingForm.loadBalancing,
+          staticMaxAmpere: this.balancingForm.staticMaxAmpere
+        }).then(({ data }) => {
+          this.balancingPrifileList[index].options = data
+        }).finally(() => {
+          this.balancingPrifileList[index].loading = false
+        })
+      }
+    },
+    handelSubSiteChargingProfiles(index) {
+      this.balancingForm.siteChargingProfiles.splice(index, 1)
+      this.balancingPrifileList.splice(index, 1)
+      if (this.balancingForm.siteChargingProfiles.length === 0) {
+        this.handleAddSiteChargingProfiles()
+      } else {
+        //this.onChange();
+      }
+    },
+    handleAddSiteChargingProfiles() {
+      this.balancingForm.siteChargingProfiles.push({
+        boxInUse: '',
+        chargingProfilePk: ''
+      })
+      if (this.balancingForm.loadBalancing == 'static') {
+        this.balancingPrifileList.push({
+          options: [],
+          loading: false
+        })
+        this.getAllBalancingChargingProfiles()
+      }
+      //this.onChange();
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  .vbe-balancing {
+    .list-item-icon {
+      width: 30px;
+      height: 30px;
+      cursor: pointer;
+      margin: 5px 10px 22px;
+    }
+    .el-input {
+      min-width: 60px;
+    }
+    .text-unit {
+      font-size: 14px;
+      margin-left: 10px;
+    }
+  }
+</style>