Merge branch 'develop' into test

miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js

@@ -48,7 +48,7 @@ Component({
         pageNum: 1,
         pageSize: 15,
         dataList: [],
-        deviceType: 2,
+        deviceType: 3,
     },
     methods: {
         changeType: function (e) {
@@ -147,4 +147,4 @@ Component({
         },
     },
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EquipmentOperationDetails.js","sourceRoot":"","sources":["EquipmentOperationDetails.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../../api/fetch';\n\n// pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js\nComponent({\n  lifetimes: {\n    attached() {},\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    totalAmount: {\n      type: Array,\n      value: [],\n    },\n    areaId: {\n      type: Number,\n      value: 0,\n      observer() {\n        this.fetchData();\n        this.refreshList();\n      },\n    },\n  },\n\n  /**\n   * 组件的初始数据\n   */\n  data: {\n    sortTypeOptions: [\n      { value: 'desc', label: '降序' },\n      { value: 'asc', label: '升序' },\n    ],\n    sortTypeIndex: '0',\n    sortType: 'desc',\n    timeType: 0,\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    countData: {\n      title: '消费笔数',\n      numberType: 'count',\n      count: 0,\n    },\n    pageNum: 1,\n    pageSize: 15,\n    dataList: [],\n    deviceType: 2, // （2：洗衣，3：饮水，4：吹风，5：洗浴）\n  },\n\n  /**\n   * 组件的方法列表\n   */\n  methods: {\n    changeType(e) {\n      console.log(e);\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchData();\n      this.refreshList();\n    },\n    fetchData() {\n      statisticsFetch({\n        url: '/boss/device/operation/data/summary',\n        method: 'POST',\n        data: {\n          areaId: this.data.areaId,\n          timeType: this.data.timeType,\n        },\n      })\n        .then(res => {\n          console.log(res);\n          const { totalConsumeAmount, totalConsumeCount } = res.data;\n          this.setData({\n            'comsumerData.count': totalConsumeAmount,\n            'countData.count': totalConsumeCount,\n          });\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    fetchList(entity) {\n      return statisticsFetch({\n        url: '/boss/device/operation/data/detail/paging',\n        method: 'POST',\n        data: {\n          areaId: this.data.areaId,\n          timeType: this.data.timeType,\n          sortType: this.data.sortType,\n          deviceType: this.data.deviceType,\n          pageNum: this.data.pageNum,\n          pageSize: this.data.pageSize,\n          ...entity,\n        },\n      });\n    },\n    refreshList() {\n      this.fetchList({\n        pageNum: 1,\n      })\n        .then(res => {\n          const { list } = res.data;\n          this.setData({\n            pageNum: 1,\n            dataList: list,\n          });\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    getMoreListItem() {\n      this.fetchList({\n        pageNum: this.data.pageNum + 1,\n      })\n        .then(res => {\n          const { list } = res.data;\n          if (list && list.length) {\n            this.setData!({\n              dataList: [...this.data.dataList, ...list],\n              pageNum: this.data.pageNum + 1,\n            });\n          }\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    changeSortType(e) {\n      const { value } = e.detail;\n      let item = this.data.sortTypeOptions[value];\n      console.log(item);\n      this.setData({\n        sortTypeIndex: value,\n        sortType: item.label,\n      });\n      this.refreshList();\n    },\n    changeDeviceType(e) {\n      console.log(e);\n      const { devicetype } = e.currentTarget.dataset;\n      if (devicetype === this.data.deviceType) return;\n      this.setData({\n        deviceType: devicetype,\n      });\n      this.refreshList();\n    },\n  },\n});\n"]}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EquipmentOperationDetails.js","sourceRoot":"","sources":["EquipmentOperationDetails.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../../api/fetch';\n\n// pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js\nComponent({\n  lifetimes: {\n    attached() {},\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    totalAmount: {\n      type: Array,\n      value: [],\n    },\n    areaId: {\n      type: Number,\n      value: 0,\n      observer() {\n        this.fetchData();\n        this.refreshList();\n      },\n    },\n  },\n\n  /**\n   * 组件的初始数据\n   */\n  data: {\n    sortTypeOptions: [\n      { value: 'desc', label: '降序' },\n      { value: 'asc', label: '升序' },\n    ],\n    sortTypeIndex: '0',\n    sortType: 'desc',\n    timeType: 0,\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    countData: {\n      title: '消费笔数',\n      numberType: 'count',\n      count: 0,\n    },\n    pageNum: 1,\n    pageSize: 15,\n    dataList: [],\n    deviceType: 3, // （2：洗衣，3：饮水，4：吹风，5：洗浴）\n  },\n\n  /**\n   * 组件的方法列表\n   */\n  methods: {\n    changeType(e) {\n      console.log(e);\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchData();\n      this.refreshList();\n    },\n    fetchData() {\n      statisticsFetch({\n        url: '/boss/device/operation/data/summary',\n        method: 'POST',\n        data: {\n          areaId: this.data.areaId,\n          timeType: this.data.timeType,\n        },\n      })\n        .then(res => {\n          console.log(res);\n          const { totalConsumeAmount, totalConsumeCount } = res.data;\n          this.setData({\n            'comsumerData.count': totalConsumeAmount,\n            'countData.count': totalConsumeCount,\n          });\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    fetchList(entity) {\n      return statisticsFetch({\n        url: '/boss/device/operation/data/detail/paging',\n        method: 'POST',\n        data: {\n          areaId: this.data.areaId,\n          timeType: this.data.timeType,\n          sortType: this.data.sortType,\n          deviceType: this.data.deviceType,\n          pageNum: this.data.pageNum,\n          pageSize: this.data.pageSize,\n          ...entity,\n        },\n      });\n    },\n    refreshList() {\n      this.fetchList({\n        pageNum: 1,\n      })\n        .then(res => {\n          const { list } = res.data;\n          this.setData({\n            pageNum: 1,\n            dataList: list,\n          });\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    getMoreListItem() {\n      this.fetchList({\n        pageNum: this.data.pageNum + 1,\n      })\n        .then(res => {\n          const { list } = res.data;\n          if (list && list.length) {\n            this.setData!({\n              dataList: [...this.data.dataList, ...list],\n              pageNum: this.data.pageNum + 1,\n            });\n          }\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    changeSortType(e) {\n      const { value } = e.detail;\n      let item = this.data.sortTypeOptions[value];\n      console.log(item);\n      this.setData({\n        sortTypeIndex: value,\n        sortType: item.label,\n      });\n      this.refreshList();\n    },\n    changeDeviceType(e) {\n      console.log(e);\n      const { devicetype } = e.currentTarget.dataset;\n      if (devicetype === this.data.deviceType) return;\n      this.setData({\n        deviceType: devicetype,\n      });\n      this.refreshList();\n    },\n  },\n});\n"]}
\ No newline at end of file

miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts

@@ -47,7 +47,7 @@ Component({
     pageNum: 1,
     pageSize: 15,
     dataList: [],
-    deviceType: 2, // （2：洗衣，3：饮水，4：吹风，5：洗浴）
+    deviceType: 3, // （2：洗衣，3：饮水，4：吹风，5：洗浴）
   },
 
   /**

miniprogram/pages/equipmentReport/equipmentReport.js

@@ -25,13 +25,13 @@ Page({
         eventChannel.on('acceptDataFromOpenerPage', function (res) {
             console.log(res);
             _this.setData({
-                totalAmount: res.data.totalAmount.map(function (item) { return (__assign({}, item, { type: item.key === '饮水'
+                totalAmount: res.data.totalAmount.map(function (item) { return (__assign({}, item, { type: item.key === '洗衣'
                         ? 2
-                        : item.key === '吹风'
+                        : item.key === '饮水'
                             ? 3
-                            : item.key === '洗浴'
+                            : item.key === '吹风'
                                 ? 4
-                                : item.key === '洗衣'
+                                : item.key === '洗浴'
                                     ? 5
                                     : item.key })); }),
             });
@@ -89,4 +89,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50UmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50UmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSx5Q0FBK0Q7QUFHL0QsSUFBSSxDQUFDO0lBSUgsSUFBSSxFQUFFO1FBQ0osTUFBTSxFQUFFLElBQUk7UUFDWixRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxDQUFDO1FBQ1AsUUFBUSxFQUFFLENBQUM7UUFDWCxXQUFXLEVBQUUsRUFBRTtLQUNoQjtJQUtELE1BQU0sRUFBRSxVQUFTLE9BQU87UUFBaEIsaUJBMkJQO1FBMUJDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDYixJQUFBLHVCQUFNLEVBQUUsMkJBQVEsQ0FBYTtRQUNyQyxJQUFNLFlBQVksR0FBRyxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNsRCxZQUFZLENBQUMsRUFBRSxDQUFDLDBCQUEwQixFQUFFLFVBQUEsR0FBRztZQUM3QyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEtBQUksQ0FBQyxPQUFPLENBQUM7Z0JBQ1gsV0FBVyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFBLElBQUksSUFBSSxPQUFBLGNBQ3pDLElBQUksSUFDUCxJQUFJLEVBQ0YsSUFBSSxDQUFDLEdBQUcsS0FBSyxJQUFJO3dCQUNmLENBQUMsQ0FBQyxDQUFDO3dCQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7NEJBQ25CLENBQUMsQ0FBQyxDQUFDOzRCQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7Z0NBQ25CLENBQUMsQ0FBQyxDQUFDO2dDQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7b0NBQ25CLENBQUMsQ0FBQyxDQUFDO29DQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUNkLEVBWjRDLENBWTVDLENBQUM7YUFDSixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxPQUFRLENBQUM7WUFDWixNQUFNLFFBQUE7WUFDTixRQUFRLFVBQUE7U0FDVCxDQUFDLENBQUM7SUFFTCxDQUFDO0lBQ0QsaUJBQWlCO1FBQ2YsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSxtQ0FBbUM7U0FDekMsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELFVBQVUsWUFBQyxDQUFDO1FBQ0YsSUFBQSxtQ0FBSSxDQUE2QjtRQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLEVBQUUsQ0FBQyxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUFDLE1BQU0sQ0FBQztRQUNwQyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osSUFBSSxFQUFFLElBQUk7U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELGNBQWMsWUFBQyxDQUFDO1FBQ04sSUFBQSwyQ0FBUSxDQUE2QjtRQUM3QyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3RCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztZQUFDLE1BQU0sQ0FBQztRQUM1QyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osUUFBUSxVQUFBO1NBQ1QsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxTQUFTO1FBQ1AsdUJBQWUsQ0FBQztZQUNkLEdBQUcsRUFBRSxxQ0FBcUM7WUFDMUMsTUFBTSxFQUFFLE1BQU07WUFDZCxJQUFJLEVBQUU7Z0JBQ0osTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDeEIsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUTthQUM3QjtTQUNGLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXZpY2VGZXRjaCwgc3RhdGlzdGljc0ZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBhcmVhSWQ6IG51bGwsXG4gICAgYXJlYU5hbWU6ICcnLFxuICAgIHR5cGU6IDAsXG4gICAgdGltZVR5cGU6IDAsXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkOiBmdW5jdGlvbihvcHRpb25zKSB7XG4gICAgY29uc29sZS5sb2cob3B0aW9ucyk7XG4gICAgY29uc3QgeyBhcmVhSWQsIGFyZWFOYW1lIH0gPSBvcHRpb25zO1xuICAgIGNvbnN0IGV2ZW50Q2hhbm5lbCA9IHRoaXMuZ2V0T3BlbmVyRXZlbnRDaGFubmVsKCk7XG4gICAgZXZlbnRDaGFubmVsLm9uKCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCByZXMgPT4ge1xuICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIHRvdGFsQW1vdW50OiByZXMuZGF0YS50b3RhbEFtb3VudC5tYXAoaXRlbSA9PiAoe1xuICAgICAgICAgIC4uLml0ZW0sXG4gICAgICAgICAgdHlwZTpcbiAgICAgICAgICAgIGl0ZW0ua2V5ID09PSAn6aWu5rC0J1xuICAgICAgICAgICAgICA/IDJcbiAgICAgICAgICAgICAgOiBpdGVtLmtleSA9PT0gJ+WQuemjjidcbiAgICAgICAgICAgICAgPyAzXG4gICAgICAgICAgICAgIDogaXRlbS5rZXkgPT09ICfmtJfmtbQnXG4gICAgICAgICAgICAgID8gNFxuICAgICAgICAgICAgICA6IGl0ZW0ua2V5ID09PSAn5rSX6KGjJ1xuICAgICAgICAgICAgICA/IDVcbiAgICAgICAgICAgICAgOiBpdGVtLmtleSxcbiAgICAgICAgfSkpLFxuICAgICAgfSk7XG4gICAgfSk7XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICBhcmVhSWQsXG4gICAgICBhcmVhTmFtZSxcbiAgICB9KTtcbiAgICAvLyB0aGlzLmZldGNoV2FybmluZ0xldmVsKCk7XG4gIH0sXG4gIGZldGNoV2FybmluZ0xldmVsKCkge1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2Uvd2FybmluZy9kaWN0L3dhcm5pbmdMZXZlbCcsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgY2hhbmdlVHlwZShlKSB7XG4gICAgY29uc3QgeyB0eXBlIH0gPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICBjb25zb2xlLmxvZyh0eXBlKTtcbiAgICBpZiAodHlwZSA9PT0gdGhpcy5kYXRhLnR5cGUpIHJldHVybjtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHR5cGU6IHR5cGUsXG4gICAgfSk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9LFxuICBjaGFuZ2VUaW1lVHlwZShlKSB7XG4gICAgY29uc3QgeyB0aW1lVHlwZSB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc29sZS5sb2codGltZVR5cGUpO1xuICAgIGlmICh0aW1lVHlwZSA9PT0gdGhpcy5kYXRhLnRpbWVUeXBlKSByZXR1cm47XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICB0aW1lVHlwZSxcbiAgICB9KTtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH0sXG4gIGZldGNoRGF0YSgpIHtcbiAgICBzdGF0aXN0aWNzRmV0Y2goe1xuICAgICAgdXJsOiAnL2Jvc3MvZGV2aWNlL29wZXJhdGlvbi9kYXRhL3N1bW1hcnknLFxuICAgICAgbWV0aG9kOiAnUE9TVCcsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIGFyZWFJZDogdGhpcy5kYXRhLmFyZWFJZCxcbiAgICAgICAgdGltZVR5cGU6IHRoaXMuZGF0YS50aW1lVHlwZSxcbiAgICAgIH0sXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50UmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50UmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSx5Q0FBK0Q7QUFHL0QsSUFBSSxDQUFDO0lBSUgsSUFBSSxFQUFFO1FBQ0osTUFBTSxFQUFFLElBQUk7UUFDWixRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxDQUFDO1FBQ1AsUUFBUSxFQUFFLENBQUM7UUFDWCxXQUFXLEVBQUUsRUFBRTtLQUNoQjtJQUtELE1BQU0sRUFBRSxVQUFTLE9BQU87UUFBaEIsaUJBMkJQO1FBMUJDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDYixJQUFBLHVCQUFNLEVBQUUsMkJBQVEsQ0FBYTtRQUNyQyxJQUFNLFlBQVksR0FBRyxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUNsRCxZQUFZLENBQUMsRUFBRSxDQUFDLDBCQUEwQixFQUFFLFVBQUEsR0FBRztZQUM3QyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEtBQUksQ0FBQyxPQUFPLENBQUM7Z0JBQ1gsV0FBVyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFBLElBQUksSUFBSSxPQUFBLGNBQ3pDLElBQUksSUFDUCxJQUFJLEVBQ0YsSUFBSSxDQUFDLEdBQUcsS0FBSyxJQUFJO3dCQUNmLENBQUMsQ0FBQyxDQUFDO3dCQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7NEJBQ25CLENBQUMsQ0FBQyxDQUFDOzRCQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7Z0NBQ25CLENBQUMsQ0FBQyxDQUFDO2dDQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLElBQUk7b0NBQ25CLENBQUMsQ0FBQyxDQUFDO29DQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUNkLEVBWjRDLENBWTVDLENBQUM7YUFDSixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxPQUFRLENBQUM7WUFDWixNQUFNLFFBQUE7WUFDTixRQUFRLFVBQUE7U0FDVCxDQUFDLENBQUM7SUFFTCxDQUFDO0lBQ0QsaUJBQWlCO1FBQ2YsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSxtQ0FBbUM7U0FDekMsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELFVBQVUsWUFBQyxDQUFDO1FBQ0YsSUFBQSxtQ0FBSSxDQUE2QjtRQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLEVBQUUsQ0FBQyxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUFDLE1BQU0sQ0FBQztRQUNwQyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osSUFBSSxFQUFFLElBQUk7U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELGNBQWMsWUFBQyxDQUFDO1FBQ04sSUFBQSwyQ0FBUSxDQUE2QjtRQUM3QyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3RCLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztZQUFDLE1BQU0sQ0FBQztRQUM1QyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osUUFBUSxVQUFBO1NBQ1QsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxTQUFTO1FBQ1AsdUJBQWUsQ0FBQztZQUNkLEdBQUcsRUFBRSxxQ0FBcUM7WUFDMUMsTUFBTSxFQUFFLE1BQU07WUFDZCxJQUFJLEVBQUU7Z0JBQ0osTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDeEIsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUTthQUM3QjtTQUNGLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZXZpY2VGZXRjaCwgc3RhdGlzdGljc0ZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBhcmVhSWQ6IG51bGwsXG4gICAgYXJlYU5hbWU6ICcnLFxuICAgIHR5cGU6IDAsXG4gICAgdGltZVR5cGU6IDAsXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkOiBmdW5jdGlvbihvcHRpb25zKSB7XG4gICAgY29uc29sZS5sb2cob3B0aW9ucyk7XG4gICAgY29uc3QgeyBhcmVhSWQsIGFyZWFOYW1lIH0gPSBvcHRpb25zO1xuICAgIGNvbnN0IGV2ZW50Q2hhbm5lbCA9IHRoaXMuZ2V0T3BlbmVyRXZlbnRDaGFubmVsKCk7XG4gICAgZXZlbnRDaGFubmVsLm9uKCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCByZXMgPT4ge1xuICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIHRvdGFsQW1vdW50OiByZXMuZGF0YS50b3RhbEFtb3VudC5tYXAoaXRlbSA9PiAoe1xuICAgICAgICAgIC4uLml0ZW0sXG4gICAgICAgICAgdHlwZTpcbiAgICAgICAgICAgIGl0ZW0ua2V5ID09PSAn5rSX6KGjJ1xuICAgICAgICAgICAgICA/IDJcbiAgICAgICAgICAgICAgOiBpdGVtLmtleSA9PT0gJ+mlruawtCdcbiAgICAgICAgICAgICAgPyAzXG4gICAgICAgICAgICAgIDogaXRlbS5rZXkgPT09ICflkLnpo44nXG4gICAgICAgICAgICAgID8gNFxuICAgICAgICAgICAgICA6IGl0ZW0ua2V5ID09PSAn5rSX5rW0J1xuICAgICAgICAgICAgICA/IDVcbiAgICAgICAgICAgICAgOiBpdGVtLmtleSxcbiAgICAgICAgfSkpLFxuICAgICAgfSk7XG4gICAgfSk7XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICBhcmVhSWQsXG4gICAgICBhcmVhTmFtZSxcbiAgICB9KTtcbiAgICAvLyB0aGlzLmZldGNoV2FybmluZ0xldmVsKCk7XG4gIH0sXG4gIGZldGNoV2FybmluZ0xldmVsKCkge1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2Uvd2FybmluZy9kaWN0L3dhcm5pbmdMZXZlbCcsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgY2hhbmdlVHlwZShlKSB7XG4gICAgY29uc3QgeyB0eXBlIH0gPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICBjb25zb2xlLmxvZyh0eXBlKTtcbiAgICBpZiAodHlwZSA9PT0gdGhpcy5kYXRhLnR5cGUpIHJldHVybjtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHR5cGU6IHR5cGUsXG4gICAgfSk7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9LFxuICBjaGFuZ2VUaW1lVHlwZShlKSB7XG4gICAgY29uc3QgeyB0aW1lVHlwZSB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc29sZS5sb2codGltZVR5cGUpO1xuICAgIGlmICh0aW1lVHlwZSA9PT0gdGhpcy5kYXRhLnRpbWVUeXBlKSByZXR1cm47XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICB0aW1lVHlwZSxcbiAgICB9KTtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH0sXG4gIGZldGNoRGF0YSgpIHtcbiAgICBzdGF0aXN0aWNzRmV0Y2goe1xuICAgICAgdXJsOiAnL2Jvc3MvZGV2aWNlL29wZXJhdGlvbi9kYXRhL3N1bW1hcnknLFxuICAgICAgbWV0aG9kOiAnUE9TVCcsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIGFyZWFJZDogdGhpcy5kYXRhLmFyZWFJZCxcbiAgICAgICAgdGltZVR5cGU6IHRoaXMuZGF0YS50aW1lVHlwZSxcbiAgICAgIH0sXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file

miniprogram/pages/equipmentReport/equipmentReport.ts

@@ -26,13 +26,13 @@ Page({
         totalAmount: res.data.totalAmount.map(item => ({
           ...item,
           type:
-            item.key === '饮水'
+            item.key === '洗衣'
               ? 2
-              : item.key === '吹风'
+              : item.key === '饮水'
               ? 3
-              : item.key === '洗浴'
+              : item.key === '吹风'
               ? 4
-              : item.key === '洗衣'
+              : item.key === '洗浴'
               ? 5
               : item.key,
         })),