修改各模块ts接口规范

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

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

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

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

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

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

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

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