Merge branch 'develop' into test

fa497a27 · 姜雷 · 5819014f · 59f05187 · fa497a27 · fa497a27
Commit fa497a27 authored Jan 14, 2020 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

equipment.js miniprogram/pages/equipment/equipment.js +3 -3

equipment.ts miniprogram/pages/equipment/equipment.ts +2 -1

No files found.
--- a/miniprogram/pages/equipment/equipment.js
+++ b/miniprogram/pages/equipment/equipment.js
@@ -25,7 +25,7 @@ Page({
            wx.hideLoading();
            console.log(res);
            var _a = res.data, areaDeviceAmount = _a.areaDeviceAmount, statusAmount = _a.statusAmount, totalAmount = _a.totalAmount;
-            var total = totalAmount.reduce(function (count, item) { return count + item.value; }, 0);
+            var total = 12;
            _this.setData({
                areaDeviceAmount: areaDeviceAmount,
                statusAmount: statusAmount,
@@ -54,4 +54,4 @@ Page({
        });
    },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU0sWUFBQyxPQUFPO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkIsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkE0QkM7UUEzQkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBQ2pFLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUMsVUFBQyxLQUFLLEVBQUUsSUFBSSxJQUFLLE9BQUEsS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQWxCLENBQWtCLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDdkUsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixnQkFBZ0Isa0JBQUE7Z0JBQ2hCLFlBQVksY0FBQTtnQkFDWixXQUFXLGFBQUE7Z0JBQ1gsS0FBSyxPQUFBO2FBQ04sQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakIsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxTQUFTLENBQUM7Z0JBQ1gsS0FBSyxFQUFFLEdBQUcsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsRUFBRTtnQkFDaEMsSUFBSSxFQUFFLE1BQU07Z0JBQ1osUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxZQUFZLFlBQUMsQ0FBQztRQUNKLElBQUEscUNBQUssQ0FBNkI7UUFDMUMsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ1osR0FBRyxFQUFFLG1EQUFpRCxJQUFJLENBQUMsTUFBTSxrQkFBYSxJQUFJLENBQUMsUUFBVTtZQUM3RixPQUFPLEVBQUUsVUFBUyxHQUFHO2dCQUVuQixHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQywwQkFBMEIsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGV2aWNlRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9lcXVpcG1lbnQvZXF1aXBtZW50LmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIGNvbG9yczogWycjNjg5NWZlJywgJyNmZTY4NjgnLCAnIzZlZTE4ZicsICcjZmVhZTY4J10sXG4gICAgYXJlYURldmljZUFtb3VudDogW10sXG4gICAgc3RhdHVzQW1vdW50OiBbXSxcbiAgICB0b3RhbEFtb3VudDogW10sXG4gICAgdG90YWw6IDAsXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5Yqg6L29XG4gICAqL1xuICBvbkxvYWQob3B0aW9ucykge1xuICAgIGNvbnNvbGUubG9nKCdpbiBvbkxvYWQnKTtcbiAgICB0aGlzLmZldGNoTGlzdCgpO1xuICB9LFxuXG4gIGZldGNoTGlzdCgpIHtcbiAgICB3eC5zaG93TG9hZGluZyh7XG4gICAgICB0aXRsZTogJ+WKoOi9veS4rScsXG4gICAgfSk7XG4gICAgZGV2aWNlRmV0Y2goe1xuICAgICAgdXJsOiAnL2RldmljZS9yZXBvcnQvbWFpblBhZ2UnLFxuICAgIH0pXG4gICAgICAudGhlbihyZXMgPT4ge1xuICAgICAgICB3eC5oaWRlTG9hZGluZygpO1xuICAgICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgICBjb25zdCB7IGFyZWFEZXZpY2VBbW91bnQsIHN0YXR1c0Ftb3VudCwgdG90YWxBbW91bnQgfSA9IHJlcy5kYXRhO1xuICAgICAgICBsZXQgdG90YWwgPSB0b3RhbEFtb3VudC5yZWR1Y2UoKGNvdW50LCBpdGVtKSA9PiBjb3VudCArIGl0ZW0udmFsdWUsIDApO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBhcmVhRGV2aWNlQW1vdW50LFxuICAgICAgICAgIHN0YXR1c0Ftb3VudCxcbiAgICAgICAgICB0b3RhbEFtb3VudCxcbiAgICAgICAgICB0b3RhbCxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgICAgdGl0bGU6IGVyci5tc2cgfHwgZXJyLnRvU3RyaW5nKCksXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICAgIGR1cmF0aW9uOiA0MDAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBnb1JlcG9ydFBhZ2UoZSkge1xuICAgIGNvbnN0IHsgaW5kZXggfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGNvbnN0IGl0ZW0gPSB0aGlzLmRhdGEuYXJlYURldmljZUFtb3VudFtpbmRleF07XG4gICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICB1cmw6IGAvcGFnZXMvZXF1aXBtZW50UmVwb3J0L2VxdWlwbWVudFJlcG9ydD9hcmVhSWQ9JHtpdGVtLmFyZWFJZH0mYXJlYU5hbWU9JHtpdGVtLmFyZWFOYW1lfWAsXG4gICAgICBzdWNjZXNzOiBmdW5jdGlvbihyZXMpIHtcbiAgICAgICAgLy8g6YCa6L+HZXZlbnRDaGFubmVs5ZCR6KKr5omT5byA6aG16Z2i5Lyg6YCB5pWw5o2uXG4gICAgICAgIHJlcy5ldmVudENoYW5uZWwuZW1pdCgnYWNjZXB0RGF0YUZyb21PcGVuZXJQYWdlJywgeyBkYXRhOiBpdGVtIH0pO1xuICAgICAgfSxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7S0FDVDtJQUtELE1BQU0sWUFBQyxPQUFPO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkIsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkE2QkM7UUE1QkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBRWpFLElBQUksS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNmLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osZ0JBQWdCLGtCQUFBO2dCQUNoQixZQUFZLGNBQUE7Z0JBQ1osV0FBVyxhQUFBO2dCQUNYLEtBQUssT0FBQTthQUNOLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUU7Z0JBQ2hDLElBQUksRUFBRSxNQUFNO2dCQUNaLFFBQVEsRUFBRSxJQUFJO2FBQ2YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDSixJQUFBLHFDQUFLLENBQTZCO1FBQzFDLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSxtREFBaUQsSUFBSSxDQUFDLE1BQU0sa0JBQWEsSUFBSSxDQUFDLFFBQVU7WUFDN0YsT0FBTyxFQUFFLFVBQVMsR0FBRztnQkFFbkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNwRSxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRldmljZUZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50L2VxdWlwbWVudC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBjb2xvcnM6IFsnIzY4OTVmZScsICcjZmU2ODY4JywgJyM2ZWUxOGYnLCAnI2ZlYWU2OCddLFxuICAgIGFyZWFEZXZpY2VBbW91bnQ6IFtdLFxuICAgIHN0YXR1c0Ftb3VudDogW10sXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICAgIHRvdGFsOiAwLFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkKG9wdGlvbnMpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gb25Mb2FkJyk7XG4gICAgdGhpcy5mZXRjaExpc3QoKTtcbiAgfSxcblxuICBmZXRjaExpc3QoKSB7XG4gICAgd3guc2hvd0xvYWRpbmcoe1xuICAgICAgdGl0bGU6ICfliqDovb3kuK0nLFxuICAgIH0pO1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2UvcmVwb3J0L21haW5QYWdlJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgY29uc3QgeyBhcmVhRGV2aWNlQW1vdW50LCBzdGF0dXNBbW91bnQsIHRvdGFsQW1vdW50IH0gPSByZXMuZGF0YTtcbiAgICAgICAgLy8gbGV0IHRvdGFsID0gdG90YWxBbW91bnQucmVkdWNlKChjb3VudCwgaXRlbSkgPT4gY291bnQgKyBpdGVtLnZhbHVlLCAwKTtcbiAgICAgICAgbGV0IHRvdGFsID0gMTI7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIGFyZWFEZXZpY2VBbW91bnQsXG4gICAgICAgICAgc3RhdHVzQW1vdW50LFxuICAgICAgICAgIHRvdGFsQW1vdW50LFxuICAgICAgICAgIHRvdGFsLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLm1zZyB8fCBlcnIudG9TdHJpbmcoKSxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgICAgZHVyYXRpb246IDQwMDAsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
--- a/miniprogram/pages/equipment/equipment.ts
+++ b/miniprogram/pages/equipment/equipment.ts
@@ -32,7 +32,8 @@ Page({
        wx.hideLoading();
        console.log(res);
        const { areaDeviceAmount, statusAmount, totalAmount } = res.data;
-        let total = totalAmount.reduce((count, item) => count + item.value, 0);
+        // let total = totalAmount.reduce((count, item) => count + item.value, 0);
+        let total = 12;
        this.setData!({
          areaDeviceAmount,
          statusAmount,