From 030dc5a8d1eaa0f25520034bdb00c41e7ac08852 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 13 Sep 2023 15:50:09 +0800
Subject: [PATCH] 冲突修改

---
 src/api/manage.ts |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/api/manage.ts b/src/api/manage.ts
index 34afc15..27886d9 100644
--- a/src/api/manage.ts
+++ b/src/api/manage.ts
@@ -2,7 +2,7 @@
 import request, { CommonListResponse, IListWorkspaceResponse, IPage, IWorkspaceResponse } from '/@/api/http/request'
 import { Device } from '/@/types/device'
 
-const HTTP_PREFIX = 'system/auth'
+const HTTP_PREFIX = 'api/system'
 
 // login
 export interface LoginBody {
@@ -100,6 +100,17 @@
   return result.data
 }
 
+export const getUserPage = async function (params: any, body: IPage): Promise<CommonListResponse<any>> {
+
+  console.log(params,"++++++++++++++")
+
+  const url = `${HTTP_PREFIX}/user/page`
+  const result = await request.get(url,{params:{...params,pageNum:body.current,pageSize:body.size}})
+  return result.data
+}
+
+
+
 export const updateUserInfo = async function (wid: string, user_id: string, body: {}): Promise<IWorkspaceResponse<any>> {
   const url = `${HTTP_PREFIX}/users/${wid}/users/${user_id}`
   const result = await request.put(url, body)
@@ -137,6 +148,18 @@
   return result.data
 }
 
+/**
+ * 获取设备信息
+ * @param params
+ */
+export const getDeviceList = async function (params:any): Promise<IListWorkspaceResponse<Device>> {
+  const url = `${HTTP_PREFIX}/manage/device/getPage`
+  const result = await request.get(url,{params})
+  return result.data
+}
+
+
+
 export const updateDevice = async function (body: {}, workspace_id: string, device_sn: string): Promise<IWorkspaceResponse<any>> {
   const url = `${HTTP_PREFIX}/devices/${workspace_id}/devices/${device_sn}`
   const result = await request.put(url, body)

--
Gitblit v1.9.3