From 5b8b76ea23d141699c63d29981422bb3f06f9e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Sun, 6 Jul 2025 14:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BF=A1=E4=BB=A3=E7=A0=81=E5=BA=93-?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=88=97=E8=A1=A8=E8=BD=AF=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=AE=B8=E5=8F=AF=E8=AF=81=E4=BF=A1=E6=81=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E3=80=81=E8=BD=AF=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoginModal/index.vue           | 29 ++++++++++++++-----
 .../OssDetail/LicenseInfo/index.vue           | 24 +++++++--------
 src/views/Jyh/LicenseInfo/index.vue           | 24 +++++++--------
 src/views/Jyh/Search/Components/OssQuery.vue  | 24 +++++++++++----
 4 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/src/components/LoginModal/index.vue b/src/components/LoginModal/index.vue
index 8422243..8009bf1 100644
--- a/src/components/LoginModal/index.vue
+++ b/src/components/LoginModal/index.vue
@@ -4,6 +4,7 @@ import GAuth from './widget/auth.vue';
 import GAgreement from './widget/agreement.vue';
 import GAgreements from './widget/agreements.vue';
 import GTitle from './widget/title.vue';
+import logo from '@/assets/imgs/logo.png'
 import { useModel } from '@/utils/hooks/useModel';
 import type { GLoginModalProps, GLogoProps } from './types';
 import { TransAssetsUrl } from '@/utils/asset';
