diff --git a/public/static/软件存在及可信校验模版.xlsx b/public/static/软件存在及可信校验模版.xlsx new file mode 100644 index 0000000..4d1e802 Binary files /dev/null and b/public/static/软件存在及可信校验模版.xlsx differ diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts index e7d3564..b204459 100644 --- a/src/api/jyh/index.ts +++ b/src/api/jyh/index.ts @@ -1,5 +1,6 @@ import { reqCatchV2, type catchRt } from '@/utils/catch'; import request from '@/utils/request'; +import * as types from '@/api/repo/types'; // 详情-获取版本信息 export function releaseInfo(params: { softwareId: string }): Promise { @@ -142,19 +143,40 @@ export const getVulnDetail = (data): Promise => { data }) ); -}; +} -// 获取漏洞数据 -export const dependencyTree = (softwareId: any): Promise => { +// 迁移批量导入 +export function repoImport(data: types.commonRepoReqType){ return reqCatchV2(() => request({ - url: `/api/v1/repo/dependency/tree`, - method: 'POST', - data: { - softwareId, - current: 1, - size: 99999 - } + url: `/api/v1/home/software/valid`, + method: 'post', + data, + headers: { + 'Content-Type': 'multipart/form-data', // 设置请求头 + }, }) ); -}; +} + +// 个人中心-获取预警列表 +export const getNoticeList = (data): Promise => { + return reqCatchV2(() => + request({ + url: `/api/v1/alert/notice/list`, + method: 'POST', + data, + }) + ); +} + +// 个人中心-获取组织级预警列表 +export const getgroupNoticeList = (data): Promise => { + return reqCatchV2(() => + request({ + url: `/api/v1/alert/group/notice/list`, + method: 'POST', + data, + }) + ); +} diff --git a/src/api/organizationManage/organizationManageApi.ts b/src/api/organizationManage/organizationManageApi.ts index cdeaf3c..ee46843 100644 --- a/src/api/organizationManage/organizationManageApi.ts +++ b/src/api/organizationManage/organizationManageApi.ts @@ -40,7 +40,7 @@ export function inviteOrganizationMemberApi(params: { groupId: number, username: export function deleteOrganizationMemberApi(params: { groupId: number, username: string }): Promise> { return request({ url: `/api/v1/group/member/remove`, - method: 'delete', + method: 'post', data: params, }); } diff --git a/src/components/FileUploadButton/index.vue b/src/components/FileUploadButton/index.vue index 2ccb806..13ec99b 100644 --- a/src/components/FileUploadButton/index.vue +++ b/src/components/FileUploadButton/index.vue @@ -56,7 +56,7 @@ const handleFileUpload = async (event) => { const file = event.target.files[0]; // 获取选择的文件 if (file) { // 检查文件类型 - if (file.type === 'text/xml' || file.name.endsWith('.xml')) { + if (file.type === 'text/xml' || file.name.endsWith('.xml') || file.name.endsWith('.xlsx')) { loading.value = true; // 显示加载状态 try { await props.onFileUpload(file); // 调用父组件传递的上传方法 diff --git a/src/components/Header/Notice.vue b/src/components/Header/Notice.vue index d40009e..459986f 100644 --- a/src/components/Header/Notice.vue +++ b/src/components/Header/Notice.vue @@ -24,7 +24,7 @@ const getCounts = () => { }; onMounted(() => { - getCounts(); + // getCounts(); addEventListener('updateNotice', debounce((count: number) => { counts.value = count; }, 500)); diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 7410311..62e9a6c 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -59,7 +59,7 @@
- 信息公示 + 预警公告
更多 >
@@ -89,7 +89,7 @@ - + diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue index 42ecfba..df84f8c 100644 --- a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue +++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue @@ -1,7 +1,7 @@