合并

src/api/equipment/index.ts

@@ -0,0 +1,103 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { EquipmentVO, EquipmentForm, EquipmentQuery } from '@/api/equipment/types';
+
+/**
+ * 查询GPS设备详细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listEquipment = (query?: EquipmentQuery): AxiosPromise<EquipmentVO[]> => {
+  return request({
+    url: '/gps/equipment/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询GPS设备详细详细
+ * @param id
+ */
+export const getEquipment = (id: string | number): AxiosPromise<EquipmentVO> => {
+  return request({
+    url: '/gps/equipment/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增GPS设备详细
+ * @param data
+ */
+export const addEquipment = (data: EquipmentForm) => {
+  return request({
+    url: '/gps/equipment',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改GPS设备详细
+ * @param data
+ */
+export const updateEquipment = (data: EquipmentForm) => {
+  return request({
+    url: '/gps/equipment',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除GPS设备详细
+ * @param id
+ */
+export const delEquipment = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/gps/equipment/' + id,
+    method: 'delete'
+  });
+};
+
+export const bindUser = (data) => {
+  return request({
+    url: '/gps/equipment/bindManmachine',
+    method: 'post',
+    data: data
+  });
+};
+
+export const getUserId = (projectId) => {
+  return request({
+    url: '/gps/equipment/userList',
+    method: 'get',
+
+    params: { projectId }
+  });
+};
+export const gethistroyUser = (data) => {
+  return request({
+    url: '/gps/equipment/getUserList',
+    method: 'get',
+    params: data
+  });
+};
+
+// 解除绑定接口定义（确保使用POST方法并正确传递data）
+export function getRemoveBind(data: { id: number; clientId: string }) {
+  return request({
+    url: '/gps/equipment/unbindManmachine',
+    method: 'post',
+    data: data
+  });
+}
+
+export function getProjectId() {
+  return request({
+    url: 'gps/equipment/getProjectList',
+    method: 'get'
+  });
+}

src/api/equipment/types.ts

@@ -0,0 +1,169 @@
+export interface EquipmentVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface EquipmentForm extends BaseEntity {
+  /**
+   *
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp?: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr?: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime?: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime?: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface EquipmentQuery extends PageQuery {
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+  /**
+   * 是否绑定
+   */
+  type?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备标识
+   */
+  clientId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 是否使用UDP协议：0=否，1=是
+   */
+  udp?: number;
+
+  /**
+   * 远程连接地址（IP:端口）
+   */
+  remoteAddressStr?: string;
+
+  /**
+   * 连接创建时间
+   */
+  creationTime?: number;
+
+  /**
+   * 最后活动时间
+   */
+  lastAccessedTime?: number;
+
+  /**
+   * 是否已注册：0=未注册，1=已注册
+   */
+  registered?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/project/constructionUser/index.ts

@@ -203,3 +203,31 @@ export const importConstructionUserInfo = (file: string) => {
     data: { file }
   });
 };
+
+
+// 获取项目列表
+export const ProjectList = (query) => {
+  return request({
+    url: '/contractor/constructionUser/projectList',
+    method: 'get',
+    params: query
+  });
+};
+
+// 获取班组列表
+export const TeamList = (query) => {
+  return request({    
+    url: '/contractor/constructionUser/teamList',
+    method: 'get',
+    params: query
+  });
+};
+
+// 班组分配
+export const TeamDistribution = (data) => {
+  return request({
+    url: '/contractor/constructionUser/addTeam',
+    method: 'post',
+    data: data
+  });
+};

src/api/project/constructionUser/types.ts

@@ -182,6 +182,8 @@ export interface ConstructionUserVO {
    * 创建时间
    */
   createTime: string;
+
+  sysUserId: string | number;
 }
 export interface skipType {
   /**

src/api/project/projectTeam/index.ts

@@ -72,3 +72,12 @@ export const delProjectTeam = (id: string | number | Array<string | number>) =>
     method: 'delete'
   });
 };
+
+// 获取项目得打卡范围
+export const getProjectTeamClockIn = (params) => {
+  return request({
+    url: '/project/projectTeam/rangeList',
+    method: 'get',
+    params
+  });
+};

src/api/project/projectTeam/types.ts

@@ -55,6 +55,11 @@ export interface ProjectTeamForm extends BaseEntity {
    * 备注
    */
   remark?: string;
+  
+  /**
+   * 创建时间
+   */
+  punchRangeList?: [];
 }
 
 export interface ProjectTeamQuery extends PageQuery {