同步6/16
This commit is contained in:
@@ -1,38 +1,26 @@
|
||||
export interface ActivityVO {
|
||||
/**
|
||||
* 活动管理表id
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
title: string;
|
||||
|
||||
/**
|
||||
* 作者
|
||||
*/
|
||||
author: string;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
content: string;
|
||||
|
||||
/**
|
||||
* 发布状态 0未发布 1已发布
|
||||
*/
|
||||
status: string;
|
||||
|
||||
/**
|
||||
* 浏览量
|
||||
*/
|
||||
pageViews: number;
|
||||
|
||||
/**
|
||||
* 创建者姓名
|
||||
*/
|
||||
createName: string;
|
||||
'id': string;
|
||||
'villageId': string;
|
||||
'title': string;
|
||||
'author': string;
|
||||
'content': string;
|
||||
'status': string;
|
||||
'pageViews': number;
|
||||
'createName': string;
|
||||
'coverImage': string;
|
||||
'startTime': string;
|
||||
'endTime': string;
|
||||
'applyDeadline': string;
|
||||
'signinStartTime': string;
|
||||
'signinEndTime': string;
|
||||
'address': string;
|
||||
'quota': number;
|
||||
'appliedCount': number;
|
||||
'organizer': string;
|
||||
'contactName': string;
|
||||
'contactPhone': string;
|
||||
'pointsReward': number;
|
||||
'requirements': string;
|
||||
}
|
||||
|
||||
export interface ActivityForm extends BaseEntity {
|
||||
|
||||
@@ -48,6 +48,8 @@ export interface ComplaintVO {
|
||||
* 处理描述
|
||||
*/
|
||||
handleContent: string;
|
||||
|
||||
problemImageUrl: string;
|
||||
}
|
||||
|
||||
export interface ComplaintForm extends BaseEntity {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { HandleLogVO, HandleLogForm, HandleLogQuery } from '@/api/system/HandleLog/type';
|
||||
import { UploadFiles, UploadUserFile } from 'element-plus';
|
||||
|
||||
/**
|
||||
* 查询办事记录列表
|
||||
@@ -61,3 +62,10 @@ export const delHandleLog = (id: string | number | Array<string | number>) => {
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
export const uploadAttachments = (files: FormData) => {
|
||||
return request({
|
||||
url: '/handleLog/uploadAttachments',
|
||||
method: 'post',
|
||||
data: files
|
||||
});
|
||||
};
|
||||
|
||||
@@ -28,6 +28,28 @@ export interface HandleLogVO {
|
||||
* 办事地点
|
||||
*/
|
||||
handlePosition: string;
|
||||
|
||||
handleLogFileList: FileVO[];
|
||||
}
|
||||
|
||||
export interface FileVO {
|
||||
/**
|
||||
* 文件id
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 文件名
|
||||
*/
|
||||
fileName: string;
|
||||
|
||||
/**
|
||||
* 文件路径
|
||||
*/
|
||||
filePath: string;
|
||||
|
||||
'handleLogId': string;
|
||||
'ossId': string;
|
||||
}
|
||||
|
||||
export interface HandleLogForm extends BaseEntity {
|
||||
|
||||
@@ -8,7 +8,7 @@ import { PlanVO, PlanForm, PlanQuery } from '@/api/system/InspectionPlan/type';
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listPlan = (query?: PlanQuery): AxiosPromise<PlanVO[]> => {
|
||||
export const listPlan = (query: PlanQuery | {} = {}): AxiosPromise<PlanVO[]> => {
|
||||
return request({
|
||||
url: '/inspection/plan/list',
|
||||
method: 'get',
|
||||
|
||||
@@ -32,7 +32,7 @@ export interface PlanVO {
|
||||
/**
|
||||
* 巡检设置:0-必须拍照,1-可以跳检
|
||||
*/
|
||||
inspectSetting: string;
|
||||
inspectSetting: number;
|
||||
|
||||
/**
|
||||
* 计划路线,多个用逗号分隔
|
||||
@@ -106,7 +106,7 @@ export interface PlanForm extends BaseEntity {
|
||||
/**
|
||||
* 巡检设置:0-必须拍照,1-可以跳检
|
||||
*/
|
||||
inspectSetting?: string;
|
||||
inspectSetting?: number;
|
||||
|
||||
/**
|
||||
* 计划路线,多个用逗号分隔
|
||||
|
||||
@@ -8,7 +8,7 @@ import { PointVO, PointForm, PointQuery } from '@/api/system/InspectionPoint/typ
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listPoint = (query?: PointQuery): AxiosPromise<PointVO[]> => {
|
||||
export const listPoint = (query?: PointQuery | {}): AxiosPromise<PointVO[]> => {
|
||||
return request({
|
||||
url: '/inspection/point/list',
|
||||
method: 'get',
|
||||
|
||||
@@ -20,10 +20,13 @@ export const listRecord = (query?: RecordQuery): AxiosPromise<RecordVO[]> => {
|
||||
* 查询巡检记录主详细
|
||||
* @param id
|
||||
*/
|
||||
export const getRecord = (id: string | number): AxiosPromise<RecordVO> => {
|
||||
export const getRecord = (id: string, date?: string): AxiosPromise<RecordVO> => {
|
||||
return request({
|
||||
url: '/inspection/record/' + id,
|
||||
method: 'get'
|
||||
method: 'get',
|
||||
params: {
|
||||
date
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ export interface RecordVO {
|
||||
actualStartTime?: string;
|
||||
createByName?: string;
|
||||
createTime?: string;
|
||||
details?: [];
|
||||
details?: DetailsVo[];
|
||||
id?: string;
|
||||
inspectorId?: number;
|
||||
inspectorName?: string;
|
||||
@@ -12,7 +12,7 @@ export interface RecordVO {
|
||||
remark?: string;
|
||||
routeId?: string;
|
||||
routeName?: string;
|
||||
status?: number;
|
||||
status?: string;
|
||||
statusLabel?: null;
|
||||
taskName?: string;
|
||||
taskTime?: string;
|
||||
@@ -82,3 +82,19 @@ export interface RecordQuery extends PageQuery {
|
||||
*/
|
||||
taskName?: string;
|
||||
}
|
||||
|
||||
export interface DetailsVo {
|
||||
'id': string;
|
||||
'taskId': string;
|
||||
'pointId': string;
|
||||
'pointName': string;
|
||||
'location': string;
|
||||
'checkTime': string;
|
||||
'checkResult': string;
|
||||
'photos': string;
|
||||
'sortNo': string;
|
||||
'remark': string;
|
||||
'imgUrl': string;
|
||||
'status': string;
|
||||
photoslist?: string[];
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import { RouteVO, RouteForm, RouteQuery } from './type';
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listRoute = (query?: RouteQuery): AxiosPromise<RouteVO[]> => {
|
||||
export const listRoute = (query: RouteQuery | {} = {}): AxiosPromise<RouteVO[]> => {
|
||||
return request({
|
||||
url: '/inspection/route/list',
|
||||
method: 'get',
|
||||
@@ -61,3 +61,11 @@ export const delRoute = (id: string | number | Array<string | number>) => {
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
|
||||
export const changeStatusRoute = (id: string, status: string) => {
|
||||
return request({
|
||||
url: '/inspection/route/changeStatus',
|
||||
method: 'put',
|
||||
params: { id, status }
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,17 +1,40 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { NoticeVO, NoticeForm, NoticeQuery } from '@/api/system/NoticePc/type';
|
||||
|
||||
export interface NotificationVo {
|
||||
'id': 'string';
|
||||
'title': 'string';
|
||||
'item': 'string';
|
||||
'content': 'string';
|
||||
'manageIsCheck': 'string';
|
||||
'repairIsCheck': 'string';
|
||||
}
|
||||
/**
|
||||
* 查询消息通知列表
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const getNotificationList = (query?: NoticeQuery): AxiosPromise<NoticeVO[]> => {
|
||||
export const getNotificationList = (query): AxiosPromise<NotificationVo[]> => {
|
||||
return request({
|
||||
url: '/notification/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 消息通知 已读
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const ReadNotificationByID = (ids: string[]) => {
|
||||
return request({
|
||||
url: '/notification/read',
|
||||
method: 'POST',
|
||||
data: {
|
||||
id: ids
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
42
src/api/system/Payment/index.ts
Normal file
42
src/api/system/Payment/index.ts
Normal file
@@ -0,0 +1,42 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
|
||||
/**
|
||||
* 获取缴费方式,种类占比
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
export type IncomeStatsResponse = {
|
||||
'totalDue': string;
|
||||
'totalPaid': string;
|
||||
'totalUnpaid': string;
|
||||
'paidPercentage': string;
|
||||
'payWx': number;
|
||||
'payZfb': number;
|
||||
'payOffline': number;
|
||||
'totalPay': number;
|
||||
'feeTypeStats': feeTypeStats[];
|
||||
'dailyStats': {
|
||||
'statDate': string;
|
||||
'totalDue': string;
|
||||
'totalPaid': string;
|
||||
'totalUnpaid': string;
|
||||
}[];
|
||||
};
|
||||
export type feeTypeStats = {
|
||||
'feeType': number;
|
||||
'feeName': string;
|
||||
'totalDue': string;
|
||||
'totalPaid': string;
|
||||
'totalUnpaid': string;
|
||||
'paidPercentage': string;
|
||||
};
|
||||
export const income_statsApi = (datetime?: string): AxiosPromise<IncomeStatsResponse> => {
|
||||
return request({
|
||||
url: '/api/analysis/income/stats',
|
||||
method: 'get',
|
||||
params: {
|
||||
startDate: datetime
|
||||
}
|
||||
});
|
||||
};
|
||||
94
src/api/system/Personnel/index.ts
Normal file
94
src/api/system/Personnel/index.ts
Normal file
@@ -0,0 +1,94 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
|
||||
/**
|
||||
* 查询入住情况
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const user_movein_list = (query?: {
|
||||
datetime: string;
|
||||
}): AxiosPromise<{
|
||||
'villageId': string;
|
||||
'villageName': string;
|
||||
'totalHouse': number;
|
||||
'occupiedHouse': number;
|
||||
'occupancyRate': string;
|
||||
'occupancyCount': number;
|
||||
}> => {
|
||||
return request({
|
||||
url: '/api/analysis/occupancy/stats',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询居住人类型列表
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const get_movein_user_type = (query?: {
|
||||
datetime: string;
|
||||
}): Promise<{
|
||||
'owner': string;
|
||||
'ownerRate': string;
|
||||
'tenant': string;
|
||||
'tenantRate': string;
|
||||
'relatives': string;
|
||||
'relativeRate': string;
|
||||
'other': string;
|
||||
'otherRate': string;
|
||||
'totalResident': string;
|
||||
}> => {
|
||||
return request({
|
||||
url: '/residentType/selectTotal',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
/**
|
||||
* 查询住户性别比例
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const get_movein_user_sex = (query?: {
|
||||
datetime: string;
|
||||
}): Promise<{
|
||||
'man': number;
|
||||
'woman': number;
|
||||
'total': number;
|
||||
'manRate': string;
|
||||
'womanRate': string;
|
||||
}> => {
|
||||
return request({
|
||||
url: '/gender/overview',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
/**
|
||||
* 获取迁入迁出趋势图
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const get_movein_moveout_list = (query?: {
|
||||
date: string;
|
||||
}): AxiosPromise<
|
||||
{
|
||||
'date': string;
|
||||
'moveInCount': number;
|
||||
'moveOutCount': number;
|
||||
'totalCount': number;
|
||||
}[]
|
||||
> => {
|
||||
return request({
|
||||
url: '/api/analysis/resident/moveInOutStats',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
@@ -55,9 +55,12 @@ export const updateQuestionnaire = (data: QuestionnaireForm) => {
|
||||
* 删除问卷调查
|
||||
* @param id
|
||||
*/
|
||||
export const delQuestionnaire = (id: string | number | Array<string | number>) => {
|
||||
export const delQuestionnaire = (ids: string | string[], vailid: boolean = true) => {
|
||||
return request({
|
||||
url: '/questionnaire/' + id,
|
||||
method: 'delete'
|
||||
url: '/questionnaire/' + ids + '?isValid=' + vailid,
|
||||
method: 'delete',
|
||||
headers: {
|
||||
silentError: 'true'
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
@@ -51,7 +51,7 @@ export interface QuestionnaireForm extends BaseEntity {
|
||||
/**
|
||||
* 问卷ID
|
||||
*/
|
||||
id?: string | number;
|
||||
id?: string;
|
||||
|
||||
/**
|
||||
* 所属小区id
|
||||
@@ -158,7 +158,7 @@ export interface QuestionComponentItem {
|
||||
}
|
||||
|
||||
export interface QuestionComponentnaireForm {
|
||||
id?: string | number | null;
|
||||
id?: string;
|
||||
title: string;
|
||||
description?: string;
|
||||
content: QuestionComponentItem[];
|
||||
|
||||
@@ -1,65 +1,32 @@
|
||||
export interface RepairVO {
|
||||
/**
|
||||
* 报修管理表id
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 关联房屋id
|
||||
*/
|
||||
houseId: string | number;
|
||||
|
||||
/**
|
||||
* 维修项目id
|
||||
*/
|
||||
maintenanceItemId: string | number;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
problem: string;
|
||||
|
||||
/**
|
||||
* 报修人id(住户表id)
|
||||
*/
|
||||
residentId: string | number;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
phone: number;
|
||||
|
||||
/**
|
||||
* 预约日期
|
||||
*/
|
||||
orderDate: string;
|
||||
|
||||
/**
|
||||
* 问题图片地址
|
||||
*/
|
||||
problemImageUrl: string;
|
||||
|
||||
/**
|
||||
* 0 已提交 1已分配 2维修中 3维修完成
|
||||
*/
|
||||
problemStatus: string;
|
||||
|
||||
/**
|
||||
* 维修描述
|
||||
*/
|
||||
repairDes: string;
|
||||
|
||||
/**
|
||||
* 维修图片url
|
||||
*/
|
||||
repairImageUrl: string;
|
||||
|
||||
/**
|
||||
* 维修人员id
|
||||
*/
|
||||
repairId: string;
|
||||
/** 名称(小区名-楼栋名-单元号-房间号) */
|
||||
name?: string;
|
||||
'id': string;
|
||||
'houseId': string;
|
||||
'maintenanceItemId': number;
|
||||
'maintenanceItemName': number;
|
||||
'problem': string;
|
||||
'residentId': string;
|
||||
'residentName': string;
|
||||
'phone': string;
|
||||
'orderDate': string;
|
||||
'problemImageUrl': string;
|
||||
'problemStatus': string;
|
||||
'repairDes': string;
|
||||
'repairImageUrl': string;
|
||||
'repairId': string;
|
||||
'repairName': string;
|
||||
'houseName': string;
|
||||
'item': string;
|
||||
'projectType': number;
|
||||
'updateTime': string;
|
||||
'projectTypeStr': string;
|
||||
'repairIsCheck': string;
|
||||
'manageIsCheck': string;
|
||||
'isCheckStr': number;
|
||||
'repairPhone': number;
|
||||
'repairRoleName': number;
|
||||
'repairStatus': string;
|
||||
repairUserId: string;
|
||||
'createTime': string;
|
||||
}
|
||||
|
||||
export interface RepairForm extends BaseEntity {
|
||||
@@ -86,12 +53,12 @@ export interface RepairForm extends BaseEntity {
|
||||
/**
|
||||
* 报修人id(住户表id)
|
||||
*/
|
||||
residentId?: string | number;
|
||||
residentId?: string;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
phone?: number;
|
||||
phone?: string;
|
||||
|
||||
/**
|
||||
* 预约日期
|
||||
@@ -163,12 +130,12 @@ export interface RepairQuery extends PageQuery {
|
||||
/**
|
||||
* 报修人id(住户表id)
|
||||
*/
|
||||
residentId?: string | number;
|
||||
residentId?: string;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
phone?: number;
|
||||
phone?: string;
|
||||
|
||||
/**
|
||||
* 预约日期
|
||||
|
||||
@@ -93,6 +93,7 @@ export type BillUserlist = {
|
||||
'houseNo': string;
|
||||
'residentId': string;
|
||||
'buildingId': string;
|
||||
'parkingId': string;
|
||||
};
|
||||
/**
|
||||
* 查询业主列表
|
||||
@@ -106,3 +107,16 @@ export const queryResidentList_holder = (query: { pageNum: number; pageSize: num
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询车位业主列表
|
||||
* @param data
|
||||
* @returns {*}
|
||||
*/
|
||||
export const queryResidentList_Cars = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
|
||||
return request({
|
||||
url: '/bill/getParkingList',
|
||||
method: 'GET',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
@@ -13,6 +13,7 @@ export interface BillVO {
|
||||
* 收费项目id
|
||||
*/
|
||||
chargeItemId: string;
|
||||
residentIds: string[];
|
||||
|
||||
/**
|
||||
* 收费范围 0全体业主 1部分业主
|
||||
@@ -48,6 +49,8 @@ export interface BillVO {
|
||||
* 创建时间
|
||||
*/
|
||||
cerateTime: string;
|
||||
|
||||
parkingIds: string[];
|
||||
}
|
||||
|
||||
export interface BillForm extends BaseEntity {
|
||||
|
||||
@@ -13,7 +13,7 @@ export type cashlist = {
|
||||
* @param post
|
||||
* @returns {*}
|
||||
*/
|
||||
export const cashQuery = (data: { residentName?: string }): AxiosPromise<cashlist[]> => {
|
||||
export const cashQuery = (data: { residentName?: string; queryType: number }): AxiosPromise<cashlist[]> => {
|
||||
return request({
|
||||
url: '/cash/residentList',
|
||||
method: 'post',
|
||||
@@ -25,6 +25,7 @@ export type billlistType = {
|
||||
'villageId': string;
|
||||
'residentId': string;
|
||||
'houseId': string;
|
||||
'detailsId': string;
|
||||
'houseName': string;
|
||||
'parkingId': string;
|
||||
'parkingName': string;
|
||||
@@ -38,11 +39,14 @@ export type billlistType = {
|
||||
'endDate': string;
|
||||
'money': string;
|
||||
'payStatus': string;
|
||||
amount: string;
|
||||
residentName: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询账单列表
|
||||
* @param post
|
||||
* @returns {*}
|
||||
* @param data
|
||||
*/
|
||||
export const billQuery = (data: { residentId?: string; payStatus: '0' | '1' }): AxiosPromise<billlistType[]> => {
|
||||
return request({
|
||||
@@ -51,3 +55,37 @@ export const billQuery = (data: { residentId?: string; payStatus: '0' | '1' }):
|
||||
data: data
|
||||
});
|
||||
};
|
||||
export const billEdit = (data: { 'detailsId': string[]; 'payType': string; 'payStatus': string }): AxiosPromise<billlistType[]> => {
|
||||
return request({
|
||||
url: '/cash/billEdit',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
// 打印票据
|
||||
export const billPrint = (data: { 'detailsIds': string[]; 'residentId': string }): AxiosPromise<BillPrintType> => {
|
||||
return request({
|
||||
url: '/cash/print',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
export type BillPrintType = {
|
||||
'totalAccount': string;
|
||||
'residentName': string;
|
||||
'detailsList': {
|
||||
'detailsId': string;
|
||||
'chargeItemName': string;
|
||||
'billName': string;
|
||||
'detailsTime': string;
|
||||
'useCount': string;
|
||||
'account': string;
|
||||
'payType': string;
|
||||
'remark': string;
|
||||
}[];
|
||||
'printDate': string;
|
||||
'HouseName': string;
|
||||
'title': string;
|
||||
};
|
||||
|
||||
@@ -8,11 +8,11 @@ import { ChargeItemVO, ChargeItemForm, ChargeItemQuery } from './type';
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listChargeItem = (query?: ChargeItemQuery): AxiosPromise<ChargeItemVO[]> => {
|
||||
export const listChargeItem = (query?: ChargeItemQuery | {}): AxiosPromise<ChargeItemVO[]> => {
|
||||
return request({
|
||||
url: '/chargeItem/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
params: query,
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ export interface ChargeItemVO {
|
||||
* 收费类型
|
||||
*/
|
||||
typeId: string;
|
||||
itemName:string;
|
||||
|
||||
/**
|
||||
* 计费方式 0单次收费 1周期收费 2仪表收费
|
||||
|
||||
@@ -61,3 +61,45 @@ export const delTopupRecord = (id: string | number | Array<string | number>) =>
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
|
||||
export type TopupRecordList = {
|
||||
'id': string;
|
||||
'rechargeTime': string;
|
||||
'villageName': string;
|
||||
'residentName': string;
|
||||
'houseName': string;
|
||||
'fixedPriceUnit': string;
|
||||
'fixedPrice': string;
|
||||
'unit': string;
|
||||
'deviceCode': string;
|
||||
'orderId': string;
|
||||
'rechargeAmount': string;
|
||||
'topUpType': string;
|
||||
};
|
||||
/** 查询所有设备充值记录 */
|
||||
export const getTopupRecordByDate = (query: {
|
||||
startTime?: string;
|
||||
endTime?: string;
|
||||
pageSize: number;
|
||||
pageNum: number;
|
||||
}): AxiosPromise<TopupRecordList[]> => {
|
||||
return request({
|
||||
url: '/topupRecord/water/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/** 查询所有电表充值记录 */
|
||||
export const getElectricityTopupRecordByDate = (query: {
|
||||
startTime?: string;
|
||||
endTime?: string;
|
||||
pageSize: number;
|
||||
pageNum: number;
|
||||
}): AxiosPromise<TopupRecordList[]> => {
|
||||
return request({
|
||||
url: '/topupRecord/electricity/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@ import { SupplierVO, SupplierForm, SupplierQuery } from './type';
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listSupplier = (query?: SupplierQuery): AxiosPromise<SupplierVO[]> => {
|
||||
export const listSupplier = (query: SupplierQuery | {} = {}): AxiosPromise<SupplierVO[]> => {
|
||||
return request({
|
||||
url: '/warehouse/supplier/list',
|
||||
method: 'get',
|
||||
|
||||
@@ -8,7 +8,7 @@ import { AreaVO, AreaForm, AreaQuery } from '@/api/system/carArea/type';
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listArea = (query?: AreaQuery): AxiosPromise<AreaVO[]> => {
|
||||
export const listArea = (query: AreaQuery | {} = {}): AxiosPromise<AreaVO[]> => {
|
||||
return request({
|
||||
url: '/area/list',
|
||||
method: 'get',
|
||||
|
||||
@@ -73,3 +73,14 @@ export const uploadCar = (formdata: FormData) => {
|
||||
data: formdata
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取用户端app-用户
|
||||
* */
|
||||
export const getAppUser = (data) => {
|
||||
return request({
|
||||
url: '/car/getAppUserList',
|
||||
method: 'GET',
|
||||
params: data
|
||||
});
|
||||
};
|
||||
|
||||
@@ -2,17 +2,17 @@ export interface CarVO {
|
||||
/**
|
||||
* 车辆管理表id
|
||||
*/
|
||||
id: string | number;
|
||||
id: string;
|
||||
|
||||
/**
|
||||
* 区域id
|
||||
*/
|
||||
areaId: string | number;
|
||||
areaId: string;
|
||||
|
||||
/**
|
||||
* 车位id
|
||||
*/
|
||||
parkingId: string | number;
|
||||
parkingId: string;
|
||||
|
||||
/**
|
||||
* 持有人id(住户表id)
|
||||
|
||||
@@ -13,10 +13,11 @@ export function getBuildinglistAPI(): AxiosPromise<BuildingVo[]> {
|
||||
});
|
||||
}
|
||||
/** 获取所有楼栋 */
|
||||
export function getBuildinglists(): AxiosPromise<BuildingVo[]> {
|
||||
export function getBuildinglists(query = {}): AxiosPromise<BuildingVo[]> {
|
||||
return request({
|
||||
url: '/building/list',
|
||||
method: 'get'
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
}
|
||||
/** 获取单一楼栋 */
|
||||
@@ -117,7 +118,7 @@ export interface Data {
|
||||
billResidentList: BillResidentList[];
|
||||
chargeItemList: string[];
|
||||
house: House;
|
||||
parking: Parking;
|
||||
parkingList: Parking[];
|
||||
residentList: ResidentList[];
|
||||
storeroom: Storeroom;
|
||||
}
|
||||
@@ -162,6 +163,8 @@ export interface Storeroom {
|
||||
shareArea: string;
|
||||
storeroomId: number;
|
||||
storeroomNo: string;
|
||||
remark: string;
|
||||
unitNoId: string;
|
||||
unitNo: number;
|
||||
}
|
||||
|
||||
|
||||
@@ -90,5 +90,6 @@ export interface addHouseType {
|
||||
'shareArea': string;
|
||||
'houseType': string;
|
||||
'storeroomId': string;
|
||||
'parkingId': string;
|
||||
'parkingId'?: string;
|
||||
'parkingIds': string[];
|
||||
}
|
||||
|
||||
@@ -81,3 +81,9 @@ export const uploadHouseImage = (formdata: FormData): AxiosPromise<uploadHouseIm
|
||||
data: formdata
|
||||
});
|
||||
};
|
||||
export const getHouseOwnUser = (houseId: string): AxiosPromise<uploadHouseImagetype> => {
|
||||
return request({
|
||||
url: `/houseRental/ownerName/${houseId}`,
|
||||
method: 'GET'
|
||||
});
|
||||
};
|
||||
|
||||
@@ -15,6 +15,13 @@ export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseU
|
||||
params: query
|
||||
});
|
||||
};
|
||||
export const listHouseUseType_add_house = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
|
||||
return request({
|
||||
url: '/houseUseType/getList',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询房屋类型详细
|
||||
|
||||
@@ -13,6 +13,7 @@ export interface ResidentVO {
|
||||
* 姓名
|
||||
*/
|
||||
name: string;
|
||||
nickName: string;
|
||||
|
||||
/**
|
||||
* 0业主 1租户
|
||||
@@ -90,9 +91,12 @@ export interface ResidentForm extends BaseEntity {
|
||||
name?: string;
|
||||
|
||||
/**
|
||||
* 0业主 1租户
|
||||
* 0业主
|
||||
* 1亲属
|
||||
* 2租户
|
||||
* 3朋友
|
||||
*/
|
||||
type?: string;
|
||||
ownerRelationship?: string;
|
||||
|
||||
/**
|
||||
* 0 男性 1女性
|
||||
@@ -152,10 +156,12 @@ export interface ResidentQuery extends PageQuery {
|
||||
date?: any;
|
||||
|
||||
/**
|
||||
* 住户类型
|
||||
* 0业主 1租户
|
||||
* 0业主
|
||||
* 1亲属
|
||||
* 2租户
|
||||
* 3朋友
|
||||
*/
|
||||
type?: string;
|
||||
ownerRelationship?: string;
|
||||
/**
|
||||
* 住户状态
|
||||
* 0审核中 1 已认证
|
||||
@@ -165,5 +171,5 @@ export interface ResidentQuery extends PageQuery {
|
||||
houseId?: number;
|
||||
villageId?: string;
|
||||
buildingId?: number;
|
||||
unitNo?: number;
|
||||
unitNoId?: number;
|
||||
}
|
||||
|
||||
@@ -68,11 +68,11 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
|
||||
*/
|
||||
|
||||
export const GetVillagelistStoreroom = (
|
||||
data: { villageid: string; unitNo: string; houseId?: string; buildingId: string } = {
|
||||
data: { villageid: string; unitNoId: string; houseId?: string; buildingId: string } = {
|
||||
villageid: null,
|
||||
buildingId: null,
|
||||
houseId: null,
|
||||
unitNo: null
|
||||
unitNoId: null
|
||||
}
|
||||
): AxiosPromise<StoreroomVO[]> => {
|
||||
return request({
|
||||
@@ -81,7 +81,7 @@ export const GetVillagelistStoreroom = (
|
||||
data: {
|
||||
villageId: data.villageid,
|
||||
buildingId: data.buildingId,
|
||||
unitNo: data.unitNo,
|
||||
unitNoId: data.unitNoId,
|
||||
houseId: data.houseId
|
||||
}
|
||||
});
|
||||
|
||||
@@ -12,7 +12,8 @@ export interface StoreroomVO {
|
||||
/**
|
||||
* 单元号
|
||||
*/
|
||||
unitNo: string | number;
|
||||
unitNoId: string | number;
|
||||
unitName: string;
|
||||
|
||||
/**
|
||||
* 储藏室号
|
||||
|
||||
78
src/api/system/version/index.ts
Normal file
78
src/api/system/version/index.ts
Normal file
@@ -0,0 +1,78 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { VersionVO, VersionForm, VersionQuery } from './type';
|
||||
|
||||
/**
|
||||
* 查询版本列表
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listVersion = (query?: VersionQuery): AxiosPromise<VersionVO[]> => {
|
||||
return request({
|
||||
url: '/api/app/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询版本详细
|
||||
* @param id
|
||||
*/
|
||||
export const getVersion = (id: string | number): AxiosPromise<VersionVO> => {
|
||||
return request({
|
||||
url: '/system/version/' + id,
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 新增版本
|
||||
* @param data
|
||||
*/
|
||||
export const addVersion = (data: VersionForm) => {
|
||||
return request({
|
||||
url: '/api/app/release',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 修改版本
|
||||
* @param data
|
||||
*/
|
||||
export const updateVersion = (data: VersionForm) => {
|
||||
return request({
|
||||
url: '/system/version',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 删除版本
|
||||
* @param id
|
||||
*/
|
||||
export const delVersion = (id: string | number | Array<string | number>) => {
|
||||
return request({
|
||||
url: '/system/version/' + id,
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
|
||||
/** 获取过往版本 */
|
||||
export const getPastVersion = (platform: string, channel: string) => {
|
||||
return request({
|
||||
url: `/api/app/getPastVersion?platform=${platform}&channel=${channel}`,
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
/** 切换版本启停 */
|
||||
export const switchVersion = (id: string, status: string) => {
|
||||
return request({
|
||||
url: `/api/app/switchStatus/${id}/${status}`,
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
182
src/api/system/version/type.ts
Normal file
182
src/api/system/version/type.ts
Normal file
@@ -0,0 +1,182 @@
|
||||
export interface VersionVO {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* ios/android
|
||||
*/
|
||||
platform: string;
|
||||
|
||||
/**
|
||||
* 版本号(递增)
|
||||
*/
|
||||
versionCode: number;
|
||||
|
||||
/**
|
||||
* 版本名称(1.2.0)
|
||||
*/
|
||||
versionName: string;
|
||||
|
||||
/**
|
||||
* 最低支持版本
|
||||
*/
|
||||
minVersionCode: number;
|
||||
|
||||
/**
|
||||
* optional/force
|
||||
* optional-可选更新,
|
||||
* force-强制更新
|
||||
*/
|
||||
updateType: string;
|
||||
|
||||
/**
|
||||
* 升级方式
|
||||
* apk-安装包更新,wgt-热更新
|
||||
*/
|
||||
method: string;
|
||||
|
||||
/**
|
||||
* 下载地址
|
||||
*/
|
||||
downloadUrl: string;
|
||||
|
||||
/**
|
||||
* 更新日志
|
||||
*/
|
||||
releaseNotes: string;
|
||||
|
||||
/**
|
||||
* 文件大小(MB)
|
||||
*/
|
||||
fileSize: string;
|
||||
|
||||
/**
|
||||
* 0-禁用 1-启用
|
||||
*/
|
||||
status: string;
|
||||
|
||||
/**
|
||||
* 更新app端
|
||||
*/
|
||||
channel: string;
|
||||
}
|
||||
|
||||
export interface VersionForm extends BaseEntity {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
id?: string | number;
|
||||
|
||||
/**
|
||||
* ios/android
|
||||
*/
|
||||
platform?: string;
|
||||
|
||||
/**
|
||||
* 版本号(递增)
|
||||
*/
|
||||
versionCode?: number;
|
||||
|
||||
/**
|
||||
* 版本名称(1.2.0)
|
||||
*/
|
||||
versionName?: string;
|
||||
|
||||
/**
|
||||
* 最低支持版本
|
||||
*/
|
||||
minVersionCode?: string;
|
||||
|
||||
/**
|
||||
* optional/force
|
||||
* optional-可选更新,force-强制更新
|
||||
*/
|
||||
updateType?: string;
|
||||
method?: string;
|
||||
|
||||
/**
|
||||
* 下载地址
|
||||
*/
|
||||
downloadUrl?: string;
|
||||
|
||||
/**
|
||||
* 更新日志
|
||||
*/
|
||||
releaseNotes?: string;
|
||||
|
||||
/**
|
||||
* 文件大小(MB)
|
||||
*/
|
||||
fileSize?: string;
|
||||
|
||||
/**
|
||||
* 0-禁用 1-启用
|
||||
*/
|
||||
status?: number;
|
||||
|
||||
/**
|
||||
* 更新app端
|
||||
* butler 管家端
|
||||
* resident 业主端
|
||||
*/
|
||||
channel?: string;
|
||||
}
|
||||
|
||||
export interface VersionQuery extends PageQuery {
|
||||
/**
|
||||
* ios/android
|
||||
*/
|
||||
platform?: string;
|
||||
|
||||
/**
|
||||
* 版本号(递增)
|
||||
*/
|
||||
versionCode?: number;
|
||||
|
||||
/**
|
||||
* 版本名称(1.2.0)
|
||||
*/
|
||||
versionName?: string;
|
||||
|
||||
/**
|
||||
* 最低支持版本
|
||||
*/
|
||||
minVersionCode?: number;
|
||||
|
||||
/**
|
||||
* optional/force
|
||||
*/
|
||||
updateType?: string;
|
||||
|
||||
/**
|
||||
* 下载地址
|
||||
*/
|
||||
downloadUrl?: string;
|
||||
|
||||
/**
|
||||
* 更新日志
|
||||
*/
|
||||
releaseNotes?: string;
|
||||
|
||||
/**
|
||||
* 文件大小(MB)
|
||||
*/
|
||||
fileSize?: string;
|
||||
|
||||
/**
|
||||
* 0-禁用 1-启用
|
||||
*/
|
||||
status?: number;
|
||||
|
||||
/**
|
||||
* 更新app端
|
||||
*/
|
||||
channel?: string;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
}
|
||||
@@ -51,8 +51,7 @@ export const workSpaceRepairTrendListApi = (
|
||||
* @returns {*}
|
||||
*/
|
||||
export const workSpaceIncomeTrendListApi = (
|
||||
villageId: string,
|
||||
type: number
|
||||
villageId: string
|
||||
): Promise<
|
||||
{
|
||||
date: string;
|
||||
@@ -63,11 +62,32 @@ export const workSpaceIncomeTrendListApi = (
|
||||
url: '/workSpace/last7DaysIncomeTrend',
|
||||
method: 'GET',
|
||||
params: {
|
||||
villageId: villageId,
|
||||
type: type
|
||||
villageId: villageId
|
||||
}
|
||||
});
|
||||
};
|
||||
/**
|
||||
* 查询近一周支出趋势
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
export const workSpaceOutcomeTrendListApi = (
|
||||
villageId: string
|
||||
): Promise<
|
||||
{
|
||||
date: string;
|
||||
expenditure: string;
|
||||
}[]
|
||||
> => {
|
||||
return request({
|
||||
url: '/workSpace/last7DaysExpenditureTrend',
|
||||
method: 'GET',
|
||||
params: {
|
||||
villageId: villageId
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 查询当日天气
|
||||
* @param query
|
||||
|
||||
Reference in New Issue
Block a user