taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改各模块ts接口规范

Browse Source
This commit is contained in:
lcj
2025-03-13 15:07:20 +08:00
parent 25259064ba
commit d066a27c2c
31 changed files with 168 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/machinery/machinery/index.ts
View File

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

23
src/api/machinery/machinery/types.ts
View File

@ -33,7 +33,6 @@ export interface MachineryVO {
* 备注
*/
remark: string;
}
export interface MachineryForm extends BaseEntity {
@ -71,11 +70,9 @@ export interface MachineryForm extends BaseEntity {
* 备注
*/
remark?: string;
}
export interface MachineryQuery extends PageQuery {
export interface MachineryQuery extends PageRequest {
/**
* 机械名称
*/
@ -101,11 +98,17 @@ export interface MachineryQuery extends PageQuery {
*/
principal?: string;
/**
* 日期范围参数
*/
params?: any;
/**
* 备注
*/1
remark?: string;
/**
* 日期范围参数
*/
params?: any;
}
export interface PageMachinery extends PageResponse {
records?: MachineryVO[];
}

6
src/api/machinery/machineryDetail/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/api/machinery/machineryDetail/types';
import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO, PageMachineryDetail } from '@/api/machinery/machineryDetail/types';
/**
* 查询机械详情列表
@ -8,7 +8,7 @@ import { MachineryDetailVO, MachineryDetailForm, MachineryDetailQuery } from '@/
* @returns {*}
*/
export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<MachineryDetailVO[]> => {
export const listMachineryDetail = (query?: MachineryDetailQuery): AxiosPromise<PageMachineryDetail> => {
return request({
url: '/machinery/machineryDetail/list',
method: 'get',
@ -31,7 +31,7 @@ export const getMachineryDetail = (id: string | number): AxiosPromise<MachineryD
* 新增机械详情
* @param data
*/
export const addMachineryDetail = (data: MachineryDetailForm) => {
export const addMachineryDetail = (data: MachineryDetailForm): AxiosPromise<string | number> => {
return request({
url: '/machinery/machineryDetail',
method: 'post',

4
src/api/machinery/machineryDetail/types.ts
View File

@ -148,3 +148,7 @@ export interface MachineryDetailQuery extends PageRequest {
*/
params?: any;
}
export interface PageMachineryDetail extends PageResponse {
records?: MachineryDetailVO[];
}

6
src/api/materials/company/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { CompanyVO, CompanyForm, CompanyQuery } from '@/api/materials/company/types';
import { CompanyForm, CompanyQuery, CompanyVO, PageCompany } from '@/api/materials/company/types';
/**
* 查询公司列表
@ -8,7 +8,7 @@ import { CompanyVO, CompanyForm, CompanyQuery } from '@/api/materials/company/ty
* @returns {*}
*/
export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
export const listCompany = (query?: CompanyQuery): AxiosPromise<PageCompany> => {
return request({
url: '/materials/company/list',
method: 'get',
@ -31,7 +31,7 @@ export const getCompany = (id: string | number): AxiosPromise<CompanyVO> => {
* 新增公司
* @param data
*/
export const addCompany = (data: CompanyForm) => {
export const addCompany = (data: CompanyForm): AxiosPromise<string | number> => {
return request({
url: '/materials/company',
method: 'post',

4
src/api/materials/company/types.ts
View File

@ -88,3 +88,7 @@ export interface CompanyQuery extends PageRequest {
*/
params?: any;
}
export interface PageCompany extends PageResponse {
records?: CompanyVO[];
}

7
src/api/materials/materials/index.ts
View File

@ -1,14 +1,13 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MaterialsVO, MaterialsForm, MaterialsQuery } from '@/api/materials/materials/types';
import { MaterialsForm, MaterialsQuery, MaterialsVO, PageMaterials } from '@/api/materials/materials/types';
/**
* 查询材料名称列表
* @param query
* @returns {*}
*/
export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
export const listMaterials = (query?: MaterialsQuery): AxiosPromise<PageMaterials> => {
return request({
url: '/materials/materials/list',
method: 'get',
@ -31,7 +30,7 @@ export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> =>
* 新增材料名称
* @param data
*/
export const addMaterials = (data: MaterialsForm) => {
export const addMaterials = (data: MaterialsForm): AxiosPromise<string | number> => {
return request({
url: '/materials/materials',
method: 'post',

11
src/api/materials/materials/types.ts
View File

@ -1,3 +1,5 @@
import { CompanyVO } from '@/api/materials/company/types';
export interface MaterialsVO {
/**
* 主键id
@ -14,6 +16,11 @@ export interface MaterialsVO {
*/
companyId: string | number;
/**
* 公司信息
*/
companyVo: CompanyVO;
/**
* 项目id
*/
@ -283,3 +290,7 @@ export interface MaterialsQuery extends PageRequest {
*/
params?: any;
}
export interface PageMaterials extends PageResponse {
records?: MaterialsVO[];
}

11
src/api/materials/materialsInventory/index.ts
View File

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

14
src/api/materials/materialsInventory/types.ts
View File

@ -11,6 +11,11 @@ export interface MaterialsInventoryVO {
*/
materialsId: string | number;
/**
* 材料信息
*/
materialsVo: MaterialsVO;
/**
* 项目id
*/
@ -65,11 +70,6 @@ export interface MaterialsInventoryVO {
* 备注
*/
remark: string;
/**
* 材料封装
*/
materialsVo: MaterialsVO;
}
export interface MaterialsInventoryForm extends BaseEntity {
@ -205,3 +205,7 @@ export interface MaterialsInventoryQuery extends PageRequest {
*/
params?: any;
}
export interface PageMaterialsInventory extends PageResponse {
records?: MaterialsInventoryVO[];
}

6
src/api/project/constructionUser/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from '@/api/project/constructionUser/types';
import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery, PageConstructionUser } from '@/api/project/constructionUser/types';
/**
* 查询施工人员列表
@ -8,7 +8,7 @@ import { ConstructionUserVO, ConstructionUserForm, ConstructionUserQuery } from
* @returns {*}
*/
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<PageConstructionUser> => {
return request({
url: '/project/constructionUser/list',
method: 'get',
@ -31,7 +31,7 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
* 新增施工人员
* @param data
*/
export const addConstructionUser = (data: ConstructionUserForm) => {
export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
return request({
url: '/project/constructionUser',
method: 'post',

4
src/api/project/constructionUser/types.ts
View File

@ -430,3 +430,7 @@ export interface ConstructionUserQuery extends PageRequest {
*/
params?: any;
}
export interface PageConstructionUser extends PageResponse {
records?: ConstructionUserVO[];
}

6
src/api/project/contractor/index.ts
View File

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

4
src/api/project/contractor/types.ts
View File

@ -103,3 +103,7 @@ export interface ContractorQuery extends PageRequest {
*/
params?: any;
}
export interface PageContractor extends PageResponse {
records?: ContractorVO[];
}

6
src/api/project/project/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ProjectVO, ProjectForm, ProjectQuery } from '@/api/project/project/types';
import { PageProjectVo, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
/**
* 查询项目列表
@ -8,7 +8,7 @@ import { ProjectVO, ProjectForm, ProjectQuery } from '@/api/project/project/type
* @returns {*}
*/
export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
export const listProject = (query?: ProjectQuery): AxiosPromise<PageProjectVo> => {
return request({
url: '/project/project/list',
method: 'get',
@ -31,7 +31,7 @@ export const getProject = (id: string | number): AxiosPromise<ProjectVO> => {
* 新增项目
* @param data
*/
export const addProject = (data: ProjectForm) => {
export const addProject = (data: ProjectForm): AxiosPromise<string | number> => {
return request({
url: '/project/project',
method: 'post',

4
src/api/project/project/types.ts
View File

@ -328,3 +328,7 @@ export interface ProjectQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectVo extends PageResponse {
records?: ProjectVO[];
}

12
src/api/project/projectRelevancy/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ProjectRelevancyVO, ProjectRelevancyForm, ProjectRelevancyQuery } from '@/api/project/projectRelevancy/types';
import { PageProjectRelevancy, ProjectRelevancyForm, ProjectRelevancyQuery, ProjectRelevancyVO } from '@/api/project/projectRelevancy/types';
/**
* 查询系统用户与项目关联列表
@ -8,7 +8,7 @@ import { ProjectRelevancyVO, ProjectRelevancyForm, ProjectRelevancyQuery } from
* @returns {*}
*/
export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise<ProjectRelevancyVO[]> => {
export const listProjectRelevancy = (query?: ProjectRelevancyQuery): AxiosPromise<PageProjectRelevancy> => {
return request({
url: '/project/projectRelevancy/login/page',
method: 'get',
@ -31,7 +31,7 @@ export const getProjectRelevancy = (id: string | number): AxiosPromise<ProjectRe
* 新增系统用户与项目关联
* @param data
*/
export const addProjectRelevancy = (data: ProjectRelevancyForm) => {
export const addProjectRelevancy = (data: ProjectRelevancyForm): AxiosPromise<string | number> => {
return request({
url: '/project/projectRelevancy',
method: 'post',
@ -70,7 +70,7 @@ export const delProjectRelevancy = (id: string | number | Array<string | number>
* 获取用户已关联的项目列表
* @param params { userId: number }
*/
export function listUserProjects(params: { userId: number }) {
export function listUserProjects(params: { userId: number | string }) {
return request({
url: '/project/projectRelevancy/list',
method: 'get',
@ -82,7 +82,7 @@ export function listUserProjects(params: { userId: number }) {
* 添加项目关联
* @param data { userId: number; projectIds: number[] }
*/
export function addNewProjectRelevancy(data: { userId: number; projectIds: number[] }) {
export function addNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) {
return request({
url: '/project/projectRelevancy/add/project/list',
method: 'post',
@ -94,7 +94,7 @@ export function addNewProjectRelevancy(data: { userId: number; projectIds: numbe
* 移除项目关联
* @param data { userId: number; projectIds: number[] }
*/
export function removeNewProjectRelevancy(data: { userId: number; projectIds: number[] }) {
export function removeNewProjectRelevancy(data: { userId: number | string; projectIdList: number[] }) {
return request({
url: '/project/projectRelevancy/remove/project/list',
method: 'delete',

24
src/api/project/projectRelevancy/types.ts
View File

@ -1,3 +1,5 @@
import { ProjectVO } from '@/api/project/project/types';
export interface ProjectRelevancyVO {
/**
* 主键ID
@ -15,10 +17,9 @@ export interface ProjectRelevancyVO {
projectId: string | number;
/**
* 删除时间
* 项目详情
*/
deletedAt: string;
project: ProjectVO;
}
export interface ProjectRelevancyForm extends BaseEntity {
@ -41,11 +42,9 @@ export interface ProjectRelevancyForm extends BaseEntity {
* 删除时间
*/
deletedAt?: string;
}
export interface ProjectRelevancyQuery extends PageQuery {
export interface ProjectRelevancyQuery extends PageRequest {
/**
* 用户ID
*/
@ -61,11 +60,12 @@ export interface ProjectRelevancyQuery extends PageQuery {
*/
deletedAt?: string;
/**
* 日期范围参数
*/
params?: any;
/**
* 日期范围参数
*/
params?: any;
}
export interface PageProjectRelevancy extends PageResponse {
records?: ProjectRelevancyVO[];
}

6
src/api/project/projectTeam/index.ts
View File

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

4
src/api/project/projectTeam/types.ts
View File

@ -73,3 +73,7 @@ export interface ProjectTeamQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectTeam extends PageResponse {
records?: ProjectTeamVO[];
}

6
src/api/project/projectTeamMember/index.ts
View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } from '@/api/project/projectTeamMember/types';
import { PageProjectTeamMember, ProjectTeamMemberForm, ProjectTeamMemberQuery, ProjectTeamMemberVO } from '@/api/project/projectTeamMember/types';
/**
* 查询项目班组下的成员列表
@ -8,7 +8,7 @@ import { ProjectTeamMemberVO, ProjectTeamMemberForm, ProjectTeamMemberQuery } fr
* @returns {*}
*/
export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<ProjectTeamMemberVO[]> => {
export const listProjectTeamMember = (query?: ProjectTeamMemberQuery): AxiosPromise<PageProjectTeamMember> => {
return request({
url: '/project/projectTeamMember/list',
method: 'get',
@ -31,7 +31,7 @@ export const getProjectTeamMember = (id: string | number): AxiosPromise<ProjectT
* 新增项目班组下的成员
* @param data
*/
export const addProjectTeamMember = (data: ProjectTeamMemberForm) => {
export const addProjectTeamMember = (data: ProjectTeamMemberForm): AxiosPromise<string | number> => {
return request({
url: '/project/projectTeamMember',
method: 'post',

4
src/api/project/projectTeamMember/types.ts
View File

@ -93,3 +93,7 @@ export interface ProjectTeamMemberQuery extends PageRequest {
*/
params?: any;
}
export interface PageProjectTeamMember extends PageResponse {
records?: ProjectTeamMemberVO[];
}

4
src/api/system/user/index.ts
View File

@ -1,8 +1,8 @@
import {DeptTreeVO, DeptVO} from './../dept/types';
import { DeptTreeVO } from './../dept/types';
import { RoleVO } from '@/api/system/role/types';
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { UserForm, UserQuery, UserVO, UserInfoVO } from './types';
import { UserForm, UserInfoVO, UserQuery, UserVO } from './types';
import { parseStrEmpty } from '@/utils/ruoyi';
/**