Commit Graph

364 Commits

Author SHA1 Message Date
付民康
96dc1240ec Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/api/jyh/index.ts
2025-03-19 12:35:05 +08:00
付民康
847cfdcb4c 订阅列表接口对接 2025-03-19 12:34:08 +08:00
yfzmpj
eb0834fc52 merge wsw into master
feat: 个人中心信息api

Created-by: yfzmpj
Commit-by: 汪少伟
Merged-by: yfzmpj
Description: feat: 个人中心信息api

See merge request: hk_openRepo/OpenRepo_Portal!39
2025-03-19 12:31:36 +08:00
汪少伟
393c1f7299 feat: 个人中心信息api 2025-03-19 12:31:02 +08:00
付民康
17c0df7379 预警通知列表接口对接 2025-03-19 12:27:37 +08:00
付民康
e7eda07de7 logo替换 2025-03-19 12:15:11 +08:00
yfzmpj
8c229edfdf merge wsw into master
fix: bugs

Created-by: yfzmpj
Commit-by: yfzmpj;汪少伟
Merged-by: yfzmpj
Description: feat: 漏洞列表
feat: 漏洞列表api
fix: bugs

See merge request: hk_openRepo/OpenRepo_Portal!38
2025-03-19 12:10:00 +08:00
yfzmpj
7fbe6b8b76 Merge branch 'wsw' into 'master'
# Conflicts:
#   conflict src/api/jyh/index.ts
#   conflict src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue
2025-03-19 12:09:50 +08:00
汪少伟
8ae8dba0d4 fix: bugs 2025-03-19 12:08:19 +08:00
LovableCat
1b42dbac82 组织管理-成员列表查询功能 2025-03-19 12:00:35 +08:00
MaxShen
e48247ca30 merge dev-shenjianbin into master
预警详情优化

Created-by: MaxShen
Commit-by: MaxShen
Merged-by: MaxShen
Description: 邀请列表标题优化
预警详情优化

See merge request: hk_openRepo/OpenRepo_Portal!35
2025-03-19 11:58:46 +08:00
LovableCat
791bada66c merge lll-fix-nodata-img into master
组织管理-成员列表删除成员修复

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 组织管理-成员列表删除成员修复

See merge request: hk_openRepo/OpenRepo_Portal!36
2025-03-19 11:57:48 +08:00
LovableCat
a51d58dcbd 组织管理-成员列表删除成员修复 2025-03-19 11:57:22 +08:00
MaxShen
576a961d2b 邀请列表提示优化 2025-03-19 11:57:14 +08:00
MaxShen
026e89ab04 预警详情优化 2025-03-19 11:55:21 +08:00
MaxShen
f88e04f911 邀请列表标题优化 2025-03-19 11:22:21 +08:00
付民康
264af985d3 预警通知列表接口对接 2025-03-19 11:14:12 +08:00
付民康
d50ed3f2c1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/api/jyh/index.ts
2025-03-19 10:45:16 +08:00
付民康
3b819a07c3 软件校验接口对接 2025-03-19 10:44:39 +08:00
汪少伟
401cfbe05a feat: 漏洞列表api 2025-03-19 10:39:33 +08:00
汪少伟
28b6d7a8cb feat: 漏洞列表 2025-03-19 10:36:20 +08:00
MaxShen
bfab5e21be merge dev-shenjianbin into master
漏洞详情接口接入

Created-by: MaxShen
Commit-by: MaxShen
Merged-by: MaxShen
Description: 漏洞详情接口接入

See merge request: hk_openRepo/OpenRepo_Portal!34
2025-03-19 10:35:18 +08:00
MaxShen
8c1be60229 漏洞详情接口接入 2025-03-19 10:34:17 +08:00
yfzmpj
863e946f44 merge wsw into master
fix: login user

Created-by: yfzmpj
Commit-by: 汪少伟
Merged-by: yfzmpj
Description: fix: login user

See merge request: hk_openRepo/OpenRepo_Portal!33
2025-03-19 10:09:55 +08:00
汪少伟
26ad0a568e fix: login user 2025-03-19 10:08:49 +08:00
付民康
f13f4aa9d8 软件列表接口对接 2025-03-19 09:37:41 +08:00
LovableCat
6fca623d07 merge lll-fix-nodata-img into master
组织管理-成员列表total赋值问题

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 组织管理-成员列表total赋值问题

