From 945e11b0ae81ee3829e4d8575773d18bcf88105f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Tue, 18 Mar 2025 18:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E8=AF=A6=E6=83=85=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3issue=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Jyh/Search/Components/OssQuery.vue | 22 ++++++-------
 src/views/Jyh/Version/Detail/VersionInfo.vue | 12 +++----
 src/views/Jyh/Version/Detail/index.vue       | 33 +++++++++++++++++---
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue
index b3484e7..a5ee19e 100644
--- a/src/views/Jyh/Search/Components/OssQuery.vue
+++ b/src/views/Jyh/Search/Components/OssQuery.vue
@@ -166,20 +166,20 @@ const openDelete = (row: any) => {
 const columns = ref([
   { key: 'softwareName', label: '软件名称', visible: true, filterable: true, sortable: false },
   { key: 'softwareVersion', label: '软件版本', visible: true, filterable: true, sortable: false },
-  { key: 'releaseDate', label: '版本发布时间', visible: true, filterable: true, sortable: true },
+  { key: 'securityScore', label: '软件评分', visible: true, filterable: false, sortable: true },
   { key: 'licenseCount', label: 'License数量', visible: true, filterable: false, sortable: false },
-  { key: 'dependencyCount', label: '依赖软件数', visible: true, filterable: false, sortable: false },
-  { key: 'productComponentUsage', label: '产品成分使用量', visible: false, filterable: false, sortable: false },
+  { key: 'industryCategory', label: '行业类型', visible: true, filterable: true, sortable: false },
+  { key: 'primaryLanguage', label: '编程语言', visible: true, filterable: true, sortable: false },
   { key: 'codeLines', label: '代码量', visible: true, filterable: false, sortable: false },
-  { key: 'vulnerabilityCount', label: '漏洞数量', visible: true, filterable: false, sortable: false },
-  { key: 'industryCategory', label: '行业分类', visible: true, filterable: true, sortable: false },
-  { key: 'communityName', label: '开发商', visible: false, filterable: true, sortable: false },
-  { key: 'contributorCountries', label: '贡献者国家/地区分布', visible: true, filterable: false, sortable: false },
-  { key: 'contributorOrganizations', label: '贡献者组织/公司分布', visible: true, filterable: false, sortable: false },
-  { key: 'primaryLanguage', label: '编程语言', visible: false, filterable: true, sortable: false },
-  { key: 'communityHash', label: '社区hash值', visible: false, filterable: false, sortable: false },
-  { key: 'securityScore', label: '软件评分', visible: false, filterable: false, sortable: true },
   { key: 'sourceDownloadUrl', label: '源码包下载地址', visible: true, filterable: false, sortable: false },
+  { key: 'releaseDate', label: '版本发布时间', visible: false, filterable: true, sortable: true },
+  { key: 'dependencyCount', label: '依赖软件数', visible: false, filterable: false, sortable: false },
+  { key: 'productComponentUsage', label: '产品成分使用量', visible: false, filterable: false, sortable: false },
+  { key: 'vulnerabilityCount', label: '漏洞数量', visible: false, filterable: false, sortable: false },
+  { key: 'communityName', label: '开发商', visible: false, filterable: true, sortable: false },
+  { key: 'contributorCountries', label: '贡献者国家/地区分布', visible: false, filterable: false, sortable: false },
+  { key: 'contributorOrganizations', label: '贡献者组织/公司分布', visible: false, filterable: false, sortable: false },
+  { key: 'communityHash', label: '社区hash值', visible: false, filterable: false, sortable: false },
   { key: 'copyright', label: 'CopyRight', visible: false, filterable: false, sortable: false },
   { key: 'externalVulnerabilitySource', label: '外部漏洞源的软件名称', visible: false, filterable: true, sortable: false },
   { key: 'versionDescription', label: '版本描述', visible: false, filterable: false, sortable: false },
diff --git a/src/views/Jyh/Version/Detail/VersionInfo.vue b/src/views/Jyh/Version/Detail/VersionInfo.vue
index 977c975..118f4c7 100644
--- a/src/views/Jyh/Version/Detail/VersionInfo.vue
+++ b/src/views/Jyh/Version/Detail/VersionInfo.vue
@@ -157,12 +157,12 @@
 
     <Card simple class="jyh-card mb-4">
       <div class="card-title">网络安全</div>
-      <d-row class="mb-3">
-        <d-col :span="24">
-          <span class="card-key width-160">软件评分</span>
-          <span class="card-val">{{ ReleaseInfo.networkSecurity.softwareRating || '--' }}</span>
-        </d-col>
-      </d-row>
+<!--      <d-row class="mb-3">-->
+<!--        <d-col :span="24">-->
+<!--          <span class="card-key width-160">软件评分</span>-->
+<!--          <span class="card-val">{{ ReleaseInfo.networkSecurity.softwareRating || '&#45;&#45;' }}</span>-->
+<!--        </d-col>-->
+<!--      </d-row>-->
       <d-row class="mb-3">
         <d-col :span="24">
           <span class="card-key width-160">社区安全问题求助</span>
diff --git a/src/views/Jyh/Version/Detail/index.vue b/src/views/Jyh/Version/Detail/index.vue
index 422289b..531f186 100644
--- a/src/views/Jyh/Version/Detail/index.vue
+++ b/src/views/Jyh/Version/Detail/index.vue
@@ -9,14 +9,16 @@
       <div class="header-top">
         <GAvatar style="margin-right: 12px" :src="avatarUrl" name="Vue" :width="40" :height="40"></GAvatar>
         <div>
-          <div class="header-title1">{{ softwareData.name }}</div>
+          <div class="header-title1">{{ ReleaseInfo.basicInfo.softwareName || '--' }}</div>
           <div class="header-div">
-            <span class="span1">版本：</span><span class="span2">{{ softwareData.version }}</span>
+            <span class="span1">版本：</span><span class="span2">{{ ReleaseInfo.basicInfo.softwareVersion || '--' }}</span>
             <span class="split"></span>
 <!--            <span class="span1">生命周期状态：</span><span class="span2">{{ softwareData.lifecycle }}</span>-->
 <!--            <span class="split"></span>-->
+            <span class="span1">软件评分：</span><span class="span2">{{ ReleaseInfo.networkSecurity.softwareRating || '&#45;&#45;' }}</span>
+            <span class="split"></span>
             <span class="span1">集成风险：</span>
-            <d-tag color="#F6933B">{{ softwareData.risk }}</d-tag>
+            <d-tag color="#F6933B">{{ ReleaseInfo.referenceInfo.integrationRisk || '--' }}</d-tag>
           </div>
         </div>
         <div class="fr">
@@ -55,7 +57,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, watch } from 'vue';
+import { ref, reactive, watch, onMounted } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
 import VulnerabilitiesList from './VulnerabilitiesList.vue';
@@ -69,6 +71,7 @@ const { namespace } = getOrgInfo();
 const route = useRoute(); // 获取路由对象
 const avatarUrl = '/src/assets/imgs/jyh/工程首字母图标.png';
 import SubscriptionModal from '@/views/Jyh/Version/Detail/SubscriptionModal.vue';
+import { releaseInfo } from '@/api/jyh';
 
 const selectTab = ref('bbxx');
 
@@ -76,6 +79,28 @@ const selectTab = ref('bbxx');
 const item = ref('');
 const deleteModal = ref();
 const deletevModels = ref(false);
+const ReleaseInfo = ref({
+  basicInfo: {},
+  copyRightReportList: [],
+  entityList: [],
+  networkSecurity: {},
+  openSourceLicenseList: [],
+  referenceInfo: {},
+});
+
+const getReleaseInfo = async(versionId) => {
+  const { data, error } = await releaseInfo({ softwareId: versionId });
+  if (!error && data) {
+    ReleaseInfo.value = data.data;
+  }
+};
+
+onMounted(() => {
+  const versionId = route.params.versionId; // 获取路由参数 versionId
+  if (versionId) {
+    getReleaseInfo(versionId); // 调用接口获取数据
+  }
+});
 
 // 监听路由的 query.tab 变化
 watch(