Skip to content

W
wx-boss
Commit 9c27c35a by 姜雷
Options

Merge branch 'develop' into test

parents 31a87a30 928195cc
Showing with 4 additions and 4 deletions
miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js
...@@ -44,7 +44,7 @@ Component({ ...@@ -44,7 +44,7 @@ Component({
count: 0, count: 0,
}, },
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 15,
dataList: [], dataList: [],
deviceType: 2, deviceType: 2,
}, },
...@@ -145,4 +145,4 @@ Component({ ...@@ -145,4 +145,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      this.fetchData();\n      this.refreshList();\n    },\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    totalAmount: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        console.log('totalAmount', newVal);\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: 10,\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"]} //# 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      this.fetchData();\n      this.refreshList();\n    },\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    totalAmount: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        console.log('totalAmount', newVal);\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 \ No newline at end of file
miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts
...@@ -43,7 +43,7 @@ Component({ ...@@ -43,7 +43,7 @@ Component({
count: 0, count: 0,
}, },
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 15,
dataList: [], dataList: [],
deviceType: 2, // （2：洗衣，3：饮水，4：吹风，5：洗浴） deviceType: 2, // （2：洗衣，3：饮水，4：吹风，5：洗浴）
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment