Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/api/api.js

@@ -118,3 +118,9 @@ export const getFeeTypes = () => {
 export const getTableList = (data) => {
   return get('/api/butler/actualReceipt/stats', data)
 }
+
+// =======收费总览========
+// 收费总览表格列表数据
+export const getFeeOverviewList = (data) => {
+  return get('/api/butler/feeOverview/stats', data)
+}

wuye-manager-uniapp/api/request.js

@@ -11,6 +11,7 @@ export default function request(url, data = {}, method = 'GET') {
       url: baseUrl + url,
       data: data,
       method: method,
+      timeout: 15000,
       header: {
         Authorization: 'Bearer ' + (uni.getStorageSync('token') || ''),
         clientid: 'butler',

wuye-manager-uniapp/api/statisticsApi.js

@@ -0,0 +1,34 @@
+import request, {
+  get,
+  post,
+  upload
+} from './request.js'
+
+
+
+// =======收费统计========
+
+// 管理面积/服务户数
+export const getManagedArea = data => {
+  return get('/api/butler/feeOverview/overview', data)
+}
+// 入住率/出租率
+export const getRate = data => {
+  return get('/api/butler/feeOverview/rate', data)
+}
+// 收费总览
+export const getFeeSummary = data => {
+  return get('/api/butler/feeOverview/summary', data)
+}
+// 车位收费总览
+export const getParkingFee = data => {
+  return get('/api/butler/feeOverview/parking', data)
+}
+// 押金余额统计
+export const getDepositBalance = data => {
+  return get('/api/butler/feeOverview/depositBalance', data)
+}
+// 巡检总览
+export const getInspection = data => {
+  return get('/api/butler/feeOverview/inspection', data)
+}