Merge branch 'develop' into test

miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts

@@ -3,10 +3,7 @@ import { statisticsFetch } from '../../../api/fetch';
 // pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js
 Component({
   lifetimes: {
-    attached() {
-      this.fetchData();
-      this.refreshList();
-    },
+    attached() {},
   },
   /**
    * 组件的属性列表
@@ -15,8 +12,13 @@ Component({
     totalAmount: {
       type: Array,
       value: [],
-      observer(newVal) {
-        console.log('totalAmount', newVal);
+    },
+    areaId: {
+      type: Number,
+      value: 0,
+      observer() {
+        this.fetchData();
+        this.refreshList();
       },
     },
   },

miniprogram/pages/equipmentReport/equipmentReport.wxml

@@ -16,7 +16,7 @@
     </view>
   </view>
   <view class="equipmentReport-content">
-    <equipment-operation-details wx:if="{{type === 0}}" timeType="{{timeType}}" totalAmount="{{totalAmount}}" />
+    <equipment-operation-details wx:if="{{type === 0}}" timeType="{{timeType}}" totalAmount="{{totalAmount}}" areaId="{{areaId}}" />
     <equipment-state wx:if="{{type === 1}}" areaId="{{areaId}}" />
     <equipment-warning wx:if="{{type === 2}}" areaId="{{areaId}}" />
   </view>