@@ -785,8 +786,14 @@ onUnmounted(() => {
     :class="['login-modal', formType === 'login' ? 'login-modal-l' : 'login-modal-r']"
   >
     <template #header>
-      <div v-if="formType === 'login'" class="header-h1">国家可信开源代码库账号登录</div>
-      <div v-else class="header-h1">国家可信开源代码库账号注册</div>
+      <div v-if="formType === 'login'" class="header-h1">
+        <img :src="logo" alt="头像">
+        <div class="headertitel">国家可信开源代码库账号登录</div>
+      </div>
+      <div v-else class="header-h1">
+        <img :src="logo" alt="头像">
+        <div class="headertitel">国家可信开源代码库账号注册</div>
+      </div>
     </template>
     <template #default>
 <!--      <div v-if="formType === 'login'" class="header-h1">国家可信开源代码库账号登录</div>-->
@@ -801,13 +808,21 @@ $active-color: var(--color-CG800);
 $inactive-title: var(--color-CG500);
 $active-panel: var(--color-G800);
 .header-h1 {
-  letter-spacing: 0.5px;
-  line-height: 24px;
-  font-size: 20px;
-  color: #000000;
   padding-left: 16px;
-  padding-bottom: 20px;
+  padding-bottom: 10px;
   border-bottom: 1px solid #EDEDED;
+  display: flex;
+  align-items: center;
+  img {
+    width: 32px;
+    margin-right: 10px;
+  }
+  .headertitel {
+    letter-spacing: 0.5px;
+    line-height: 24px;
+    font-size: 20px;
+    color: #000000;
+  }
   *, :before, :after {
     box-sizing: border-box;
     border-width: 0;
diff --git a/src/views/Jyh/AI/Home/components/OssDetail/LicenseInfo/index.vue b/src/views/Jyh/AI/Home/components/OssDetail/LicenseInfo/index.vue
index 25d7ab3..ba73815 100644
--- a/src/views/Jyh/AI/Home/components/OssDetail/LicenseInfo/index.vue
+++ b/src/views/Jyh/AI/Home/components/OssDetail/LicenseInfo/index.vue
@@ -75,19 +75,19 @@ const tableConfig = ref([
     header: '许可证种类',
     sortable: false,
     sortMethod: null
+  },
+  {
+    field: 'effectedScanLibraryName',
+    header: '组件名称',
+    sortable: true,
+    sortMethod: null
+  },
+  {
+    field: 'effectedScanLibraryVersionNumber',
+    header: '组件版本',
+    sortable: true,
+    sortMethod: null
   }
-  // {
-  //   field: 'softwareName',
-  //   header: '影响软件',
-  //   sortable: true,
-  //   sortMethod: null
-  // },
-  // {
-  //   field: 'softwareVersion',
-  //   header: '版本',
-  //   sortable: true,
-  //   sortMethod: null
-  // }
 ]);
 
 const list = ref([]);
diff --git a/src/views/Jyh/LicenseInfo/index.vue b/src/views/Jyh/LicenseInfo/index.vue
index 25d7ab3..ba73815 100644
--- a/src/views/Jyh/LicenseInfo/index.vue
+++ b/src/views/Jyh/LicenseInfo/index.vue
@@ -75,19 +75,19 @@ const tableConfig = ref([
     header: '许可证种类',
     sortable: false,
     sortMethod: null
+  },
+  {
+    field: 'effectedScanLibraryName',
+    header: '组件名称',
+    sortable: true,
+    sortMethod: null
+  },
+  {
+    field: 'effectedScanLibraryVersionNumber',
+    header: '组件版本',
+    sortable: true,
+    sortMethod: null
   }
-  // {
-  //   field: 'softwareName',
-  //   header: '影响软件',
-  //   sortable: true,
-  //   sortMethod: null
-  // },
-  // {
-  //   field: 'softwareVersion',
-  //   header: '版本',
-  //   sortable: true,
-  //   sortMethod: null
-  // }
 ]);
 
 const list = ref([]);
diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue
index 51c11e7..0e59390 100644
--- a/src/views/Jyh/Search/Components/OssQuery.vue
+++ b/src/views/Jyh/Search/Components/OssQuery.vue
@@ -133,8 +133,16 @@
                 </d-popover>
               </template>
               <template v-else-if="column.key === 'trustScore'">
-                <d-popover :content="scope.row.trustScore || '&#45;&#45;'" trigger="hover" style="background-color: #7693f5; color: #fff">
-                  <d-tag color="#ef4444">{{ '高度可信' || '--' }}</d-tag>
+                <d-popover  trigger="hover" >
+                  <template #default>
+                    <d-tag color="#ef4444">{{ '高度可信' || '--' }}</d-tag>
+                  </template>
+                  <template #content>
+                    <div style="padding: 4px">
+                      <div style="display: flex;justify-content: space-between;"><span>低</span><span>中</span><span>高</span></div>
+                      <d-progress height="8px" bar-bg-color="#ef4444" style="width: 150px" :percentage="100" percentageText=""></d-progress>
+                    </div>
+                  </template>
                 </d-popover>
               </template>
               <template v-else-if="column.key === 'releaseDate'">
@@ -306,8 +314,8 @@ const openDelete = (row: any) => {
 const defultColumns = ref([
   { key: 'softwareName', label: '软件名称', visible: true, filterable: true, sortable: false },
   { key: 'softwareVersion', label: '软件版本', visible: true, filterable: true, sortable: false },
-  { key: 'trustScore', label: '软件可信评分', visible: true, filterable: false, sortable: true, tooltip: true },
-  { key: 'securityScore', label: '软件重要性评分', visible: true, filterable: false, sortable: true },
+  { key: 'trustScore', label: '软件可信等级', visible: true, filterable: false, sortable: true, tooltip: true },
+  // { key: 'securityScore', label: '软件重要性评分', visible: true, filterable: false, sortable: true },
   { key: 'licenseNum', label: 'License数量', visible: true, filterable: false, sortable: false,width: 140 },
   { key: 'industryCategory', label: '行业类型', visible: true, filterable: true, sortable: false },
   { key: 'primaryLanguage', label: '编程语言', visible: true, filterable: true, sortable: false },
@@ -337,8 +345,8 @@ const defultColumns = ref([
 const columns = ref([
   { key: 'softwareName', label: '软件名称', visible: true, filterable: true, sortable: false },
   { key: 'softwareVersion', label: '软件版本', visible: true, filterable: true, sortable: false },
-  { key: 'trustScore', label: '软件可信评分', visible: true, filterable: false, sortable: true, tooltip: true },
-  { key: 'securityScore', label: '软件重要性评分', visible: true, filterable: false, sortable: true },
+  { key: 'trustScore', label: '软件可信等级', visible: true, filterable: false, sortable: true, tooltip: true },
+  // { key: 'securityScore', label: '软件重要性评分', visible: true, filterable: false, sortable: true },
   { key: 'licenseNum', label: 'License数量', visible: true, filterable: false, sortable: false,width: 140 },
   { key: 'industryCategory', label: '行业类型', visible: true, filterable: true, sortable: false },
   { key: 'primaryLanguage', label: '编程语言', visible: true, filterable: true, sortable: false },
@@ -744,4 +752,8 @@ const exportResult = async () => {
   padding: 7px 20px 12px;
   background: #ffffff;
 }
+
+:deep(.devui-progress) {
+  width: 150px;
+}
 </style>