Merge branch 'dev'

Author: dataeaseShu

frontend/package.json

@@ -37,6 +37,7 @@
     "vue-dompurify-html": "^5.3.0",
     "vue-i18n": "^9.14.4",
     "vue-router": "^4.5.0",
+    "vue-types": "^6.0.0",
     "web-storage-cache": "^1.1.1"
   },
   "devDependencies": {

frontend/src/api/user.ts

@@ -0,0 +1,27 @@
+import { request } from '@/utils/request'
+
+export const userImportApi = {
+  downExcelTemplateApi: () => request.post('/user/excelTemplate', {}, { responseType: 'blob' }),
+  importUserApi: (data: any) =>
+    request.post('/user/batchImport', data, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    }),
+  downErrorRecordApi: (key: string) =>
+    request.get(`/user/errorRecord/${key}`, { responseType: 'blob' }),
+  clearErrorApi: (key: string) => {
+    request.get(`/user/clearErrorRecord/${key}`)
+  },
+}
+
+export const userApi = {
+  pager: (params: any, pageNumber: number, pageSize: number) =>
+    request.get(`/user/pager/${pageNumber}/${pageSize}${params}`),
+  add: (data: any) => request.post('/user', data),
+  edit: (data: any) => request.put('/user', data),
+  clearErrorApi: (key: string) => request.get(`/user/clearErrorRecord/${key}`),
+  delete: (key: string) => request.delete(`/user/${key}`),
+  get: (key: string) => request.get(`/user/${key}`),
+  pwd: (data: any) => request.put('/user/pwd', data),
+}

frontend/src/api/workspace.ts

@@ -0,0 +1,9 @@
+import { request } from '@/utils/request'
+
+export const workspaceUserList = (params: any, pageNum: number, pageSize: number) =>
+  request.get(`/system/workspace/uws/pager/${pageNum}/${pageSize}`, { params })
+
+export const workspaceCreate = (data: any) => request.post('/system/workspace/uws', data)
+export const workspaceDelete = (data: any) => request.delete('/system/workspace/uws', data)
+export const workspaceList = () => request.get('/system/workspace')
+export const workspaceDetail = (id: any) => request.get(`/system/workspace/${id}`)