一些issue修改

This commit is contained in:
付民康
2025-03-21 09:49:58 +08:00
parent adf790ea15
commit a9c4bc192c
7 changed files with 39 additions and 30 deletions

View File

@@ -107,15 +107,11 @@ export function getRepairInfo(data) {
} }
// 获取许可证列表 // 获取许可证列表
export function getLicenseList() { export function getLicenseList(data) {
return request({ return request({
url: '/api/v1/repo/license/info', url: '/api/v1/repo/license/info',
method: 'POST', method: 'POST',
data: { data
"current": 1,
"size": 10,
"softwareId": 47
}
}); });
} }

View File

@@ -154,8 +154,8 @@ const getInfo = async() => {
const { data } = await getRepairInfo({ const { data } = await getRepairInfo({
"current": 1, "current": 1,
"size": 10, "size": 10,
"softwareId": 47, // "softwareId": 47,
// softwareId: propsData.versionId, softwareId: propsData.versionId,
}); });
debugger debugger
if(data.code===200) { if(data.code===200) {

View File

@@ -44,10 +44,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue'; import { ref,defineProps } from 'vue';
import SidePanel from '@/components/LicenseInfo/SidePanel.vue'; import SidePanel from '@/components/LicenseInfo/SidePanel.vue';
import { getLicenseList } from '@/api/jyh'; import { getLicenseList } from '@/api/jyh';
import NoData from '@/components/NoData/NoData.vue'; import NoData from '@/components/NoData/NoData.vue';
const propsData = defineProps(['versionId']);
const currentData = ref(null); const currentData = ref(null);
const pager = ref({ const pager = ref({
pageIndex: 1, pageIndex: 1,
@@ -121,7 +122,12 @@ const list = ref([
]); ]);
const getList = async () => { const getList = async () => {
const res: any = await getLicenseList(); const res: any = await getLicenseList({
softwareId: propsData.versionId,
componentId: '',
current: pager.value.pageIndex,
size: pager.value.pageSize,
});
if (!res.error) { if (!res.error) {
console.log(res); console.log(res);
list.value = res.data.data.records; list.value = res.data.data.records;

View File

@@ -6,7 +6,7 @@
<Card simple class="jyh-card mt-3"> <Card simple class="jyh-card mt-3">
<div class="clear-padding"> <div class="clear-padding">
<d-table class="jyh-table" v-if="tableData.length>0" :indent="32" @check-change="treeCheckChange" :data="tableData" row-key="id"> <d-table class="jyh-table" v-if="tableData.length>0" :indent="32" @check-change="treeCheckChange" :data="tableData" row-key="id">
<d-column field="libraryName" header="组名称" show-overflow-tooltip> <d-column field="libraryName" header="组名称" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<a class="devui-link" @click="setSelectRow(scope.row)">{{ scope.row.libraryName }}</a> <a class="devui-link" @click="setSelectRow(scope.row)">{{ scope.row.libraryName }}</a>
</template> </template>

View File

@@ -2,15 +2,15 @@
<d-layout class="dlayout"> <d-layout class="dlayout">
<d-header class="dheader"> <d-header class="dheader">
<div class="title"> <div class="title">
<h1>{{props.selectRow.libraryName || '--'}}</h1> <h1>{{props.selectRow.component.libraryName || '--'}}</h1>
<d-icon style="cursor: pointer" name="icon-close" @click="emit('close')"></d-icon> <d-icon style="cursor: pointer" name="icon-close" @click="emit('close')"></d-icon>
</div> </div>
<div class="sub-title"> <div class="sub-title">
<span>安全漏洞</span> <span>安全漏洞</span>
<span class="val">{{props.selectRow.lowVulCount || '--'}}</span> <span class="val">{{props.selectRow.component.lowVulCount || '--'}}</span>
<span class="split"></span> <span class="split"></span>
<span>许可证</span> <span>许可证</span>
<d-tag color="#3ac295" size="sm" class="ml-2">{{props.selectRow.licenseName || '--'}}</d-tag> <d-tag color="#3ac295" size="sm" class="ml-2">{{props.selectRow.component.licenseName || '--'}}</d-tag>
</div> </div>
</d-header> </d-header>
<div class="card-box"> <div class="card-box">
@@ -24,7 +24,7 @@
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="24" class="flex"> <d-col :span="24" class="flex">
<label style="flex: 0.2">关联漏洞编号</label> <label style="flex: 0.2">关联漏洞编号</label>
<p>{{props.selectRow.cveId || '--'}}</p> <p>{{props.selectRow.component.cveId || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
</div> </div>
@@ -35,57 +35,57 @@
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>当前版本</label> <label>当前版本</label>
<p>{{props.selectRow.currentVersion || '--'}}</p> <p>{{props.selectRow.component.currentVersion || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>最新版本</label> <label>最新版本</label>
<p>{{props.selectRow.latestVersion || '--'}}</p> <p>{{props.selectRow.component.latestVersion || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>深度</label> <label>深度</label>
<p>{{props.selectRow.depth || '--'}}</p> <p>{{props.selectRow.component.depth || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>供应商</label> <label>供应商</label>
<p>{{props.selectRow.vendor || '--'}}</p> <p>{{props.selectRow.component.vendor || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>包管理器平台</label> <label>包管理器平台</label>
<p>{{props.selectRow.platform || '--'}}</p> <p>{{props.selectRow.component.platform || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>范围</label> <label>范围</label>
<p>{{props.selectRow.scope || '--'}}</p> <p>{{props.selectRow.component.scope || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>程序语言</label> <label>程序语言</label>
<p>{{props.selectRow.language || '--'}}</p> <p>{{props.selectRow.component.language || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>活跃度</label> <label>活跃度</label>
<p>{{props.selectRow.activityScore || '--'}}</p> <p>{{props.selectRow.component.activityScore || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>下载量</label> <label>下载量</label>
<p>{{props.selectRow.downloadCount || '--'}}</p> <p>{{props.selectRow.component.downloadCount || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>识别方法</label> <label>识别方法</label>
<p>{{props.selectRow.recogMethod || '--'}}</p> <p>{{props.selectRow.component.recogMethod || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>匹配度</label> <label>匹配度</label>
<p>{{props.selectRow.matchingDegree || '--'}}</p> <p>{{props.selectRow.component.matchingDegree || '--'}}</p>
</d-col> </d-col>
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>生命周期终点/服务终止</label> <label>生命周期终点/服务终止</label>
@@ -95,7 +95,7 @@
<d-row :gutter="10"> <d-row :gutter="10">
<d-col :span="12" class="flex"> <d-col :span="12" class="flex">
<label>组件依赖关系</label> <label>组件依赖关系</label>
<p>{{props.selectRow.treeLevel || '--'}}</p> <p>{{props.selectRow.component.treeLevel || '--'}}</p>
</d-col> </d-col>
</d-row> </d-row>
</div> </div>
@@ -107,7 +107,6 @@
import { ref, defineEmits, defineProps } from 'vue'; import { ref, defineEmits, defineProps } from 'vue';
const props = defineProps(['selectRow']); const props = defineProps(['selectRow']);
console.log(props.selectRow) console.log(props.selectRow)
debugger
const emit = defineEmits(['close']); const emit = defineEmits(['close']);
</script> </script>

View File

@@ -57,7 +57,7 @@
</d-col> </d-col>
<d-col :span="8"> <d-col :span="8">
<span class="card-key width-110">所属领域/产业</span> <span class="card-key width-110">所属领域/产业</span>
<span class="card-val">{{ ReleaseInfo.referenceInfo.industry || '--' }}</span> <span class="card-val">{{ getIndustryName(ReleaseInfo.referenceInfo.industry) || '--' }}</span>
</d-col> </d-col>
<!-- <d-col :span="8">--> <!-- <d-col :span="8">-->
<!-- <span class="card-key width-110">版本火车名称</span>--> <!-- <span class="card-key width-110">版本火车名称</span>-->
@@ -294,6 +294,7 @@ import { discussDetailType, userInfoType } from '@/api/discussion/types';
import { Message } from 'vue-devui/message'; import { Message } from 'vue-devui/message';
import { useClipboard } from '@vueuse/core/index'; import { useClipboard } from '@vueuse/core/index';
import { releaseInfo } from '@/api/jyh'; import { releaseInfo } from '@/api/jyh';
import { useGlobalInfoStore } from '@/stores/Global';
const route = useRoute(); const route = useRoute();
const emits = defineEmits(['changeTabs']); const emits = defineEmits(['changeTabs']);
@@ -313,6 +314,12 @@ const ReleaseInfo = ref({
openSourceLicenseList: [], openSourceLicenseList: [],
referenceInfo: {}, referenceInfo: {},
}); });
const globalInfo = useGlobalInfoStore();
const industryList = ref(globalInfo.industryList);
const getIndustryName = (value) => {
const industry = industryList.value.find(item => item.value === value);
return industry ? industry.name : '未知行业'; // 如果找不到,返回默认值
};
const router = useRouter(); const router = useRouter();

View File

@@ -15,7 +15,7 @@
<span class="split"></span> <span class="split"></span>
<!-- <span class="span1">生命周期状态</span><span class="span2">{{ softwareData.lifecycle }}</span>--> <!-- <span class="span1">生命周期状态</span><span class="span2">{{ softwareData.lifecycle }}</span>-->
<!-- <span class="split"></span>--> <!-- <span class="split"></span>-->
<span class="span1">软件评分</span><span class="span2">{{ ReleaseInfo.networkSecurity.softwareRating || '&#45;&#45;' }}</span> <span class="span1">软件评分</span><span class="span2">{{ ReleaseInfo.networkSecurity.softwareRating || ReleaseInfo.basicInfo.securityScore || '&#45;&#45;' }}</span>
<span class="split"></span> <span class="split"></span>
<span class="span1">集成风险</span> <span class="span1">集成风险</span>
<d-tag color="#F6933B">{{ ReleaseInfo.referenceInfo.integrationRisk || '--' }}</d-tag> <d-tag color="#F6933B">{{ ReleaseInfo.referenceInfo.integrationRisk || '--' }}</d-tag>
@@ -87,6 +87,7 @@ const ReleaseInfo = ref({
referenceInfo: {}, referenceInfo: {},
}); });
const versionId = route.params.versionId; // 获取路由参数 versionId const versionId = route.params.versionId; // 获取路由参数 versionId
const jcfxList = ['','低','中','高'];
const getReleaseInfo = async(versionId) => { const getReleaseInfo = async(versionId) => {
const { data, error } = await releaseInfo({ softwareId: versionId }); const { data, error } = await releaseInfo({ softwareId: versionId });