From 67a97aaafe4ed85752d8f1dbcb727910715006b0 Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:13:35 +0800 Subject: [PATCH 01/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=8CAI=E4=BF=AE=E5=A4=8D=E5=BB=BA=E8=AE=AE=20&=20?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E8=AF=81=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jyh/index.ts | 18 +++--- src/components/LicenseInfo/SidePanel.vue | 10 ++- src/views/Jyh/AIRepair/index.vue | 77 ++++-------------------- src/views/Jyh/Home/index.vue | 26 +++++--- src/views/Jyh/LicenseInfo/index.vue | 71 +++++++++++++--------- 5 files changed, 87 insertions(+), 115 deletions(-) diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts index c577a92..2b7aa46 100644 --- a/src/api/jyh/index.ts +++ b/src/api/jyh/index.ts @@ -103,9 +103,9 @@ export function getRepairInfo() { url: '/api/v1/repo/repair/info', method: 'POST', data: { - current: 1, - size: 10, - softwareId: 47 + "current": 1, + "size": 10, + "softwareId": 47 } }); } @@ -113,12 +113,12 @@ export function getRepairInfo() { // 获取许可证列表 export function getLicenseList() { return request({ - url: '/api/v1/repo/license/list', - method: 'GET', - params: { - current: 1, - size: 10, - softwareId: 47 + url: '/api/v1/repo/license/info', + method: 'POST', + data: { + "current": 1, + "size": 10, + "softwareId": 47 } }); } diff --git a/src/components/LicenseInfo/SidePanel.vue b/src/components/LicenseInfo/SidePanel.vue index e118232..9197f90 100644 --- a/src/components/LicenseInfo/SidePanel.vue +++ b/src/components/LicenseInfo/SidePanel.vue @@ -2,14 +2,14 @@
-

Apache License 2.0

+

{{ data.licenseName }}

分数 3 类型 - 获准的 + {{ data.category }}
@@ -78,7 +78,11 @@ diff --git a/src/views/Jyh/AIRepair/index.vue b/src/views/Jyh/AIRepair/index.vue index f73f259..106938c 100644 --- a/src/views/Jyh/AIRepair/index.vue +++ b/src/views/Jyh/AIRepair/index.vue @@ -24,7 +24,7 @@
严重 - Morgan + {{ rowItem.title }}
@@ -44,9 +44,9 @@
升级版本 - xxx + 1.7.0 - xxx + 1.9.1
@@ -106,25 +106,27 @@ const tableConfig = ref([ const list = ref([ { expand: true, + title: 'Morgan', data: { listData: [ - { + { securityProblemCode: '1', type: '安全问题', CWEcode: 'CWE-123', - score: 100 + score: 70 }, { securityProblemCode: '2', type: '安全问题', - CWEcode: 'CWE-123', - score: 100 + CWEcode: 'MIT-LICENSE', + score: 89 } ] } }, { expand: true, + title: 'webpack', data: { listData: [ { @@ -136,65 +138,8 @@ const list = ref([ { securityProblemCode: '2', type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - } - ] - } - }, - { - expand: true, - data: { - listData: [ - { - securityProblemCode: '1', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - }, - { - securityProblemCode: '2', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - } - ] - } - }, - { - expand: true, - data: { - listData: [ - { - securityProblemCode: '1', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - }, - { - securityProblemCode: '2', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - } - ] - } - }, - { - expand: true, - data: { - listData: [ - { - securityProblemCode: '1', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 - }, - { - securityProblemCode: '2', - type: '安全问题', - CWEcode: 'CWE-123', - score: 100 + CWEcode: 'MIT-LICENSE', + score: 90 } ] } diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 7410311..b18193c 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -54,7 +54,7 @@ 搜索 - 批量校验 + 批量校验
@@ -71,11 +71,11 @@
{{ item.subject }} - {{ item.importance }} + {{ tagMap[item.importance].text }}
- {{ item.pulishTime }} + {{ item.publishTime }}
@@ -100,7 +100,9 @@ import { useRoute, useRouter } from 'vue-router'; import AdvanceSearch from '@/components/AdvanceSearch/index.vue'; import { getHomeNoticeList } from '@/api/jyh' import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue'; +import { useAccountStore } from '@/stores/user'; +const userStore = useAccountStore(); const route = useRoute(); const router = useRouter(); const inputGlow = ref(false); @@ -121,9 +123,18 @@ const homeSearch = ref(null); const dropdownWidth = ref(0); const selectedCate = ref('软件'); const tagMap = { - '高': '#f66f6a', - '中': '#fac20a', - '低': '#5e7ce0' + 'High': { + text: '高', + color: '#f66f6a' + }, + 'Medium': { + text: '中', + color: '#fac20a' + }, + 'Low': { + text: '低', + color: '#5e7ce0' + } } const searchInput = ref(null); @@ -235,7 +246,6 @@ getNoticeList(); .home-content { font-size: 14px; - height: 50%; width: 50%; display: flex; flex-direction: column; @@ -408,7 +418,7 @@ getNoticeList(); display: flex; align-items: center; gap: 8px; - width: 120px; + width: 150px; flex-shrink: 0; } diff --git a/src/views/Jyh/LicenseInfo/index.vue b/src/views/Jyh/LicenseInfo/index.vue index 4b7a7e1..367fd2a 100644 --- a/src/views/Jyh/LicenseInfo/index.vue +++ b/src/views/Jyh/LicenseInfo/index.vue @@ -4,12 +4,15 @@ + @@ -30,7 +33,7 @@
- + @@ -38,6 +41,8 @@ import { ref } from 'vue'; import SidePanel from '@/components/LicenseInfo/SidePanel.vue'; import { getLicenseList } from '@/api/jyh'; +import NoData from '@/components/NoData/NoData.vue'; +const currentData = ref(null); const pager = ref({ pageIndex: 1, pageSize: 30, @@ -52,7 +57,8 @@ const close = () => { showDetail.value = false; } -const openPanel = () => { +const openPanel = (row) => { + currentData.value = row showDetail.value = true; } @@ -64,7 +70,7 @@ const tableConfig = ref([ sortMethod: null }, { - field: 'licenseType', + field: 'category', header: '许可证种类', sortable: false, sortMethod: null @@ -84,34 +90,41 @@ const tableConfig = ref([ ]) const list = ref([ - { - licenseName: 'Apache License 2.0', - licenseType: '获准的', - affectedComponent: 'org.apache.commons:commons-collections4', - version: '4.4', - }, - { - licenseName: 'Apache License 2.0', - licenseType: '获准的', - affectedComponent: 'org.apache.commons:commons-collections4', - version: '4.4', - }, - { - licenseName: 'Apache License 2.0', - licenseType: '获准的', - affectedComponent: 'org.apache.commons:commons-collections4', - version: '4.4', - }, - { - licenseName: 'Apache License 2.0', - licenseType: '获准的', - affectedComponent: 'org.apache.commons:commons-collections4', - version: '4.4', - } + // { + // licenseName: 'Apache License 2.0', + // licenseType: '获准的', + // affectedComponent: 'org.apache.commons:commons-collections4', + // version: '4.4', + // }, + // { + // licenseName: 'Apache License 2.0', + // licenseType: '获准的', + // affectedComponent: 'org.apache.commons:commons-collections4', + // version: '4.4', + // }, + // { + // licenseName: 'Apache License 2.0', + // licenseType: '获准的', + // affectedComponent: 'org.apache.commons:commons-collections4', + // version: '4.4', + // }, + // { + // licenseName: 'Apache License 2.0', + // licenseType: '获准的', + // affectedComponent: 'org.apache.commons:commons-collections4', + // version: '4.4', + // } ]) const getList = async() => { - const res = await getLicenseList() + const res: any = await getLicenseList(); + if (!res.error) { + console.log(res); + list.value = res.data.data.records; + pager.value.total = res.data.data.records.length; + } else { + list.value = []; + } } getList(); From 4f86eb9eb323754c8ba738f494accbaf0069ed41 Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:15:52 +0800 Subject: [PATCH 02/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index b18193c..8c7479c 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -71,7 +71,7 @@
{{ item.subject }} - {{ tagMap[item.importance].text }} + {{ tagMap[item.importance]?.text }}
From 9b5278a1423e9b191e97b81de44904776b7045ae Mon Sep 17 00:00:00 2001 From: MaxShen <997186306@qq.com> Date: Wed, 19 Mar 2025 13:22:15 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 62e9a6c..bcfd4e5 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -61,7 +61,7 @@ 预警公告
- 更多 > + 更多 >
@@ -100,7 +100,10 @@ import { useRoute, useRouter } from 'vue-router'; import AdvanceSearch from '@/components/AdvanceSearch/index.vue'; import { getHomeNoticeList } from '@/api/jyh' import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue'; +import { useDiscussGetUserInfo } from '@/api/discussion/hook'; +// 获取当前用户信息 & 是否登录 +const { isLogin = false, userInfo = {}} = useDiscussGetUserInfo(); const route = useRoute(); const router = useRouter(); const inputGlow = ref(false); From 54d10ebdc6703a325a394af94631e2f3707fffbe Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:22:34 +0800 Subject: [PATCH 04/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 8c7479c..4fe718c 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -123,6 +123,10 @@ const homeSearch = ref(null); const dropdownWidth = ref(0); const selectedCate = ref('软件'); const tagMap = { + 'Critical': { + text: '致命', + color: '#c7000b' + }, 'High': { text: '高', color: '#f66f6a' @@ -420,6 +424,9 @@ getNoticeList(); gap: 8px; width: 150px; flex-shrink: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } :deep(.devui-timeline-item-data-right) { From 20c85c8e80eb3fe173a2b26cf15f866f8ff54515 Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:29:09 +0800 Subject: [PATCH 05/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index b102c3c..19f600a 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -71,7 +71,7 @@
{{ item.subject }} - {{ item.importance }} + {{ tagMap[item.importance].text }}
@@ -124,9 +124,22 @@ const homeSearch = ref(null); const dropdownWidth = ref(0); const selectedCate = ref('软件'); const tagMap = { - '高': '#f66f6a', - '中': '#fac20a', - '低': '#5e7ce0' + 'Critical': { + text: '致命', + color: '#c7000b' + }, + 'High': { + text: '高', + color: '#f66f6a' + }, + 'Medium': { + text: '中', + color: '#fac20a' + }, + 'Low': { + text: '低', + color: '#5e7ce0' + } } const searchInput = ref(null); @@ -238,7 +251,6 @@ getNoticeList(); .home-content { font-size: 14px; - height: 50%; width: 50%; display: flex; flex-direction: column; From c1941eb113aa64b692b93b44b64f2d249f5c209e Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:30:27 +0800 Subject: [PATCH 06/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 19f600a..c535444 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -54,7 +54,7 @@ 搜索
- 批量校验 + 批量校验
@@ -75,7 +75,7 @@
- {{ item.pulishTime }} + {{ item.publishTime }}
From 300faeae48c70a8460fe0299449abd6d85a8c213 Mon Sep 17 00:00:00 2001 From: "@user8949" Date: Wed, 19 Mar 2025 13:32:35 +0800 Subject: [PATCH 07/16] =?UTF-8?q?update:=20=E9=A6=96=E9=A1=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Home/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index c535444..ea6bc45 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -423,8 +423,11 @@ getNoticeList(); display: flex; align-items: center; gap: 8px; - width: 120px; + width: 150px; flex-shrink: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } :deep(.devui-timeline-item-data-right) { From 1c628d1538b9c17952d1effc04c326034c0b02cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Wed, 19 Mar 2025 13:39:31 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9C=AA=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Search/Components/OssQuery.vue | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue index 452776f..8e98386 100644 --- a/src/views/Jyh/Search/Components/OssQuery.vue +++ b/src/views/Jyh/Search/Components/OssQuery.vue @@ -84,8 +84,9 @@
+ :can-change-page-size="true" :can-view-total="true" total-item-text="总计" + @page-index-change="getReleaseList()" + @page-size-change="getReleaseList()" />
@@ -230,15 +231,6 @@ const gotoDetail = (row) => { path: 'repoDetail/' + row.id }); }; -// 分页 -const changeIndex = () => { - // getGroupClaListData(); -}; - -const changeSize = () => { - pager.value.pageIndex = 1; - // getGroupClaListData(); -}; const repoFun = (arr: any) => { return arr ? (arr.length > 3 ? arr.slice(0, 3) : arr) : []; @@ -305,7 +297,9 @@ const getReleaseList = async() => { ...newFormData.value, releaseDateStart: newFormData.value.dateRange&&newFormData.value.dateRange.length>0?newFormData.value.dateRange[0]:'', releaseDateEnd: newFormData.value.dateRange&&newFormData.value.dateRange.length>0?newFormData.value.dateRange[1]:'', - current: pager.value.pageIndex,size: pager.value.pageSize }); + current: pager.value.pageIndex, + size: pager.value.pageSize + }); if (!error && data) { tableData.value = data.data.records; pager.value.total = data.data.total; From 4acad9ce302f9d2cd7d9c5a4126b553cb74b8755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Wed, 19 Mar 2025 13:43:53 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=85=AC=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.pre | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.env.pre b/.env.pre index 6dc1e09..847f281 100644 --- a/.env.pre +++ b/.env.pre @@ -2,13 +2,13 @@ VITE_ENV = 'pre' # 主域名 -VITE_HOST = 'https://pre.gitcode.com' +VITE_HOST = 'http://223.76.236.155:30010/openRepoPortal' # 接口地址 -VITE_API_HOST = 'https://pre-web-api.gitcode.com' +VITE_API_HOST = '/gateway/official' # devPress接口地址 -VITE_DEV_API_HOST = 'https://gitcode.com' +VITE_DEV_API_HOST = '/gateway/official' # devPress地址 VITE_DEV_HOST = 'https://gitcode.com' @@ -26,7 +26,7 @@ VITE_CSDN_URL = 'https://pre-web-api.gitcode.com/oauth/login/csdn' VITE_ORG_COMMUNITY = 'https://gitcode.com' # 静态资源域名 -VITE_STATIC_HOST = 'https://pre.gitcode.com' +VITE_STATIC_HOST = 'http://223.76.236.155:30010/openRepoPortal' # 主页搜索子应用 VITE_CHILD_HOMEWEB_HOST = 'https://pre-homepage-app.gitcode.com' @@ -36,3 +36,5 @@ VITE_USER_CENTER_HOST = 'https://pre-usercenter-app.gitcode.com' # ai-copilot 子应用 VITE_COPILOT_HOST = 'https://pre-copilot-app.gitcode.com' + +VITE_BASE_URL=/openRepoPortal/ From 64a6e4e36235a9fb865a730b10663c3292b5c4d4 Mon Sep 17 00:00:00 2001 From: LovableCat Date: Wed, 19 Mar 2025 13:54:25 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E9=82=80=E8=AF=B7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20https://gitcode.com/hk=5FopenRepo/OpenRepo?= =?UTF-8?q?=5FPortal/issues/69?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../Jyh/PersonalCenter/Detail/InvitationNoticeList.vue | 6 ++++-- .../OrganizationManage/OrganizationManage.vue | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index bfada84..c312fa9 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "axios": "^1.6.8", "canvas-confetti": "^1.9.2", "crypto-js": "^4.1.1", - "dayjs": "^1.11.9", + "dayjs": "^1.11.13", "devui-theme": "^0.0.7", "dompurify": "^3.0.5", "js-cookie": "^3.0.5", diff --git a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue index 187de92..e2f6dd7 100644 --- a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue +++ b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue @@ -56,6 +56,7 @@ import { acceptInvite, getInviteListData } from '@/api/jyh'; import { ref, shallowReactive } from 'vue'; import NoData from "@/components/NoData/NoData.vue"; import { Message } from 'vue-devui'; +import dayjs from "dayjs"; const noticeTableData = ref([]); const pager = shallowReactive({ @@ -74,7 +75,8 @@ const queryInviteListData = async () => { noticeTableData.value = data.data.data.data.map(item => { return { ...item, - content: `尊敬的用户，您好！为更好地整合资源、协同开发，现诚邀您加入${item.name}。` + content: `现诚邀您加入组织【${item.name}】。`, + createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'), } }); pager.total = data.data.data.data.length; @@ -106,4 +108,4 @@ const handleAccept = async (row, type) => { text-align: right; } } - \ No newline at end of file + diff --git a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue index 168b731..7365a03 100644 --- a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue +++ b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue @@ -142,6 +142,7 @@ import { type UserInfoType, } from '@/api/organizationManage/organizationManageType'; import {getUserInfo} from "@/api/user"; +import dayjs from "dayjs"; const userInfo = shallowRef({ username: '', @@ -323,7 +324,9 @@ async function getMemberList() { try { const res = await getOrganizationMemberListApi({ groupId: organizationInfo.value.groupId }); if (res.data?.code === 200) { - originMemberList = res.data?.data; + originMemberList = res.data?.data.map(item => { + return { ...item, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }; + }); pager.total = originMemberList.length; updateFilterTableList(); } else { From 04c29049b5f35241a157a01738933515dec9805b Mon Sep 17 00:00:00 2001 From: LovableCat Date: Wed, 19 Mar 2025 14:30:43 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E9=82=80=E8=AF=B7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue index f5df700..1a3d349 100644 --- a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue +++ b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue @@ -74,7 +74,7 @@ const queryInviteListData = async () => { noticeTableData.value = data.data.data.data.map(item => { return { ...item, - content: `现诚邀您加入组织【${item.name}】。`, + content: `尊敬的用户，您好！为更好地整合资源、协同开发，现诚邀您加入组织【${item.name}】。`, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'), } }); From 081b6c74e347b6456d1194db6ece89cbae49ca58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Wed, 19 Mar 2025 16:20:20 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Jyh/Search/Components/OssQuery.vue | 1 + .../Version/Detail/VulnerabilitiesList.vue | 47 +++++++++---------- src/views/Jyh/Version/Detail/index.vue | 3 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue index f5d1754..c7299ab 100644 --- a/src/views/Jyh/Search/Components/OssQuery.vue +++ b/src/views/Jyh/Search/Components/OssQuery.vue @@ -119,6 +119,7 @@ import { Message } from 'vue-devui'; import { storeToRefs } from 'pinia'; import CountryModal from './CountryModal.vue' import OrgModal from './OrgModal.vue' +import NoData from '@/components/NoData/NoData.vue'; import { useAccountStore } from '@/stores/user'; const { formatTime } = useTimeFormat(); import { releasePage } from '@/api/jyh'; diff --git a/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue b/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue index 18c85af..dd71e5e 100644 --- a/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue +++ b/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue @@ -1,7 +1,7 @@