Merge branch 'main' into feature/linzhijun_扣子智能体_0710

# Conflicts:
#	src/components/_base/navbar/index.vue
#	src/main.ts
#	src/permission/permission.ts
#	vite.config.ts

src/api/all/common.ts

@@ -13,3 +13,52 @@ export const getCustomColumns = (params = {}) => {
 export const updateCustomColumns = (params = {}) => {
   return Http.put('/v1/custom-columns', params);
 };
+
+export const getUserList = (params = {}) => {
+  return Http.get('/v1/users/list', params);
+};
+
+// 任务中心-分页
+export const getTask = (params = {}) => {
+  return Http.get('/v1/tasks', params);
+};
+
+// 任务中心-批量删除
+export const deleteBatchTasks = (params = {}) => {
+  return Http.delete('/v1/tasks', { data: params });
+};
+
+// 任务中心-删除
+export const deleteTask = (id: string) => {
+  return Http.delete(`/v1/tasks/${id}`);
+};
+
+// 任务中心-查询任务状态
+export const getTaskStatus = (id: string) => {
+  return Http.get(`/v1/tasks/${id}/status`);
+};
+
+// 任务中心-获取未读任务
+export const getTaskUnread = () => {
+  return Http.get(`/v1/tasks/unread`);
+};
+
+// 任务中心-已读
+export const patchTaskRead = (params = {}) => {
+  return Http.patch('/v1/tasks/read', params);
+};
+
+// 任务中心-重做任务
+export const postRedoTask = (id: string) => {
+  return Http.post(`/v1/tasks/${id}/redo`);
+};
+
+// 任务中心-批量下载
+export const postBatchDownload = (params = {}) => {
+  return Http.post(`/v1/tasks/batch-download`, params);
+};
+
+// 任务中心-批量查询任务状态
+export const batchQueryTaskStatus = (params = {}) => {
+  return Http.get(`/v1/tasks/batch-query-status`, params);
+};

src/api/all/propertyMarketing.ts

@@ -24,6 +24,11 @@ export const getMediaAccounts = (params = {}) => {
   return Http.get('/v1/media-accounts', params);
 };
 
+// 媒体账号-列表
+export const getMediaAccountList = (params = {}) => {
+  return Http.get('/v1/media-accounts/list', params);
+};
+
 // 媒体账号-健康情况
 export const getMediaAccountsHealth = (params = {}) => {
   return Http.get('/v1/media-accounts/health', params);
@@ -294,7 +299,7 @@ export const getPlacementAccountProjectsTrend = (params = {}) => {
 export const getPlacementGuide = (params: {}) => {
   return Http.get(`/v1/placement-account-projects/getGuideList`, params);
 };
-//查询投放指南历史
+// 查询投放指南历史
 export const getPlacementGuideHistory = (params: {}) => {
   return Http.get(`/v1/placement-account-projects/getGuideListHistory`, params);
 };
@@ -312,7 +317,7 @@ export const getPlacementGuideDetail = (id: string) => {
   return Http.get(`/v1/placement-account-projects/historylog/${id}`);
 };
 
-//删除记录
+// 删除记录
 export const deleteHistorylog = (id: string) => {
   return Http.delete(`/v1/placement-account-projects/historylog/${id}`);
 };
@@ -332,4 +337,68 @@ export const postPlacementAccountsSync = (id: string) => {
   return Http.post(`/v1/placement-accounts/${id}/sync-data`);
 };
 
+// 投放账号-子账号分页
+export const postSubAccount = (params = {}) => {
+  return Http.post('/v1/placement-accounts/get-subaccount', params);
+};
 
+// 投放账号-添加子账号
+export const postAddSubAccount = (params = {}) => {
+  return Http.post('/v1/placement-accounts/subaccount', params);
+};
+
+// 媒体账号-同步数据
+export const postSyncMediaAccountData = (id: string) => {
+  return Http.post(`/v1/media-accounts/${id}/sync-data`);
+};
+
+// 媒体账号-批量同步数据
+export const postBatchSyncMediaAccountData = (params: {}) => {
+  return Http.post(`/v1/media-accounts/batch-sync-data`, params);
+};
+
+// 媒体账号-查询同步状态
+export const getMediaAccountSyncStatus = (params = {}) => {
+  return Http.get('/v1/media-accounts/sync-status', params);
+};
+
+// 媒体账号-移除同步状态
+export const deleteSyncStatus = (id: string) => {
+  return Http.delete(`/v1/media-accounts/${id}/sync-status`);
+};
+
+// 内容稿件-列表
+export const getWorksList = (params = {}) => {
+  return Http.get('/v1/works/list', params);
+};
+
+// 项目管理-分页
+export const getProjects = (params = {}) => {
+  return Http.get('/v1/projects', params);
+};
+
+// 项目管理-列表
+export const getProjectList = () => {
+  return Http.get('/v1/projects/list');
+};
+
+// 项目管理-删除
+export const deleteProject = (id: string) => {
+  return Http.delete(`/v1/projects/${id}`);
+};
+
+// 项目管理-添加
+export const postAddProject = (params: {}) => {
+  return Http.post('/v1/projects', params);
+};
+
+// 项目管理-修改
+export const putProject = (params = {}) => {
+  const { id, ...rest } = params as { id: string; [key: string]: any };
+  return Http.put(`/v1/projects/${id}`, rest);
+};
+
+// 项目管理-详情
+export const getProjectDetail = (id: string) => {
+  return Http.get(`/v1/projects/${id}`);
+};