From c35a75d03072c7b40d1195310d92ed983d6f2e8b Mon Sep 17 00:00:00 2001 From: dhr <2216804034@qq.com> Date: Thu, 4 Sep 2025 22:56:00 +0800 Subject: [PATCH 1/2] 0904 --- .env.development | 2 +- src/api/equipment/index.ts | 96 +++++ src/api/equipment/types.ts | 165 +++++++ src/views/equipment/index.vue | 788 ++++++++++++++++++++++++++++++++++ 4 files changed, 1050 insertions(+), 1 deletion(-) create mode 100644 src/api/equipment/index.ts create mode 100644 src/api/equipment/types.ts create mode 100644 src/views/equipment/index.vue diff --git a/.env.development b/.env.development index eb8185a..764306d 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.188:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 diff --git a/src/api/equipment/index.ts b/src/api/equipment/index.ts new file mode 100644 index 0000000..b03d304 --- /dev/null +++ b/src/api/equipment/index.ts @@ -0,0 +1,96 @@ +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 => { + return request({ + url: '/gps/equipment/list', + method: 'get', + params: query + }); +}; + +/** + * 查询GPS设备详细详细 + * @param id + */ +export const getEquipment = (id: string | number): AxiosPromise => { + 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) => { + 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 + }); +} diff --git a/src/api/equipment/types.ts b/src/api/equipment/types.ts new file mode 100644 index 0000000..8b623d1 --- /dev/null +++ b/src/api/equipment/types.ts @@ -0,0 +1,165 @@ +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; + + /** + * 用户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; +} diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue new file mode 100644 index 0000000..d10d0f7 --- /dev/null +++ b/src/views/equipment/index.vue @@ -0,0 +1,788 @@ + + + From eb895793dd6c477d2035c2b41b57a0b3141e7e56 Mon Sep 17 00:00:00 2001 From: dhr <2216804034@qq.com> Date: Fri, 5 Sep 2025 15:11:21 +0800 Subject: [PATCH 2/2] 0905 --- src/api/equipment/index.ts | 7 + src/api/equipment/types.ts | 4 + src/views/equipment/equipmentGPS.vue | 18 ++ src/views/equipment/index.vue | 254 +++++++++++++-------------- 4 files changed, 150 insertions(+), 133 deletions(-) create mode 100644 src/views/equipment/equipmentGPS.vue diff --git a/src/api/equipment/index.ts b/src/api/equipment/index.ts index b03d304..6b13203 100644 --- a/src/api/equipment/index.ts +++ b/src/api/equipment/index.ts @@ -94,3 +94,10 @@ export function getRemoveBind(data: { id: number; clientId: string }) { data: data }); } + +export function getProjectId() { + return request({ + url: 'gps/equipment/getProjectList', + method: 'get' + }); +} diff --git a/src/api/equipment/types.ts b/src/api/equipment/types.ts index 8b623d1..71ec89b 100644 --- a/src/api/equipment/types.ts +++ b/src/api/equipment/types.ts @@ -117,6 +117,10 @@ export interface EquipmentQuery extends PageQuery { * 项目ID */ projectId?: string | number; + /** + * 是否绑定 + */ + type?: string | number; /** * 用户id diff --git a/src/views/equipment/equipmentGPS.vue b/src/views/equipment/equipmentGPS.vue new file mode 100644 index 0000000..9589b08 --- /dev/null +++ b/src/views/equipment/equipmentGPS.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue index d10d0f7..22fab09 100644 --- a/src/views/equipment/index.vue +++ b/src/views/equipment/index.vue @@ -41,6 +41,12 @@ {{ viewAllButtonText }} + + + + GPS定位 + + @@ -48,11 +54,20 @@ - - + + - + + + + + +