修改分页请求参数和响应

plus-ui/src/api/machinery/machinery/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { MachineryForm, MachineryQuery, MachineryVO, PageMachinery } from '@/api/machinery/machinery/types';
+import { MachineryForm, MachineryQuery, MachineryVO } from '@/api/machinery/machinery/types';
 
 /**
  * 查询机械列表
@@ -8,7 +8,7 @@ import { MachineryForm, MachineryQuery, MachineryVO, PageMachinery } from '@/api
  * @returns {*}
  */
 
-export const listMachinery = (query?: MachineryQuery): AxiosPromise<PageMachinery> => {
+export const listMachinery = (query?: MachineryQuery): AxiosPromise<MachineryVO[]> => {
   return request({
     url: '/machinery/machinery/list',
     method: 'get',

plus-ui/src/api/machinery/machinery/types.ts

@@ -72,7 +72,7 @@ export interface MachineryForm extends BaseEntity {
   remark?: string;
 }
 
-export interface MachineryQuery extends PageRequest {
+export interface MachineryQuery extends PageQuery {
   /**
    * 机械名称
    */
@@ -108,7 +108,3 @@ export interface MachineryQuery extends PageRequest {
    */
   params?: any;
 }
-
-export interface PageMachinery extends PageResponse {
-  records?: MachineryVO[];
-}

plus-ui/src/api/machinery/machineryDetail/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachineryDetail } from '@/api/machinery/machineryDetail/types';
+import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types';
 
 /**
  * 查询机械详情列表
@@ -8,7 +8,7 @@ import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachi
  * @returns {*}
  */
 
-export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<PageMachineryDetail> => {
+export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
   return request({
     url: '/machinery/machineryDetail/list',
     method: 'get',

plus-ui/src/api/machinery/machineryDetail/types.ts

@@ -109,7 +109,7 @@ export interface MachineryDetailForm extends BaseEntity {
   machineryId?: string | number;
 }
 
-export interface MachineryDetailQuery extends PageRequest {
+export interface MachineryDetailQuery extends PageQuery {
   /**
    * 检验证编号
    */
@@ -155,7 +155,3 @@ export interface MachineryDetailQuery extends PageRequest {
    */
   params?: any;
 }
-
-export interface PageMachineryDetail extends PageResponse {
-  records?: MachineryDetailVO[];
-}

plus-ui/src/api/materials/company/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materials/company/types';
+import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';
 
 /**
  * 查询公司列表
@@ -8,7 +8,7 @@ import { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materia
  * @returns {*}
  */
 
-export const listCompany = (query?: CompanyQuery): AxiosPromise<PageCompany> => {
+export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
   return request({
     url: '/materials/company/list',
     method: 'get',

plus-ui/src/api/materials/company/types.ts

@@ -62,7 +62,7 @@ export interface CompanyForm extends BaseEntity {
   qualification?: string;
 }
 
-export interface CompanyQuery extends PageRequest {
+export interface CompanyQuery extends PageQuery {
   /**
    * 公司名称
    */
@@ -88,7 +88,3 @@ export interface CompanyQuery extends PageRequest {
    */
   params?: any;
 }
-
-export interface PageCompany extends PageResponse {
-  records?: CompanyVO[];
-}

plus-ui/src/api/materials/materials/index.ts

@@ -1,13 +1,13 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { MaterialsForm, MaterialsQuery, MaterialsVO, PageMaterials } from '@/api/materials/materials/types';
+import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';
 
 /**
  * 查询材料名称列表
  * @param query
  * @returns {*}
  */
-export const listMaterials = (query?: MaterialsQuery): AxiosPromise<PageMaterials> => {
+export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
   return request({
     url: '/materials/materials/list',
     method: 'get',

plus-ui/src/api/materials/materials/types.ts

@@ -119,7 +119,7 @@ export interface MaterialsForm extends BaseEntity {
   status?: string;
 }
 
-export interface MaterialsQuery extends PageRequest {
+export interface MaterialsQuery extends PageQuery {
   /**
    * 材料名称
    */
@@ -170,7 +170,3 @@ export interface MaterialsQuery extends PageRequest {
    */
   params?: any;
 }
-
-export interface PageMaterials extends PageResponse {
-  records?: MaterialsVO[];
-}

plus-ui/src/api/materials/materialsInventory/index.ts

@@ -1,11 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import {
-  MaterialsInventoryForm,
-  MaterialsInventoryQuery,
-  MaterialsInventoryVO,
-  PageMaterialsInventory
-} from '@/api/materials/materialsInventory/types';
+import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 
 /**
  * 查询材料出/入库列表
@@ -13,7 +8,7 @@ import {
  * @returns {*}
  */
 
-export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<PageMaterialsInventory> => {
+export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
   return request({
     url: '/materials/materialsInventory/list',
     method: 'get',

plus-ui/src/api/materials/materialsInventory/types.ts

@@ -139,7 +139,7 @@ export interface MaterialsInventoryForm extends BaseEntity {
   remark?: string;
 }
 
-export interface MaterialsInventoryQuery extends PageRequest {
+export interface MaterialsInventoryQuery extends PageQuery {
   /**
    * 材料id
    */
@@ -205,7 +205,3 @@ export interface MaterialsInventoryQuery extends PageRequest {
    */
   params?: any;
 }
-
-export interface PageMaterialsInventory extends PageResponse {
-  records?: MaterialsInventoryVO[];
-}

plus-ui/src/api/project/constructionUser/index.ts

@@ -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',

plus-ui/src/api/project/constructionUser/types.ts

@@ -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[];
-}

plus-ui/src/api/project/contractor/index.ts

@@ -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',

plus-ui/src/api/project/contractor/types.ts

@@ -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[];
-}

plus-ui/src/api/project/project/index.ts

@@ -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',

plus-ui/src/api/project/project/types.ts

@@ -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[];
-}

plus-ui/src/api/project/projectRelevancy/index.ts

@@ -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',

plus-ui/src/api/project/projectRelevancy/types.ts

@@ -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[];
-}

plus-ui/src/api/project/projectTeam/index.ts

@@ -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',

plus-ui/src/api/project/projectTeam/types.ts

@@ -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[];
-}

plus-ui/src/api/project/projectTeamMember/index.ts

@@ -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',

plus-ui/src/api/project/projectTeamMember/types.ts

@@ -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[];
-}