Merge branch 'master' of https://gitee.com/js-yhsec/energy_storage

web/src/views/statisticalAnalysis.vue

@@ -18,7 +18,7 @@
         :title-option="{ title: '', info: '' }"
         @onSearch="onSearch"
       >
-        <template #stationSelect="item">
+        <template #stationSelect="">
           <a-select
             style="width: 200px"
             :dropdown-match-select-width="false"

web/src/views/sub/Home.vue

@@ -119,9 +119,9 @@ export default {
       this.getStatDayList(3)
     ]).then((r) => {
       if (
-        this.deviceInfo.energy.length &&
-        this.deviceInfo.charge.length &&
-        this.deviceInfo.pv.length
+        this.deviceInfo.energy &&
+        this.deviceInfo.charge &&
+        this.deviceInfo.pv
       ) {
         const newArr = this.mergedArray(
           this.deviceInfo.energy,