完成Banner,设备管理模块，进行中 水电表

src/api/system/equipment/Category/index.ts

@@ -10,7 +10,7 @@ import { DeviceCategoryVO, DeviceCategoryForm, DeviceCategoryQuery } from './typ
 
 export const listDeviceCategory = (query?: DeviceCategoryQuery): AxiosPromise<DeviceCategoryVO[]> => {
   return request({
-    url: '/system/deviceCategory/list',
+    url: '/warehouse/deviceCategory/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listDeviceCategory = (query?: DeviceCategoryQuery): AxiosPromise<De
  */
 export const getDeviceCategory = (id: string | number): AxiosPromise<DeviceCategoryVO> => {
   return request({
-    url: '/system/deviceCategory/' + id,
+    url: '/warehouse/deviceCategory/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getDeviceCategory = (id: string | number): AxiosPromise<DeviceCateg
  */
 export const addDeviceCategory = (data: DeviceCategoryForm) => {
   return request({
-    url: '/system/deviceCategory',
+    url: '/warehouse/deviceCategory',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addDeviceCategory = (data: DeviceCategoryForm) => {
  */
 export const updateDeviceCategory = (data: DeviceCategoryForm) => {
   return request({
-    url: '/system/deviceCategory',
+    url: '/warehouse/deviceCategory',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateDeviceCategory = (data: DeviceCategoryForm) => {
  */
 export const delDeviceCategory = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/system/deviceCategory/' + id,
+    url: '/warehouse/deviceCategory/' + id,
     method: 'delete'
   });
 };

src/api/system/equipment/Category/type.ts

@@ -12,7 +12,7 @@ export interface DeviceCategoryVO {
   /**
    * 状态 0正常 1停用
    */
-  status: number;
+  status: string;
 
   /**
    * 备注
@@ -34,7 +34,7 @@ export interface DeviceCategoryForm extends BaseEntity {
   /**
    * 状态 0正常 1停用
    */
-  status?: number;
+  status?: string;
 
   /**
    * 备注
@@ -51,7 +51,7 @@ export interface DeviceCategoryQuery extends PageQuery {
   /**
    * 状态 0正常 1停用
    */
-  status?: number;
+  status?: string;
 
   /**
    * 日期范围参数

src/api/system/equipment/Repair/index.ts

@@ -10,7 +10,7 @@ import { DeviceRepairVO, DeviceRepairForm, DeviceRepairQuery } from './type';
 
 export const listDeviceRepair = (query?: DeviceRepairQuery): AxiosPromise<DeviceRepairVO[]> => {
   return request({
-    url: '/system/deviceRepair/list',
+    url: '/warehouse/deviceRepair/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listDeviceRepair = (query?: DeviceRepairQuery): AxiosPromise<Device
  */
 export const getDeviceRepair = (id: string | number): AxiosPromise<DeviceRepairVO> => {
   return request({
-    url: '/system/deviceRepair/' + id,
+    url: '/warehouse/deviceRepair/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getDeviceRepair = (id: string | number): AxiosPromise<DeviceRepairV
  */
 export const addDeviceRepair = (data: DeviceRepairForm) => {
   return request({
-    url: '/system/deviceRepair',
+    url: '/warehouse/deviceRepair',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addDeviceRepair = (data: DeviceRepairForm) => {
  */
 export const updateDeviceRepair = (data: DeviceRepairForm) => {
   return request({
-    url: '/system/deviceRepair',
+    url: '/warehouse/deviceRepair',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateDeviceRepair = (data: DeviceRepairForm) => {
  */
 export const delDeviceRepair = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/system/deviceRepair/' + id,
+    url: '/warehouse/deviceRepair/' + id,
     method: 'delete'
   });
 };

src/api/system/equipment/Repair/type.ts

@@ -7,7 +7,7 @@ export interface DeviceRepairVO {
   /**
    * 维修设备ID
    */
-  deviceId: string | number;
+  deviceId: string;
 
   /**
    * 设备名称
@@ -32,23 +32,32 @@ export interface DeviceRepairVO {
   /**
    * 维护人员ID，多个用,分隔
    */
-  maintainUserIds: string | number;
+  maintainUserIds: string;
 
   /**
    * 故障描述
    */
   faultDesc: string;
+  categoryName: string;
+  createTime: string;
 
   /**
    * 维修结果 0已修复 1未修复
    */
-  repairResult: number;
+  repairResult: string;
 
   /**
    * 维修时间
    */
   repairTime: string;
 
+  maintainUserList: {
+    'userId': string;
+    'userName': string;
+    'nickName': string;
+    'phonenumber': number;
+  }[];
+  categoryId: string;
   /**
    * 备注
    */
@@ -59,12 +68,12 @@ export interface DeviceRepairForm extends BaseEntity {
   /**
    * 主键ID
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 维修设备ID
    */
-  deviceId?: string | number;
+  deviceId?: string;
 
   /**
    * 设备名称
@@ -89,7 +98,7 @@ export interface DeviceRepairForm extends BaseEntity {
   /**
    * 维护人员ID，多个用,分隔
    */
-  maintainUserIds?: string | number;
+  maintainUserIds?: string;
 
   /**
    * 故障描述
@@ -99,7 +108,7 @@ export interface DeviceRepairForm extends BaseEntity {
   /**
    * 维修结果 0已修复 1未修复
    */
-  repairResult?: number;
+  repairResult?: string;
 
   /**
    * 维修时间
@@ -116,7 +125,7 @@ export interface DeviceRepairQuery extends PageQuery {
   /**
    * 维修设备ID
    */
-  deviceId?: string | number;
+  deviceId?: string;
 
   /**
    * 设备名称
@@ -141,7 +150,7 @@ export interface DeviceRepairQuery extends PageQuery {
   /**
    * 维护人员ID，多个用,分隔
    */
-  maintainUserIds?: string | number;
+  maintainUserIds?: string;
 
   /**
    * 故障描述
@@ -151,7 +160,7 @@ export interface DeviceRepairQuery extends PageQuery {
   /**
    * 维修结果 0已修复 1未修复
    */
-  repairResult?: number;
+  repairResult?: string;
 
   /**
    * 维修时间

src/api/system/equipment/archive/type.ts

@@ -2,12 +2,12 @@ export interface DeviceVO {
   /**
    * 主键ID
    */
-  id: string | number;
+  id: string;
 
   /**
    * 设备分类ID
    */
-  categoryId: string | number;
+  categoryId: string;
 
   /**
    * 设备名称
@@ -32,7 +32,7 @@ export interface DeviceVO {
   /**
    * 维护人员ID，多个用,分隔
    */
-  maintainUserIds: string | number;
+  maintainUserIds: string;
 
   /**
    * 设备状态 0正常 1异常
@@ -43,18 +43,27 @@ export interface DeviceVO {
    * 备注
    */
   remark: string;
+
+  /** 人员信息 */
+  maintainUserList: {
+    'userId': string;
+    'userName': string;
+    'nickName': string;
+    'phonenumber': number;
+  }[];
+  createTime?: string;
 }
 
 export interface DeviceForm extends BaseEntity {
   /**
    * 主键ID
    */
-  id?: string | number;
+  id?: string;
 
   /**
    * 设备分类ID
    */
-  categoryId?: string | number;
+  categoryId?: string;
 
   /**
    * 设备名称
@@ -79,7 +88,7 @@ export interface DeviceForm extends BaseEntity {
   /**
    * 维护人员ID，多个用,分隔
    */
-  maintainUserIds?: string | number;
+  maintainUserIds?: string;
 
   /**
    * 设备状态 0正常 1异常
@@ -96,7 +105,7 @@ export interface DeviceQuery extends PageQuery {
   /**
    * 设备分类ID
    */
-  categoryId?: string | number;
+  categoryId?: string;
 
   /**
    * 设备名称