Commit Graph

60 Commits

Author SHA1 Message Date
汪少伟
78d93e1252 fix: bug 2025-03-21 10:38:50 +08:00
汪少伟
125f781ac5 fix: bug 2025-03-21 10:30:37 +08:00
yfzmpj
60a3d3d2d0 merge wsw into master
fix: bugs

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

See merge request: hk_openRepo/OpenRepo_Portal!60
2025-03-20 20:19:59 +08:00
汪少伟
4690879e2c fix: bugs 2025-03-20 20:19:20 +08:00
付民康
c851542fde 新建组织后,需要刷新才能看到组织信息修复 2025-03-20 17:44:54 +08:00
MaxShen
13b71b2257 Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into dev-shenjianbin 2025-03-20 17:09:34 +08:00
MaxShen
d2cc3b3e61 预警公告弹窗优化 2025-03-20 17:09:22 +08:00
汪少伟
25f7823cd4 fix: bugs 2025-03-20 16:30:06 +08:00
@user8949
939fa0fb70 update: 严重程度tag更新 2025-03-19 21:08:08 +08:00
LovableCat
04c29049b5 邀请通知更新 2025-03-19 14:30:43 +08:00
LovableCat
44ab42d0c3 merge lll-fix-nodata-img into master
邀请通知更新

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 邀请通知更新

See merge request: hk_openRepo/OpenRepo_Portal!45
2025-03-19 13:55:15 +08:00
LovableCat
64a6e4e362 邀请通知更新
https://gitcode.com/hk_openRepo/OpenRepo_Portal/issues/69
2025-03-19 13:54:25 +08:00
LovableCat
f8238e5930 merge lll-fix-nodata-img into master
组织管理-成员列表查询功能

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 组织管理-成员列表查询功能

See merge request: hk_openRepo/OpenRepo_Portal!37
2025-03-19 12:46:10 +08:00
付民康
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
汪少伟
393c1f7299 feat: 个人中心信息api 2025-03-19 12:31:02 +08:00
付民康
17c0df7379 预警通知列表接口对接 2025-03-19 12:27:37 +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
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
MaxShen
035a919659 订阅信息和漏洞详情 2025-03-18 22:06:02 +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
MaxShen
a1cf50f69f 预警详情 2025-03-18 21:01:21 +08:00
付民康
77796cbcae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/api/jyh/index.ts
#	src/components/AdvanceSearch/index.vue
2025-03-18 17:45:08 +08:00
付民康
6c61ac9f73 软件列表及软件版本详情接口对接 2025-03-18 17:43:51 +08:00
LovableCat
1cc76ee2f2 merge lll into master
所有软件/组件的名称统一改成软件

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 解决 组织介绍的文本框长度不够,无法显示200个字 问题
所有软件/组件的名称统一改成软件

See merge request: hk_openRepo/OpenRepo_Portal!23
2025-03-18 17:38:12 +08:00
LovableCat
61b3a9d3f6 所有软件/组件的名称统一改成软件
https://gitcode.com/hk_openRepo/OpenRepo_Portal/issues/33
2025-03-18 17:37:09 +08:00
MaxShen
a252eda5c7 预警详情修改 2025-03-18 17:24:35 +08:00
LovableCat
91001eaaab 解决 组织介绍的文本框长度不够,无法显示200个字 问题
https://gitcode.com/hk_openRepo/OpenRepo_Portal/issues/28
2025-03-18 17:19:32 +08:00
MaxShen
6c3635ddab 邀请列表接口接入 2025-03-18 17:13:54 +08:00
汪少伟
9429fe96c7 feat: 个人中心 2025-03-18 15:33:54 +08:00
付民康
ecdb6e92b9 用户信息接口对接Mock数据 2025-03-17 19:25:02 +08:00
汪少伟
a169e5b3ce fix: 组织订阅消息添加字段订阅人 2025-03-17 09:00:53 +08:00
汪少伟
2adec4c984 feat: 组织预警通知列弹窗 2025-03-16 12:22:52 +08:00
汪少伟
cbf515d61c fix: 冲突 2025-03-16 11:30:21 +08:00
汪少伟
d59476543a feat: 组织预警列表 2025-03-16 11:20:22 +08:00
汪少伟
24d1195d37 feat: 组织预警列表 2025-03-16 11:15:06 +08:00
LovableCat
5956feb543 merge lll-user-organization into master
新增组织管理内容

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 新增组织管理内容

See merge request: hk_openRepo/OpenRepo_Portal!14
2025-03-15 18:09:54 +08:00
LovableCat
a7b9c0ffad 新增组织管理内容 2025-03-15 18:08:35 +08:00
shenjianbin
a1f573b729 邀请通知列表 2025-03-15 17:37:22 +08:00