修改分页请求参数和响应

This commit is contained in:
lcj
2025-03-18 09:59:59 +08:00
parent abed0527cd
commit 52c8ab0f20
36 changed files with 127 additions and 235 deletions

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery, PageConstructionUser } from '@/api/project/constructionUser/types';
import { ConstructionUserForm, ConstructionUserQuery, ConstructionUserVO } from '@/api/project/constructionUser/types';
/**
* 查询施工人员列表
@ -8,7 +8,7 @@ import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery, PageCo
* @returns {*}
*/
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<PageConstructionUser> => {
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
return request({
url: '/project/constructionUser/list',
method: 'get',

View File

@ -340,7 +340,7 @@ export interface ConstructionUserForm extends BaseEntity {
remark?: string;
}
export interface ConstructionUserQuery extends PageRequest {
export interface ConstructionUserQuery extends PageQuery {
/**
* 微信id
*/
@ -476,7 +476,3 @@ export interface ConstructionUserQuery extends PageRequest {
*/
params?: any;
}
export interface PageConstructionUser extends PageResponse {
records?: ConstructionUserVO[];
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ContractorForm, ContractorQuery, ContractorVO, PageContractor } from '@/api/project/contractor/types';
import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/contractor/types';
/**
* 查询分包单位列表
@ -8,7 +8,7 @@ import { ContractorForm, ContractorQuery, ContractorVO, PageContractor } from '@
* @returns {*}
*/
export const listContractor = (query?: ContractorQuery): AxiosPromise<PageContractor> => {
export const listContractor = (query?: ContractorQuery): AxiosPromise<ContractorVO[]> => {
return request({
url: '/project/contractor/list',
method: 'get',

View File

@ -82,7 +82,7 @@ export interface ContractorForm extends BaseEntity {
remark?: string;
}
export interface ContractorQuery extends PageRequest {
export interface ContractorQuery extends PageQuery {
/**
* 公司名称
*/
@ -113,7 +113,3 @@ export interface ContractorQuery extends PageRequest {
*/
params?: any;
}
export interface PageContractor extends PageResponse {
records?: ContractorVO[];
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
import { ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
/**
* 查询项目列表
@ -8,7 +8,7 @@ import { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/proje
* @returns {*}
*/
export const listProject = (query?: ProjectQuery): AxiosPromise<PageProjectVo> => {
export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
return request({
url: '/project/project/list',
method: 'get',

View File

@ -222,7 +222,7 @@ export interface ProjectForm extends BaseEntity {
isDelete?: number;
}
export interface ProjectQuery extends PageRequest {
export interface ProjectQuery extends PageQuery {
/**
* 项目名称
*/
@ -328,7 +328,3 @@ export interface ProjectQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectVo extends PageResponse {
records?: ProjectVO[];
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
import { ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
/**
* 查询系统用户与项目关联列表
@ -8,7 +8,7 @@ import { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, Proj
* @returns {*}
*/
export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise<PageProjectRelevancy> => {
export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise<ProjectRelevancyVO[]> => {
return request({
url: '/project/projectRelevancy/login/page',
method: 'get',

View File

@ -44,7 +44,7 @@ export interface ProjectRelevancyForm extends BaseEntity {
deletedAt?: string;
}
export interface ProjectRelevancyQuery extends PageRequest {
export interface ProjectRelevancyQuery extends PageQuery {
/**
* 用户ID
*/
@ -65,7 +65,3 @@ export interface ProjectRelevancyQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectRelevancy extends PageResponse {
records?: ProjectRelevancyVO[];
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PageProjectTeam, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
import { ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } from '@/api/project/projectTeam/types';
/**
* 查询项目班组列表
@ -8,7 +8,7 @@ import { PageProjectTeam, ProjectTeamForm, ProjectTeamQuery, ProjectTeamVO } fro
* @returns {*}
*/
export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<PageProjectTeam> => {
export const listProjectTeam = (query?: ProjectTeamQuery): AxiosPromise<ProjectTeamVO[]> => {
return request({
url: '/project/projectTeam/list',
method: 'get',

View File

@ -52,7 +52,7 @@ export interface ProjectTeamForm extends BaseEntity {
remark?: string;
}
export interface ProjectTeamQuery extends PageRequest {
export interface ProjectTeamQuery extends PageQuery {
/**
* 项目id
*/
@ -73,7 +73,3 @@ export interface ProjectTeamQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectTeam extends PageResponse {
records?: ProjectTeamVO[];
}

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
import { ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
/**
* 查询项目班组下的成员列表
@ -8,7 +8,7 @@ import { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, P
* @returns {*}
*/
export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<PageProjectTeamMember> => {
export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<ProjectTeamMemberVO[]> => {
return request({
url: '/project/projectTeamMember/list',
method: 'get',

View File

@ -62,7 +62,7 @@ export interface ProjectTeamMemberForm extends BaseEntity {
remark?: string;
}
export interface ProjectTeamMemberQuery extends PageRequest {
export interface ProjectTeamMemberQuery extends PageQuery {
/**
* 班组id
*/
@ -93,7 +93,3 @@ export interface ProjectTeamMemberQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectTeamMember extends PageResponse {
records?: ProjectTeamMemberVO[];
}