From 081b6c74e347b6456d1194db6ece89cbae49ca58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Wed, 19 Mar 2025 16:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=8F=82=E6=95=B0=E4=BF=AE=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 @@
 <template>
   <div class="soft-detail-container">
     <div class="mt-3">
-      <d-table class="jyh-table" v-if="tableData.length" :striped="false" :data="valLists" table-layout="auto">
+      <d-table class="jyh-table" v-if="tableData.length>0" :striped="false" :data="tableData" table-layout="auto">
         <d-column type="index" width="40"></d-column>
         <d-column field="vulnId" header="编码" filterable :filter-list="filterList" @filter-change="handleFilterChange">
           <template #default="scope">
@@ -66,7 +66,7 @@
         </d-column>
       </d-table>
 
-      <DataPanel v-else skeleton :card="false" :empty="true"> </DataPanel>
+      <NoData v-else :small="false"></NoData>
     </div>
 
     <div class="mt-20 mb-20 flex justify-end">
@@ -110,7 +110,7 @@
 import * as dayjs from 'dayjs';
 import SettingTitle from '@/components/Setting/SettingTitle/index.vue';
 import SettingText from '@/components/Setting/SettingText/index.vue';
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted,defineProps } from 'vue';
 import { getGroupClaList, setGroupClaStatus, deleteGroupCla } from '@/api/cla';
 import { useRouter, useRoute } from 'vue-router';
 import { GModal } from '@/components/Setting/index';
@@ -119,23 +119,10 @@ import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
 import { Message } from 'vue-devui';
 import VulnerabilityDetail from '@/views/Jyh/Version/Detail/VulnerabilityDetail.vue';
 import { getVulnList } from '@/api/jyh';
+import NoData from '@/components/NoData/NoData.vue';
 const { namespace } = getOrgInfo();
-
-const tableData = ref([
-  {
-    versionName: 'HWPSIRT-2022-29348',
-    version: '未修复',
-    code: '7.8 (CVSS3.1)',
-    name: 'CVE-2013-0293',
-    type: '客户指定预装软件（原预装软件）',
-    risk: '中',
-    useType: '软件',
-    versionCode: '2.29.0',
-    key: '',
-    created: '2025-03-10 17:25:19',
-    updated: '2025-03-10 17:25:19'
-  }
-]);
+const propsData = defineProps(['versionId']);
+const tableData = ref([]);
 const formData = ref({
   title: '',
   type: '',
@@ -248,20 +235,28 @@ const openVulnDetail = (row) => {
     currentVuln.value = row;
   } else {
     currentVuln.value = {
-      softwareId: 47,
+      // softwareId: 47,
+      softwareId: propsData.versionId,
       id: 72
     };
   }
 };
 
-const valLists = ref([]);
-onMounted(async () => {
-  const data = await getVulnList({
-    softwareId: 47,
+const fetchVulnList = async () => {
+  const { data } = await getVulnList({
+    // softwareId: 47,
+    softwareId: propsData.versionId,
     current: 1,
     size: 10
   });
-  valLists.value = data?.data?.data?.data?.records || [];
+  if(data.data.code===200) {
+    tableData.value = data?.data?.data?.records || [];
+  }
+}
+
+const valLists = ref([]);
+onMounted( () => {
+  fetchVulnList()
 });
 </script>
 
@@ -269,7 +264,7 @@ onMounted(async () => {
 @import 'devui-theme/styles-var/devui-var.scss';
 
 .soft-detail-container {
-  padding: 7px 20px 12px;
+  //padding: 7px 20px 12px;
 }
 
 .error {
diff --git a/src/views/Jyh/Version/Detail/index.vue b/src/views/Jyh/Version/Detail/index.vue
index 2036684..81fdd2d 100644
--- a/src/views/Jyh/Version/Detail/index.vue
+++ b/src/views/Jyh/Version/Detail/index.vue
@@ -45,7 +45,7 @@
     </div>
     <div class="version-detail-content">
       <version-info v-if="selectTab === 'bbxx'" @changeTabs="changeTabs"></version-info>
-      <vulnerabilities-list v-else-if="selectTab === 'ldxx'"></vulnerabilities-list>
+      <vulnerabilities-list :versionId="versionId" v-else-if="selectTab === 'ldxx'"></vulnerabilities-list>
       <community-info v-else-if="selectTab === 'communityInfo'"></community-info>
       <Dependence v-else-if="selectTab === 'ylgx'"></Dependence>
       <SBOM v-else-if="selectTab === 'SBOM'" />
@@ -86,6 +86,7 @@ const ReleaseInfo = ref({
   openSourceLicenseList: [],
   referenceInfo: {},
 });
+const versionId = route.params.versionId; // 获取路由参数 versionId
 
 const getReleaseInfo = async(versionId) => {
   const { data, error } = await releaseInfo({ softwareId: versionId });