See merge request: hk_openRepo/OpenRepo_Portal!32
2025-03-18 22:44:10 +08:00
LovableCat
806d943829 组织管理-成员列表total赋值问题 2025-03-18 22:43:39 +08:00
user8949
06829060ba merge junjie_dev into master
fix: fix issue

Created-by: user8949
Commit-by: @user8949
Merged-by: user8949
Description: fix: fix issue

See merge request: hk_openRepo/OpenRepo_Portal!30
2025-03-18 22:29:25 +08:00
@user8949
7d6771cfcc update: 软件校验前端筛选 2025-03-18 22:27:36 +08:00
@user8949
9585479826 updata: 高级搜索语言调用接口获取 2025-03-18 22:16:20 +08:00
@user8949
32f9e81be2 Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into junjie_dev
# Conflicts:
#	src/views/Jyh/Search/Components/BatchVerify.vue
2025-03-18 22:11:29 +08:00
MaxShen
c63f93f9b3 merge dev-shenjianbin into master
订阅信息和漏洞详情

Created-by: MaxShen
Commit-by: MaxShen
Merged-by: MaxShen
Description: 订阅信息和漏洞详情

See merge request: hk_openRepo/OpenRepo_Portal!31
2025-03-18 22:06:53 +08:00
MaxShen
035a919659 订阅信息和漏洞详情 2025-03-18 22:06:02 +08:00
@user8949
e3b6b57be7 fix: fix issue 2025-03-18 22:01:02 +08:00
LovableCat
eb9aaac6f5 merge lll-fix-nodata-img into master
修复nodata组件img问题

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 修复nodata组件img问题

See merge request: hk_openRepo/OpenRepo_Portal!29
2025-03-18 21:33:32 +08:00
LovableCat
2726e5f5f6 修复nodata组件img问题 2025-03-18 21:31:07 +08:00
LovableCat
6c895a0237 merge lll-test into master
组织管理接口初步调试

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 组织管理接口初步调试

See merge request: hk_openRepo/OpenRepo_Portal!28
2025-03-18 21:21:23 +08:00
LovableCat
26c594c9d4 组织管理接口初步调试 2025-03-18 21:19:02 +08:00
付民康
260e8a5af7 Merge remote-tracking branch 'origin/master' 2025-03-18 21:08:36 +08:00
付民康
08e22f6cab 接口地址配置修改 2025-03-18 21:08:27 +08:00
MaxShen
b21f4f1c2a merge dev-shenjianbin into master
预警详情

Created-by: MaxShen
Commit-by: MaxShen
Merged-by: MaxShen
Description: 预警详情
Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into dev-shenjianbin

See merge request: hk_openRepo/OpenRepo_Portal!27
2025-03-18 21:03:32 +08:00
MaxShen
0b3b3c86cb Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into dev-shenjianbin 2025-03-18 21:02:00 +08:00
MaxShen
a1cf50f69f 预警详情 2025-03-18 21:01:21 +08:00
付民康
3d1dd05de0 Merge remote-tracking branch 'origin/master' 2025-03-18 20:41:01 +08:00
付民康
0f2315f1f6 批量校验相关issue修复 2025-03-18 20:40:18 +08:00
user8949
fdf72eb1a5 merge junjie_dev into master
fix: 修复issue

Created-by: user8949
Commit-by: @user8949
Merged-by: user8949
Description: fix: 修复issue

See merge request: hk_openRepo/OpenRepo_Portal!26
2025-03-18 20:29:23 +08:00
@user8949
1658890895 fix: fix issue 2025-03-18 20:29:01 +08:00
@user8949
3431d72cd1 Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into junjie_dev
# Conflicts:
#	src/api/jyh/index.ts
#	src/components/AdvanceSearch/index.vue
#	src/views/Jyh/Home/index.vue
2025-03-18 20:26:52 +08:00
@user8949
af1ce0d1bf fix: 修复issue 2025-03-18 20:20:37 +08:00