diff --git a/src/router/config/home.ts b/src/router/config/home.ts index 8c54c76..e84eb68 100644 --- a/src/router/config/home.ts +++ b/src/router/config/home.ts @@ -145,9 +145,9 @@ export default [ }, { - path: '/repoDetails/:versionId', + path: '/repoDetails/:versionId/:version?', name: 'RepoDetails', - component: () => import('@/views/Jyh/Version/Detail/index2.vue'), + component: () => import('@/views/Jyh/Version/Detail/repoDetails/index2.vue'), meta: { title: '软件版本详情', reportTitle: '软件版本详情页', diff --git a/src/views/Jyh/Version/Detail/Malware/Malware.vue b/src/views/Jyh/Version/Detail/Malware/Malware.vue index 41aadc7..22a5585 100644 --- a/src/views/Jyh/Version/Detail/Malware/Malware.vue +++ b/src/views/Jyh/Version/Detail/Malware/Malware.vue @@ -132,7 +132,7 @@ + + diff --git a/src/views/Jyh/Version/Detail/repoDetails/VulnProgress.vue b/src/views/Jyh/Version/Detail/repoDetails/VulnProgress.vue new file mode 100644 index 0000000..5c0465e --- /dev/null +++ b/src/views/Jyh/Version/Detail/repoDetails/VulnProgress.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/Jyh/Version/Detail/index2.vue b/src/views/Jyh/Version/Detail/repoDetails/index2.vue similarity index 82% rename from src/views/Jyh/Version/Detail/index2.vue rename to src/views/Jyh/Version/Detail/repoDetails/index2.vue index 2d9895f..908c191 100644 --- a/src/views/Jyh/Version/Detail/index2.vue +++ b/src/views/Jyh/Version/Detail/repoDetails/index2.vue @@ -31,23 +31,23 @@ 集成风险: - {{ ReleaseInfo.referenceInfo.integrationRisk || jcfxList[ReleaseInfo.basicInfo.integrationRiskLevel].text || '--' }} + {{ ReleaseInfo?.referenceInfo?.integrationRisk || jcfxList[ReleaseInfo.basicInfo.integrationRiskLevel].text || '--' }} -
- 订阅 - 已订阅 - - - - -
+ + + + + + + + + + + + + @@ -55,7 +55,7 @@ - + @@ -63,13 +63,13 @@
- - - - - - - + + + + + + +
@@ -80,13 +80,13 @@ import { ref, reactive, watch, onMounted,computed } from 'vue'; import { useRouter, useRoute } from 'vue-router'; import { getOrgInfo } from '@/views/Org/hooks/orgInfo'; -import VulnerabilitiesList from './VulnerabilitiesList.vue'; -import CommunityInfo from './CommunityInfo.vue'; +import VulnerabilitiesList from '../VulnerabilitiesList.vue'; +import CommunityInfo from '../CommunityInfo.vue'; import VersionInfo from './VersionInfo.vue'; -import SBOM from './SBOM.vue'; -import AIRepair from '../../AIRepair/index.vue'; -import LicenseInfo from '../../LicenseInfo/index.vue'; -import Dependence from './Dependency.vue' +import SBOM from '../SBOM.vue'; +import AIRepair from '../../../AIRepair/index.vue'; +import LicenseInfo from '../../../LicenseInfo/index.vue'; +import Dependence from '../Dependency.vue' import Malware from "@/views/Jyh/Version/Detail/Malware/Malware.vue"; import CodeQuality from "@/views/Jyh/Version/Detail/CodeQuality/index.vue"; import DeepDetectionAnalysis from "@/views/Jyh/Version/Detail/DeepDetectionAnalysis/index.vue"; @@ -111,7 +111,7 @@ const ReleaseInfo = ref({ openSourceLicenseList: [], referenceInfo: {}, }); -const versionId = route.params.versionId; // 获取路由参数 versionId +// const versionId = route.params.versionId; // 获取路由参数 versionId const jcfxList = { '0': { text: '', color: '#ef4444' }, // 红色 @@ -167,11 +167,11 @@ const getAlertIsSubscribe = async(versionId) => { } }; -const getReleaseList = async (softwareName) => { +const getReleaseList = async ({softwareName,softwareVersion}) => { const { data, error } = await releasePage({ - softwareName: '', + softwareName, searchType: '', - softwareVersion: '', + softwareVersion, programmingLanguage: '', interestTag: '', industry: '', @@ -192,8 +192,13 @@ const getReleaseList = async (softwareName) => { }; const init = async () => { - const versionName = route.params.versionId; // 获取路由参数 versionId - const { id:versionId=null } = await getReleaseList(versionName); + const softwareName = route.params.versionId; // 获取路由参数 versionId + const softwareVersion = route.params.version; // 获取路由参数 versionId + debugger + const data = await getReleaseList({ + softwareName,softwareVersion + }); + const versionId = data?.id || ''; softwareId.value = versionId; if (versionId) { await getReleaseInfo(versionId); // 调用接口获取数据