Skip to content

W
wx-boss
Commit 63bc7339 by 姜雷
Options

Merge branch 'develop' into test

parents 0fde1104 189926b3
Showing with 15 additions and 8 deletions
miniprogram/pages/equipment/equipment.js
...@@ -47,11 +47,14 @@ Page({ ...@@ -47,11 +47,14 @@ Page({
}, },
fetchWarningCount: function () { fetchWarningCount: function () {
var _this = this; var _this = this;
var data = app.globalData.userInfo.operateId === 3
? undefined
: {
operatorId: app.globalData.userInfo.operateId,
};
fetch_1.deviceFetch({ fetch_1.deviceFetch({
url: '/device/warning/count', url: '/device/warning/count',
data: { data: data,
operatorId: app.globalData.userInfo.operateId,
},
}) })
.then(function (res) { .then(function (res) {
_this.setData({ _this.setData({
...@@ -71,4 +74,4 @@ Page({ ...@@ -71,4 +74,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQU0sR0FBRyxHQUFHLE1BQU0sRUFBVSxDQUFDO0FBRzdCLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7UUFDUixZQUFZLEVBQUUsQ0FBQztLQUNoQjtJQUtELE1BQU07UUFDSixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkErQkM7UUE5QkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBQ2pFLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQzVCLFVBQUMsS0FBYSxFQUFFLElBQUksSUFBSyxPQUFBLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFsQixDQUFrQixFQUMzQyxDQUFDLENBQ0YsQ0FBQztZQUNGLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osZ0JBQWdCLGtCQUFBO2dCQUNoQixZQUFZLGNBQUE7Z0JBQ1osV0FBVyxhQUFBO2dCQUNYLEtBQUssT0FBQTthQUNOLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxNQUFNLElBQUksTUFBTTtnQkFDdEMsSUFBSSxFQUFFLE1BQU07Z0JBQ1osUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxpQkFBaUI7UUFBakIsaUJBYUM7UUFaQyxtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHVCQUF1QjtZQUM1QixJQUFJLEVBQUU7Z0JBQ0osVUFBVSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLFNBQVM7YUFDOUM7U0FDRixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osWUFBWSxFQUFFLEdBQUcsQ0FBQyxJQUFJO2FBQ3ZCLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUcsSUFBSyxDQUFDLENBQUMsQ0FBQztJQUN0QixDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDSixJQUFBLHFDQUFLLENBQTZCO1FBQzFDLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSxtREFBaUQsSUFBSSxDQUFDLE1BQU0sa0JBQWEsSUFBSSxDQUFDLFFBQVU7WUFDN0YsT0FBTyxFQUFFLFVBQVMsR0FBRztnQkFFbkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNwRSxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRldmljZUZldGNoIH0gZnJvbSAnLi4vLi4vYXBpL2ZldGNoJztcbmltcG9ydCB7IElNeUFwcCB9IGZyb20gJy4uLy4uL2FwcCc7XG5cbmNvbnN0IGFwcCA9IGdldEFwcDxJTXlBcHA+KCk7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2VxdWlwbWVudC9lcXVpcG1lbnQuanNcblBhZ2Uoe1xuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgY29sb3JzOiBbJyM2ODk1ZmUnLCAnI2ZlNjg2OCcsICcjNmVlMThmJywgJyNmZWFlNjgnXSxcbiAgICBhcmVhRGV2aWNlQW1vdW50OiBbXSxcbiAgICBzdGF0dXNBbW91bnQ6IFtdLFxuICAgIHRvdGFsQW1vdW50OiBbXSxcbiAgICB0b3RhbDogMCxcbiAgICB3YXJuaW5nQ291bnQ6IDAsXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5Yqg6L29XG4gICAqL1xuICBvbkxvYWQoKSB7XG4gICAgdGhpcy5mZXRjaExpc3QoKTtcbiAgICB0aGlzLmZldGNoV2FybmluZ0NvdW50KCk7XG4gIH0sXG5cbiAgZmV0Y2hMaXN0KCkge1xuICAgIHd4LnNob3dMb2FkaW5nKHtcbiAgICAgIHRpdGxlOiAn5Yqg6L295LitJyxcbiAgICB9KTtcbiAgICBkZXZpY2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGV2aWNlL3JlcG9ydC9tYWluUGFnZScsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKHJlcyk7XG4gICAgICAgIGNvbnN0IHsgYXJlYURldmljZUFtb3VudCwgc3RhdHVzQW1vdW50LCB0b3RhbEFtb3VudCB9ID0gcmVzLmRhdGE7XG4gICAgICAgIGxldCB0b3RhbCA9IHRvdGFsQW1vdW50LnJlZHVjZShcbiAgICAgICAgICAoY291bnQ6IE51bWJlciwgaXRlbSkgPT4gY291bnQgKyBpdGVtLnZhbHVlLFxuICAgICAgICAgIDAsXG4gICAgICAgICk7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIGFyZWFEZXZpY2VBbW91bnQsXG4gICAgICAgICAgc3RhdHVzQW1vdW50LFxuICAgICAgICAgIHRvdGFsQW1vdW50LFxuICAgICAgICAgIHRvdGFsLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLm1zZyB8fCBlcnIuZXJyTXNnIHx8ICfnvZHnu5zplJnor68nLFxuICAgICAgICAgIGljb246ICdub25lJyxcbiAgICAgICAgICBkdXJhdGlvbjogNDAwMCxcbiAgICAgICAgfSk7XG4gICAgICB9KTtcbiAgfSxcbiAgZmV0Y2hXYXJuaW5nQ291bnQoKSB7XG4gICAgZGV2aWNlRmV0Y2goe1xuICAgICAgdXJsOiAnL2RldmljZS93YXJuaW5nL2NvdW50JyxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgb3BlcmF0b3JJZDogYXBwLmdsb2JhbERhdGEudXNlckluZm8ub3BlcmF0ZUlkLFxuICAgICAgfSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgd2FybmluZ0NvdW50OiByZXMuZGF0YSxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7fSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0= //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXF1aXBtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXF1aXBtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQThDO0FBRzlDLElBQU0sR0FBRyxHQUFHLE1BQU0sRUFBVSxDQUFDO0FBRzdCLElBQUksQ0FBQztJQUlILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQztRQUNwRCxnQkFBZ0IsRUFBRSxFQUFFO1FBQ3BCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLFdBQVcsRUFBRSxFQUFFO1FBQ2YsS0FBSyxFQUFFLENBQUM7UUFDUixZQUFZLEVBQUUsQ0FBQztLQUNoQjtJQUtELE1BQU07UUFDSixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDakIsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELFNBQVM7UUFBVCxpQkErQkM7UUE5QkMsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNiLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDO1FBQ0gsbUJBQVcsQ0FBQztZQUNWLEdBQUcsRUFBRSx5QkFBeUI7U0FDL0IsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNYLElBQUEsYUFBMEQsRUFBeEQsc0NBQWdCLEVBQUUsOEJBQVksRUFBRSw0QkFBVyxDQUFjO1lBQ2pFLElBQUksS0FBSyxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQzVCLFVBQUMsS0FBYSxFQUFFLElBQUksSUFBSyxPQUFBLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFsQixDQUFrQixFQUMzQyxDQUFDLENBQ0YsQ0FBQztZQUNGLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osZ0JBQWdCLGtCQUFBO2dCQUNoQixZQUFZLGNBQUE7Z0JBQ1osV0FBVyxhQUFBO2dCQUNYLEtBQUssT0FBQTthQUNOLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2pCLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxNQUFNLElBQUksTUFBTTtnQkFDdEMsSUFBSSxFQUFFLE1BQU07Z0JBQ1osUUFBUSxFQUFFLElBQUk7YUFDZixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxpQkFBaUI7UUFBakIsaUJBaUJDO1FBaEJDLElBQUksSUFBSSxHQUNOLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLFNBQVMsS0FBSyxDQUFDO1lBQ3JDLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDO2dCQUNFLFVBQVUsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxTQUFTO2FBQzlDLENBQUM7UUFDUixtQkFBVyxDQUFDO1lBQ1YsR0FBRyxFQUFFLHVCQUF1QjtZQUM1QixJQUFJLEVBQUUsSUFBSTtTQUNYLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixZQUFZLEVBQUUsR0FBRyxDQUFDLElBQUk7YUFDdkIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRyxJQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3RCLENBQUM7SUFDRCxZQUFZLFlBQUMsQ0FBQztRQUNKLElBQUEscUNBQUssQ0FBNkI7UUFDMUMsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvQyxFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ1osR0FBRyxFQUFFLG1EQUFpRCxJQUFJLENBQUMsTUFBTSxrQkFBYSxJQUFJLENBQUMsUUFBVTtZQUM3RixPQUFPLEVBQUUsVUFBUyxHQUFHO2dCQUVuQixHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQywwQkFBMEIsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGV2aWNlRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuaW1wb3J0IHsgSU15QXBwIH0gZnJvbSAnLi4vLi4vYXBwJztcblxuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcblxuLy8gbWluaXByb2dyYW0vcGFnZXMvZXF1aXBtZW50L2VxdWlwbWVudC5qc1xuUGFnZSh7XG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICBjb2xvcnM6IFsnIzY4OTVmZScsICcjZmU2ODY4JywgJyM2ZWUxOGYnLCAnI2ZlYWU2OCddLFxuICAgIGFyZWFEZXZpY2VBbW91bnQ6IFtdLFxuICAgIHN0YXR1c0Ftb3VudDogW10sXG4gICAgdG90YWxBbW91bnQ6IFtdLFxuICAgIHRvdGFsOiAwLFxuICAgIHdhcm5pbmdDb3VudDogMCxcbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIG9uTG9hZCgpIHtcbiAgICB0aGlzLmZldGNoTGlzdCgpO1xuICAgIHRoaXMuZmV0Y2hXYXJuaW5nQ291bnQoKTtcbiAgfSxcblxuICBmZXRjaExpc3QoKSB7XG4gICAgd3guc2hvd0xvYWRpbmcoe1xuICAgICAgdGl0bGU6ICfliqDovb3kuK0nLFxuICAgIH0pO1xuICAgIGRldmljZUZldGNoKHtcbiAgICAgIHVybDogJy9kZXZpY2UvcmVwb3J0L21haW5QYWdlJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgY29uc3QgeyBhcmVhRGV2aWNlQW1vdW50LCBzdGF0dXNBbW91bnQsIHRvdGFsQW1vdW50IH0gPSByZXMuZGF0YTtcbiAgICAgICAgbGV0IHRvdGFsID0gdG90YWxBbW91bnQucmVkdWNlKFxuICAgICAgICAgIChjb3VudDogTnVtYmVyLCBpdGVtKSA9PiBjb3VudCArIGl0ZW0udmFsdWUsXG4gICAgICAgICAgMCxcbiAgICAgICAgKTtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgYXJlYURldmljZUFtb3VudCxcbiAgICAgICAgICBzdGF0dXNBbW91bnQsXG4gICAgICAgICAgdG90YWxBbW91bnQsXG4gICAgICAgICAgdG90YWwsXG4gICAgICAgIH0pO1xuICAgICAgfSlcbiAgICAgIC5jYXRjaChlcnIgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgICB3eC5oaWRlTG9hZGluZygpO1xuICAgICAgICB3eC5zaG93VG9hc3Qoe1xuICAgICAgICAgIHRpdGxlOiBlcnIubXNnIHx8IGVyci5lcnJNc2cgfHwgJ+e9kee7nOmUmeivrycsXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICAgIGR1cmF0aW9uOiA0MDAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBmZXRjaFdhcm5pbmdDb3VudCgpIHtcbiAgICBsZXQgZGF0YSA9XG4gICAgICBhcHAuZ2xvYmFsRGF0YS51c2VySW5mby5vcGVyYXRlSWQgPT09IDNcbiAgICAgICAgPyB1bmRlZmluZWRcbiAgICAgICAgOiB7XG4gICAgICAgICAgICBvcGVyYXRvcklkOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mby5vcGVyYXRlSWQsXG4gICAgICAgICAgfTtcbiAgICBkZXZpY2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGV2aWNlL3dhcm5pbmcvY291bnQnLFxuICAgICAgZGF0YTogZGF0YSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgd2FybmluZ0NvdW50OiByZXMuZGF0YSxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7fSk7XG4gIH0sXG4gIGdvUmVwb3J0UGFnZShlKSB7XG4gICAgY29uc3QgeyBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgaXRlbSA9IHRoaXMuZGF0YS5hcmVhRGV2aWNlQW1vdW50W2luZGV4XTtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogYC9wYWdlcy9lcXVpcG1lbnRSZXBvcnQvZXF1aXBtZW50UmVwb3J0P2FyZWFJZD0ke2l0ZW0uYXJlYUlkfSZhcmVhTmFtZT0ke2l0ZW0uYXJlYU5hbWV9YCxcbiAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9uKHJlcykge1xuICAgICAgICAvLyDpgJrov4dldmVudENoYW5uZWzlkJHooqvmiZPlvIDpobXpnaLkvKDpgIHmlbDmja5cbiAgICAgICAgcmVzLmV2ZW50Q2hhbm5lbC5lbWl0KCdhY2NlcHREYXRhRnJvbU9wZW5lclBhZ2UnLCB7IGRhdGE6IGl0ZW0gfSk7XG4gICAgICB9LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/pages/equipment/equipment.ts
...@@ -58,11 +58,15 @@ Page({ ...@@ -58,11 +58,15 @@ Page({
}); });
}, },
fetchWarningCount() { fetchWarningCount() {
let data =
app.globalData.userInfo.operateId === 3
? undefined
: {
operatorId: app.globalData.userInfo.operateId,
};
deviceFetch({ deviceFetch({
url: '/device/warning/count', url: '/device/warning/count',
data: { data: data,
operatorId: app.globalData.userInfo.operateId,
},
}) })
.then(res => { .then(res => {
this.setData!({ this.setData!({
......
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