From 236942a2296917edfac4ec5df86d369c1c55e071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Sat, 15 Mar 2025 20:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=BA=90=E8=BD=AF=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8F=8A=E6=89=B9=E9=87=8F=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/jyh.scss                       |  20 +
 src/components/FileUploadButton/index.vue     |  78 +++
 src/components/SettingTable/index.vue         | 555 ++++++++++++++++++
 src/components/TableSetting/index.vue         | 127 ++--
 .../Jyh/Search/Components/BatchVerify.vue     | 244 +++++---
 src/views/Jyh/Search/Components/OssQuery.vue  | 408 ++++++++++---
 src/views/Jyh/Version/Detail/VersionInfo.vue  |  12 +-
 7 files changed, 1234 insertions(+), 210 deletions(-)
 create mode 100644 src/components/FileUploadButton/index.vue
 create mode 100644 src/components/SettingTable/index.vue

diff --git a/src/assets/css/jyh.scss b/src/assets/css/jyh.scss
index 6ded50c..1b9cc57 100644
--- a/src/assets/css/jyh.scss
+++ b/src/assets/css/jyh.scss
@@ -281,3 +281,23 @@
   //padding: 14px 24px;
   height: auto!important;
 }
+
+.jyh-dropdown {
+  //padding: 20px;
+  .title {
+
+  }
+}
+
+.green {
+  cursor: pointer;
+  color: rgb(80, 212, 171)
+}
+.yellow {
+  cursor: pointer;
+  color: rgb(250, 194, 10)
+}
+.red {
+  cursor: pointer;
+  color: rgb(246, 111, 106)
+}
diff --git a/src/components/FileUploadButton/index.vue b/src/components/FileUploadButton/index.vue
new file mode 100644
index 0000000..2ccb806
--- /dev/null
+++ b/src/components/FileUploadButton/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <!-- 文件上传按钮 -->
+    <d-button
+      class="mr-2"
+      variant="solid"
+      :loading="loading"
+      @click="triggerFileInput"
+    >
+      {{ buttonText }}
+    </d-button>
+
+    <!-- 隐藏的文件上传输入框 -->
+    <input
+      ref="fileInput"
+      type="file"
+      :accept="accept"
+      style="display: none"
+      @change="handleFileUpload"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+// 定义组件属性
+const props = defineProps({
+  buttonText: {
+    type: String,
+    default: '上传文件',
+  },
+  accept: {
+    type: String,
+    default: '.xml', // 默认接受 XML 文件
+  },
+  onFileUpload: {
+    type: Function,
+    required: true,
+  },
+});
+
+// 文件输入框的引用
+const fileInput = ref(null);
+
+// 加载状态
+const loading = ref(false);
+
+// 触发文件选择
+const triggerFileInput = () => {
+  fileInput.value.click(); // 触发文件选择
+};
+
+// 处理文件上传
+const handleFileUpload = async (event) => {
+  const file = event.target.files[0]; // 获取选择的文件
+  if (file) {
+    // 检查文件类型
+    if (file.type === 'text/xml' || file.name.endsWith('.xml')) {
+      loading.value = true; // 显示加载状态
+      try {
+        await props.onFileUpload(file); // 调用父组件传递的上传方法
+      } catch (error) {
+        console.error('文件上传失败:', error);
+        alert('文件上传失败，请重试！');
+      } finally {
+        loading.value = false; // 隐藏加载状态
+      }
+    } else {
+      alert('请选择有效的 XML 文件！');
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+/* 自定义样式 */
+</style>
diff --git a/src/components/SettingTable/index.vue b/src/components/SettingTable/index.vue
new file mode 100644
index 0000000..8ea7dd3
--- /dev/null
+++ b/src/components/SettingTable/index.vue
@@ -0,0 +1,555 @@
+<template>
+  <div class="secret-container">
+    <div class="mt-3 px-20">
+      <d-table :key="tableKey" class="jyh-table" v-if="tableData.length" :striped="false" :data="tableData" table-layout="auto">
+        <!-- 索引列 -->
+        <d-column type="index" width="40"></d-column>
+
+        <!-- 动态渲染列 -->
+        <template v-for="column in columns" :key="column.key">
+          <d-column
+            v-if="column.visible"
+            :field="column.key"
+            :header="column.label"
+            :filterable="column.filterable"
+            :filter-list="column.filterList"
+            :sortable="column.sortable"
+            @filter-change="handleFilterChange"
+          >
+            <!-- 自定义列内容 -->
+            <template #default="scope">
+              <template v-if="column.key === 'versionName'">
+                <a>{{ scope.row.versionName }}</a>
+              </template>
+              <template v-else-if="column.key === 'version'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.version }}</a>
+              </template>
+              <template v-else-if="column.key === 'softwareVersion'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.softwareVersion }}</a>
+              </template>
+              <template v-else-if="column.key === 'smStatus'">
+                <a>{{ scope.row.smStatus }}</a>
+              </template>
+              <template v-else-if="column.key === 'industryCategory'">
+                <d-tag type="success">{{ scope.row.industryCategory }}</d-tag>
+              </template>
+              <template v-else-if="column.key === 'programmingLanguage'">
+                <d-tag type="success">{{ scope.row.programmingLanguage }}</d-tag>
+              </template>
+              <template v-else-if="column.key === 'contributorCountries'">
+                <span class="mr-2">美国 3.57%</span>
+                <d-tag color="gray">+3</d-tag>
+              </template>
+              <template v-else-if="column.key === 'contributorOrganizations'">
+                <span class="mr-2">microsoft 3.57%</span>
+                <d-tag color="gray">+3</d-tag>
+              </template>
+              <template v-else-if="column.key === 'sourceCodeDownload'">
+                <a>{{ scope.row.sourceCodeDownload }}</a>
+              </template>
+              <template v-else>
+                {{ scope.row[column.key] }}
+              </template>
+            </template>
+          </d-column>
+        </template>
+      </d-table>
+
+      <DataPanel v-else skeleton :card="false" :empty="true">
+      </DataPanel>
+    </div>
+
+    <div class="mt-20 mb-20 flex justify-end">
+      <d-pagination size="md" :page-size-options="[10, 20, 50]" :total="pager.total"
+                    v-model:pageSize="pager.pageSize" v-model:pageIndex="pager.pageIndex" :max-items="5"
+                    :can-change-page-size="true" :can-view-total="true" total-item-text="总计" @page-index-change="changeIndex()"
+                    @page-size-change="changeSize()" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import AdvanceSearch from '@/components/AdvanceSearch/index.vue'
+import SettingTitle from '@/components/Setting/SettingTitle/index.vue';
+import SettingText from '@/components/Setting/SettingText/index.vue';
+import { ref,reactive, onMounted } from 'vue';
+import { getGroupClaList, setGroupClaStatus, deleteGroupCla } from '@/api/cla';
+import { useRouter, useRoute } from 'vue-router';
+import { GModal } from '@/components/Setting/index';
+import TableSetting from '@/components/TableSetting/index.vue';
+import { reqCatch } from '@/utils/catch';
+import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
+import { Message } from 'vue-devui';
+import { storeToRefs } from 'pinia';
+import { useAccountStore } from '@/stores/user';
+const { namespace } = getOrgInfo();
+const userInfo = useAccountStore();
+const { isLogin } = storeToRefs(userInfo);
+
+// 定义 tableKey，用于强制刷新表格
+const tableKey = ref(0);
+const tableData = ref([
+  {
+    softwareName: 'eslint-plugin-import',
+    softwareVersion: '2.29.0',
+    releaseDate: '2025-03-10',
+    licenseCount: 3,
+    dependencyCount: 15,
+    productComponentUsage: ['供应链系统A', '供应链系统B'],
+    codeSize: '150KB',
+    vulnerabilityCount: 5,
+    industryCategory: '软件开发工具',
+    developer: 'ESLint团队',
+    contributorCountries: ['美国', '中国', '德国'],
+    contributorOrganizations: ['Google', 'Microsoft', 'Alibaba'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'a1b2c3d4',
+    softwareScore: 8.5,
+    sourceCodeDownload: 'https://github.com/eslint/eslint-plugin-import',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-1234',
+    versionDescription: '修复了若干安全漏洞',
+    compatibilityRisk: '低',
+    communityEOL: '2028-12-31',
+  },
+  {
+    softwareName: 'react',
+    softwareVersion: '18.2.0',
+    releaseDate: '2025-02-15',
+    licenseCount: 1,
+    dependencyCount: 10,
+    productComponentUsage: ['供应链系统C'],
+    codeSize: '500KB',
+    vulnerabilityCount: 2,
+    industryCategory: '前端框架',
+    developer: 'Facebook',
+    contributorCountries: ['美国', '加拿大', '英国'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Airbnb'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'e5f6g7h8',
+    softwareScore: 9.0,
+    sourceCodeDownload: 'https://github.com/facebook/react',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-5678',
+    versionDescription: '新增了并发渲染功能',
+    compatibilityRisk: '中',
+    communityEOL: '2030-12-31',
+  },
+  {
+    softwareName: 'vue',
+    softwareVersion: '3.2.0',
+    releaseDate: '2025-01-20',
+    licenseCount: 1,
+    dependencyCount: 8,
+    productComponentUsage: ['供应链系统D'],
+    codeSize: '300KB',
+    vulnerabilityCount: 1,
+    industryCategory: '前端框架',
+    developer: 'Evan You',
+    contributorCountries: ['中国', '美国', '日本'],
+    contributorOrganizations: ['Alibaba', 'Tencent', 'Baidu'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'i9j0k1l2',
+    softwareScore: 9.2,
+    sourceCodeDownload: 'https://github.com/vuejs/vue',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-9101',
+    versionDescription: '优化了性能',
+    compatibilityRisk: '低',
+    communityEOL: '2029-12-31',
+  },
+  {
+    softwareName: 'webpack',
+    softwareVersion: '5.75.0',
+    releaseDate: '2025-04-05',
+    licenseCount: 2,
+    dependencyCount: 20,
+    productComponentUsage: ['供应链系统E'],
+    codeSize: '1MB',
+    vulnerabilityCount: 3,
+    industryCategory: '构建工具',
+    developer: 'Webpack团队',
+    contributorCountries: ['美国', '德国', '俄罗斯'],
+    contributorOrganizations: ['Google', 'Microsoft', 'Yandex'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'm3n4o5p6',
+    softwareScore: 8.8,
+    sourceCodeDownload: 'https://github.com/webpack/webpack',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-1122',
+    versionDescription: '修复了构建性能问题',
+    compatibilityRisk: '高',
+    communityEOL: '2027-12-31',
+  },
+  {
+    softwareName: 'babel',
+    softwareVersion: '7.20.0',
+    releaseDate: '2025-03-25',
+    licenseCount: 1,
+    dependencyCount: 12,
+    productComponentUsage: ['供应链系统F'],
+    codeSize: '400KB',
+    vulnerabilityCount: 4,
+    industryCategory: '编译器',
+    developer: 'Babel团队',
+    contributorCountries: ['美国', '英国', '印度'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Uber'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'q7r8s9t0',
+    softwareScore: 8.7,
+    sourceCodeDownload: 'https://github.com/babel/babel',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-3344',
+    versionDescription: '新增了对新语法的支持',
+    compatibilityRisk: '中',
+    communityEOL: '2026-12-31',
+  },
+  {
+    softwareName: 'typescript',
+    softwareVersion: '5.0.0',
+    releaseDate: '2025-05-01',
+    licenseCount: 1,
+    dependencyCount: 5,
+    productComponentUsage: ['供应链系统G'],
+    codeSize: '2MB',
+    vulnerabilityCount: 0,
+    industryCategory: '编程语言',
+    developer: 'Microsoft',
+    contributorCountries: ['美国', '中国', '加拿大'],
+    contributorOrganizations: ['Microsoft', 'Google', 'Alibaba'],
+    programmingLanguage: 'TypeScript',
+    communityHash: 'u1v2w3x4',
+    softwareScore: 9.5,
+    sourceCodeDownload: 'https://github.com/microsoft/TypeScript',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: '无',
+    versionDescription: '新增了装饰器功能',
+    compatibilityRisk: '低',
+    communityEOL: '2035-12-31',
+  },
+  {
+    softwareName: 'jest',
+    softwareVersion: '29.0.0',
+    releaseDate: '2025-06-10',
+    licenseCount: 1,
+    dependencyCount: 18,
+    productComponentUsage: ['供应链系统H'],
+    codeSize: '600KB',
+    vulnerabilityCount: 2,
+    industryCategory: '测试工具',
+    developer: 'Facebook',
+    contributorCountries: ['美国', '德国', '法国'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Spotify'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'y5z6a7b8',
+    softwareScore: 9.1,
+    sourceCodeDownload: 'https://github.com/facebook/jest',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-5566',
+    versionDescription: '优化了测试性能',
+    compatibilityRisk: '中',
+    communityEOL: '2032-12-31',
+  },
+  {
+    softwareName: 'docker',
+    softwareVersion: '24.0.0',
+    releaseDate: '2025-07-15',
+    licenseCount: 1,
+    dependencyCount: 25,
+    productComponentUsage: ['供应链系统I'],
+    codeSize: '10MB',
+    vulnerabilityCount: 6,
+    industryCategory: '容器化工具',
+    developer: 'Docker Inc.',
+    contributorCountries: ['美国', '英国', '澳大利亚'],
+    contributorOrganizations: ['Docker Inc.', 'Google', 'Amazon'],
+    programmingLanguage: 'Go',
+    communityHash: 'c9d0e1f2',
+    softwareScore: 9.3,
+    sourceCodeDownload: 'https://github.com/docker/docker',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: 'CVE-2025-7788',
+    versionDescription: '新增了对ARM架构的支持',
+    compatibilityRisk: '高',
+    communityEOL: '2030-12-31',
+  },
+  {
+    softwareName: 'kubernetes',
+    softwareVersion: '1.28.0',
+    releaseDate: '2025-08-20',
+    licenseCount: 1,
+    dependencyCount: 30,
+    productComponentUsage: ['供应链系统J'],
+    codeSize: '15MB',
+    vulnerabilityCount: 8,
+    industryCategory: '容器编排工具',
+    developer: 'CNCF',
+    contributorCountries: ['美国', '中国', '德国'],
+    contributorOrganizations: ['Google', 'Red Hat', 'IBM'],
+    programmingLanguage: 'Go',
+    communityHash: 'g3h4i5j6',
+    softwareScore: 9.4,
+    sourceCodeDownload: 'https://github.com/kubernetes/kubernetes',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: 'CVE-2025-9900',
+    versionDescription: '优化了集群管理功能',
+    compatibilityRisk: '高',
+    communityEOL: '2033-12-31',
+  },
+  {
+    softwareName: 'postgresql',
+    softwareVersion: '15.0.0',
+    releaseDate: '2025-09-25',
+    licenseCount: 1,
+    dependencyCount: 7,
+    productComponentUsage: ['供应链系统K'],
+    codeSize: '8MB',
+    vulnerabilityCount: 3,
+    industryCategory: '数据库',
+    developer: 'PostgreSQL团队',
+    contributorCountries: ['美国', '加拿大', '日本'],
+    contributorOrganizations: ['PostgreSQL Inc.', 'Amazon', 'Microsoft'],
+    programmingLanguage: 'C',
+    communityHash: 'k7l8m9n0',
+    softwareScore: 9.6,
+    sourceCodeDownload: 'https://github.com/postgres/postgres',
+    copyright: 'PostgreSQL License',
+    externalVulnerabilitySource: 'CVE-2025-1122',
+    versionDescription: '新增了JSONB索引功能',
+    compatibilityRisk: '低',
+    communityEOL: '2035-12-31',
+  },
+]);
+const formData = ref({ title: '',type: '', useType: '',formData:'',select: '',time1:null,name:'',versionCode:'',pulishTime:'' });
+const typeOptions = reactive(['主软件', '依赖软件']);
+const riskOptions = reactive(['低', '中', '高']);
+const useTypeOptions = reactive(['软件', '文档', '文档+软件']);
+const isUseOptions = reactive(['是', '否']);
+const newFormData = ref({
+  license: '',
+  searchWord: '',
+  version: '',
+  dependentSoftware: '',
+  programmingLanguage: '',
+  dateRange: ['', '']
+})
+
+const pager = ref({
+  total: 10,
+  pageIndex: 1,
+  pageSize: 10
+});
+
+// 删除弹窗
+const item = ref('');
+const deleteModal = ref();
+const deletevModels = ref(false);
+const openDelete = (row: any) => {
+  item.value = row;
+  deleteModal.value.showFlag = true;
+  deletevModels.value = true;
+};
+
+// 定义 columns 数据
+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: '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: 'codeSize', 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: 'developer', 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: 'programmingLanguage', label: '编程语言', visible: false, filterable: true, sortable: false },
+  { key: 'communityHash', label: '社区hash值', visible: false, filterable: false, sortable: false },
+  { key: 'softwareScore', label: '软件评分', visible: false, filterable: false, sortable: true },
+  { key: 'sourceCodeDownload', label: '源码包下载地址', visible: true, 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 },
+  { key: 'compatibilityRisk', label: '兼容性风险描述', visible: false, filterable: false, sortable: false },
+  { key: 'communityEOL', label: '社区EOL时间', visible: false, filterable: true, sortable: true },
+]);
+
+// 定义 showColumnList 状态
+const showColumnList = ref(false);
+
+// 更新 showColumnList 的方法
+const updateShowColumnList = (newValue) => {
+  showColumnList.value = newValue;
+  tableKey.value++; // 更新 tableKey，强制刷新表格
+};
+
+const router = useRouter();
+const route = useRoute();
+// 跳转
+const gotoDetail = (row) => {
+  // 后续请换成params，暂时params传参没传过去
+  router.push({
+    path: 'repoDetail/' + row.version
+  });
+};
+// 分页
+const changeIndex = () => {
+  // getGroupClaListData();
+};
+
+const changeSize = () => {
+  pager.value.pageIndex = 1;
+  // getGroupClaListData();
+};
+
+const repoFun = (arr: any) => {
+  return arr ? (arr.length > 3 ? arr.slice(0, 3) : arr) : [];
+};
+
+// 编辑
+const editRow = (row: any) => {
+  // 后续请换成params，暂时params传参没传过去
+  router.push({
+    path: 'cla/edit/' + row.object_id,
+    query: { cla: row.cla, pageType: 'edit' }
+  });
+};
+
+// 确认删除
+const confirmDelete = async (e: any) => {
+  // const res = await reqCatch(deleteGroupCla, { group_id: namespace.value, cla_id: item.value.object_id });
+  // if (!res.error) {
+  //   getGroupClaListData();
+  // }
+};
+
+// 去成员页
+const goMember = (row: any) => {
+  // 后续请换成params，暂时params传参没传过去,注意路由有个:claID
+  router.push({
+    path: 'cla/claId/member',
+    query: { claId: row.object_id, claName: row.cla_name, group_path: namespace.value, pageType: 'edit' }
+  });
+};
+const getGroupClaListData = async () => {
+  // const params = {
+  //   group_id: namespace.value,
+  //   page: pager.value.pageIndex,
+  //   per_page: pager.value.pageSize
+  // };
+  // const res = await reqCatch(getGroupClaList, params);
+  // if (!res.error) {
+  //   tableData.value = res?.data?.data?.content;
+  //   pager.value.total = res.data.data.total;
+  // }
+};
+getGroupClaListData();
+
+const setClaStatus = async (row: any) => {
+  // const params = {
+  //   group_id: namespace.value,
+  //   cla_id: row.object_id,
+  //   status: row.status
+  // };
+  // const res = await reqCatch(setGroupClaStatus, params);
+  // if (!res.error) {
+  //   Message.success('操作成功!');
+  //   getGroupClaListData();
+  // }
+};
+
+const signCla = (row: any) => {
+  router.push('/cla/' + row.object_id);
+};
+
+onMounted(() => {
+  const query: any = route.query;
+  newFormData.value = {
+    ...query
+  };
+});
+</script>
+
+<style scoped lang="scss">
+@import 'devui-theme/styles-var/devui-var.scss';
+
+.secret-container {
+  position: relative;
+
+  .secret-op {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+
+}
+
+.error {
+  color: $devui-contrast;
+}
+
+:deep(.devui-table__row td) {
+  padding-top: 16px;
+  padding-bottom: 16px;
+}
+
+:deep(.devui-tag .devui-tag--default) {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 4px 8px;
+  font-size: 12px;
+  line-height: 16px;
+  margin-right: 8px;
+  border: 1px solid #E3E3EE;
+}
+
+.one-line {
+  word-break: break-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.title {
+  font-size: 14px;
+  font-weight: 400;
+  color: #9a9b9c;
+  line-height: 20px;
+}
+
+.cur-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #2d2d2e;
+  line-height: 20px;
+}
+
+.search-form {
+  position: relative;
+  border-radius: 8px 0px 8px 8px;
+  //background: #F2F5FC;
+
+  .left-btn {
+    position: absolute;
+    right: 28px;
+    bottom: 4px;
+  }
+
+  .output-btn {
+    color: #191919;
+    font-family: HarmonyOS Sans SC;
+    font-weight: regular;
+    font-size: 14px;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: left;
+
+  }
+}
+
+.secret-breadcrumb {
+  padding: 7px 20px 12px;
+  background: #ffffff;
+}
+</style>
diff --git a/src/components/TableSetting/index.vue b/src/components/TableSetting/index.vue
index 237c8cb..b1e2c19 100644
--- a/src/components/TableSetting/index.vue
+++ b/src/components/TableSetting/index.vue
@@ -1,43 +1,102 @@
 <template>
-  <d-dropdown>
-    <d-button class="output-btn" icon="icon-form-settings" variant="text">设置</d-button>
-    <template #menu>
-<!--      <ul class="list-menu">-->
-<!--        <d-dropdown :position="position" :offset="0">-->
-<!--&lt;!&ndash;          <li class="menu-item">&ndash;&gt;-->
-<!--&lt;!&ndash;            Item 1&ndash;&gt;-->
-<!--&lt;!&ndash;            <i class="icon icon-chevron-right"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;          </li>&ndash;&gt;-->
-<!--&lt;!&ndash;          <template #menu>&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;            <ul class="list-menu">&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;              <d-dropdown :position="position" :offset="0" >&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                <li class="menu-item">&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                  Item 1-1&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                  <i class="icon icon-chevron-right"></i>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                </li>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                <template #menu>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                  <ul class="list-menu">&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                    <li class="menu-item">Item 1-1-1</li>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                    <li class="menu-item">Item 1-1-2</li>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                    <li class="menu-item">Item 1-1-3</li>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                  </ul>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;                </template>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;              </d-dropdown>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;              <li class="menu-item">Item 1-2</li>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;&lt;!&ndash;            </ul>&ndash;&gt;&ndash;&gt;-->
-<!--&lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        </d-dropdown>-->
-<!--        <li class="menu-item">Item 2</li>-->
-<!--      </ul>-->
-    </template>
-  </d-dropdown>
+  <div class="TableSetting">
+    <d-button @click.stop="toggleColumnList" class="output-btn" icon="icon-form-settings" variant="text">设置</d-button>
+    <!-- 多选列表 -->
+    <div v-if="showColumnList" class="column-list">
+      <div class="column-list-header">
+        <span class="title1">展示列设置</span>
+        <a class="title2">恢复默认</a>
+      </div>
+      <div class="column-list-body">
+        <d-checkbox
+          v-for="column in columns"
+          :key="column.key"
+          v-model="column.visible"
+        >
+          {{ column.label }}
+        </d-checkbox>
+      </div>
+    </div>
+  </div>
 </template>
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, defineProps, defineEmits } from 'vue';
 
-const position = ref(['right-start', 'right-end']);
 
+const props = defineProps({
+  columns: {
+    type: Array,
+    required: true,
+  },
+  showColumnList: {
+    type: Boolean,
+    required: true,
+  },
+});
+
+// 定义 emit，用于更新 showColumnList
+const emits = defineEmits(['update:show-column-list']);
+
+// 切换多选列表的显示
+const toggleColumnList = () => {
+  const newValue = !props.showColumnList;
+  emits('update:show-column-list', newValue); // 触发事件，更新父组件的 showColumnList
+};
 </script>
 <style lang="scss" scoped>
+.TableSetting {
+  display: inline-block;
+  position: relative;
+  //padding: 20px;
+}
+
+.column-list {
+  position: absolute;
+  top: 40px;
+  left: -222px;
+  width: 280px;
+  z-index: 1000;
+
+  border-radius: 4px;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 9px 0px #252B3A28;
+  padding: 20px;
+}
+
+.column-list-header {
+  display: flex;
+  justify-content: space-between;
+  .title1 {
+    color: #191919;
+    font-family: 鸿蒙黑体;
+    font-weight: SemiBold;
+    font-size: 16px;
+    line-height: 24px;
+    letter-spacing: 0px;
+    text-align: left;
+  }
+  .title2 {
+    color: #5E7CE0;
+    font-family: 苹方-简;
+    font-weight: regular;
+    font-size: 14px;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: right;
+  }
+}
+
+.column-list-body {
+  margin-top: 20px;
+  //padding: 10px;
+  > div {
+    margin-bottom: 8px;
+  }
+}
+
+.d-checkbox {
+  display: block;
+  margin-bottom: 8px;
+}
 
 </style>
diff --git a/src/views/Jyh/Search/Components/BatchVerify.vue b/src/views/Jyh/Search/Components/BatchVerify.vue
index fa6e41f..7d64fe8 100644
--- a/src/views/Jyh/Search/Components/BatchVerify.vue
+++ b/src/views/Jyh/Search/Components/BatchVerify.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="BatchVerify">
     <div class="search-form">
-      <d-button class="mr-2" variant="solid" :loading="loadingStatus.batchMigrating" @click="handleBatchImport">批量导入</d-button>
+      <FileUploadButton
+        buttonText="批量导入"
+        accept=".xml"
+        :onFileUpload="handleFileUpload"
+      />
       <d-input
         style="width: 400px"
         v-model="formData.title"
@@ -13,88 +17,94 @@
           <d-icon name="search" style="font-size: inherit;"></d-icon>
         </template>
       </d-input>
-      <d-button class="output-btn" icon="icon-share" variant="text">导出</d-button>
+      <div class="tjsj">
+        <span style="height: 14px" class="split"></span>
+        <span>可使用：</span>
+        <span class="blue">3</span>
+        <span style="height: 14px" class="split"></span>
+        <span>未治理：</span>
+        <span class="yellow">3</span>
+        <span style="height: 14px" class="split"></span>
+        <span>有风险：</span>
+        <span class="red">3</span>
+      </div>
+      <div class="left-btn">
+        <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
+        <span v-if="isLogin" style="height: 14px" class="split"></span>
+        <TableSetting :columns="columns" :show-column-list="showColumnList" @update:show-column-list="updateShowColumnList"/>
+      </div>
     </div>
     <div class="mt-3 px-20">
       <d-table class="jyh-table" v-if="tableData.length" :striped="false" :data="tableData" table-layout="auto">
+
+        <!-- 索引列 -->
         <d-column type="index" width="40"></d-column>
-        <d-column field="result" header="校验结果" filterable :filter-list="filterList" @filter-change="handleFilterChange">
+
+        <!-- 动态渲染列 -->
+        <template v-for="column in columns" :key="column.key">
+          <d-column
+            v-if="column.visible"
+            :field="column.key"
+            :header="column.label"
+            :filterable="column.filterable"
+            :filter-list="column.filterList"
+            :sortable="column.sortable"
+            @filter-change="handleFilterChange"
+          >
+            <!-- 自定义列内容 -->
+            <template #default="scope">
+              <template v-if="column.key === 'result'">
+                <div v-if="scope.row.result == 1" style="display: flex; align-items: center">
+                  <d-icon class="mr-1" name="icon-right-o" style="font-size: 14px; color: rgb(80, 212, 171)"></d-icon>
+                  <span>可使用</span>
+                </div>
+                <div v-else-if="scope.row.result == 2" style="display: flex; align-items: center">
+                  <d-icon class="mr-1" name="icon-warning-o" style="font-size: 14px; color: rgb(250, 194, 10)"></d-icon>
+                  <span>未治理</span>
+                </div>
+                <div v-else style="display: flex; align-items: center">
+                  <d-icon class="mr-1" name="icon-error-o" style="font-size: 14px; color: rgb(246, 111, 106)"></d-icon>
+                  <span>有风险</span>
+                </div>
+              </template>
+              <template v-else-if="column.key === 'versionName'">
+                <a>{{ scope.row.versionName }}</a>
+              </template>
+              <template v-else-if="column.key === 'version'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.version }}</a>
+              </template>
+              <template v-else-if="column.key === 'versionCode'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.versionCode }}</a>
+              </template>
+              <template v-else-if="column.key === 'smStatus'">
+                <a>{{ scope.row.smStatus }}</a>
+              </template>
+              <template v-else-if="column.key === 'type'">
+                <d-tag type="success">{{ scope.row.type }}</d-tag>
+              </template>
+              <template v-else-if="column.key === 'license'">
+                <span class="mr-2">{{ scope.row.license }}</span>
+                <d-tag color="gray">+3</d-tag>
+              </template>
+              <template v-else-if="column.key === 'url'">
+                <a>{{ scope.row.url }}</a>
+              </template>
+              <template v-else>
+                {{ scope.row[column.key] }}
+              </template>
+            </template>
+          </d-column>
+        </template>
+        <d-column header="操作" width="200" fixed-right="0px">
           <template #default="scope">
-            <div v-if="scope.row.result==1" style="display: flex;align-items: center">
-              <d-icon class="mr-1" name="icon-right-o" style="font-size: 14px;color: rgb(80, 212, 171)"></d-icon>
-              <span>校验通过</span>
-            </div>
-            <div v-else style="display: flex;align-items: center">
-              <d-icon class="mr-1" name="icon-error-o" style="font-size: 14px;color: rgb(246, 111, 106)"></d-icon>
-              <span>未通过校验</span>
-            </div>
+            <d-button
+              variant="text"
+              disabled
+            >
+              申请入库
+            </d-button>
           </template>
         </d-column>
-        <d-column field="versionName" header="选取版本火车名称" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a>{{scope.row.versionName}}</a>
-          </template>
-        </d-column>
-        <d-column field="name" header="软件名称" filterable :filter-list="filterList" @filter-change="handleFilterChange"></d-column>
-        <d-column field="code" header="软件编码" filterable :filter-list="filterList" @filter-change="handleFilterChange"></d-column>
-        <d-column field="version" header="软件版本"  filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a @click="gotoDetail(scope.row)">{{scope.row.version}}</a>
-          </template>
-        </d-column>
-        <d-column field="versionCode" header="版本编码"  sortable :sort-method="sortNameMethod" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a @click="gotoDetail(scope.row)">{{scope.row.versionCode}}</a>
-          </template>
-        </d-column>
-        <d-column field="smStatus" header="生命周期状态"  sortable :sort-method="sortNameMethod" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a>{{scope.row.smStatus}}</a>
-          </template>
-        </d-column>
-        <d-column field="type" header="主/依赖软件类型">
-          <template #default="scope">
-            <d-tag type="success">{{scope.row.type}}</d-tag>
-          </template>
-        </d-column>
-        <d-column field="license" header="License名称" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <span class="mr-2">{{scope.row.license}}</span>
-            <d-tag color="gray">+3</d-tag>
-          </template>
-        </d-column>
-        <d-column field="url" header="官网漏洞披露地址">
-          <template #default="scope">
-            <a>{{scope.row.url}}</a>
-          </template>
-        </d-column>
-<!--        <d-column field="risk" header="集成风险"></d-column>-->
-<!--        <d-column field="useType" header="适用类型"></d-column>-->
-<!--        <d-column field="status" header="状态">-->
-<!--          <d-status>未开始</d-status>-->
-<!--        </d-column>-->
-<!--        <d-column field="key" header="键值"></d-column>-->
-<!--        <d-column field="created" header="创建时间"></d-column>-->
-<!--        <d-column field="updated" header="更新时间"></d-column>-->
-<!--        <d-column header="操作" width="300">-->
-<!--          <template #default="scope">-->
-<!--            <div class="flex">-->
-<!--              <div class="cursor-pointer flex items-center mr-[32px]" @click="editRow(scope.row)">-->
-<!--                <GIcon class="mr-[8px]" name="gt-plane-edit" />-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">编辑</span>-->
-<!--              </div>-->
-<!--              <div class="flex items-center mr-[32px]">-->
-<!--                <d-switch v-model="scope.row.status" class="mr-[8px]" @change="setClaStatus(scope.row)"-->
-<!--                          :active-value="1" :inactive-value="0"> </d-switch>-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">{{ scope.row.status === 0 ? '停用' : '启用' }}</span>-->
-<!--              </div>-->
-<!--              <div class="cursor-pointer flex items-center" @click="openDelete(scope.row)">-->
-<!--                <GIcon class="mr-[8px]" name="gt-plane-delete" />-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">删除</span>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </template>-->
-<!--        </d-column>-->
       </d-table>
 
       <DataPanel v-else skeleton :card="false" :empty="true">
@@ -127,26 +137,65 @@ import { GModal } from '@/components/Setting/index';
 import { reqCatch } from '@/utils/catch';
 import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
 import { Message } from 'vue-devui';
+import { useAccountStore } from '@/stores/user';
+import { storeToRefs } from 'pinia';
+import TableSetting from '@/components/TableSetting/index.vue';
+import FileUploadButton from '@/components/FileUploadButton/index.vue';
+
+// 处理文件上传
+const handleFileUpload = async (file) => {
+  console.log('选择的文件:', file.name);
+
+  // 模拟文件上传逻辑
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      console.log('文件上传成功:', file.name);
+      resolve();
+    }, 2000); // 模拟 2 秒上传时间
+  });
+};
+const userInfo = useAccountStore();
+const { isLogin } = storeToRefs(userInfo);
+
 const { namespace } = getOrgInfo();
 
 const tableData = ref([
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:0, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:0, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:0, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {result:1, versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:1,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:1,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:0,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:0,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:0,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:1,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:2,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:2,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:1,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {result:1,tjsj: '可使用', versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+]);
+const columns = ref([
+  { key: 'result', label: '校验结果', visible: true, filterable: true, sortable: false },
+  { key: 'versionName', label: '选取版本火车名称', visible: true, filterable: true, sortable: false },
+  { key: 'name', label: '软件名称', visible: true, filterable: true, sortable: false },
+  { key: 'code', label: '软件编码', visible: true, filterable: true, sortable: false },
+  { key: 'version', label: '软件版本', visible: true, filterable: true, sortable: false },
+  { key: 'versionCode', label: '版本编码', visible: true, filterable: true, sortable: true },
+  { key: 'smStatus', label: '生命周期状态', visible: true, filterable: true, sortable: true },
+  { key: 'type', label: '主/依赖软件类型', visible: true, filterable: false, sortable: false },
+  { key: 'license', label: 'License名称', visible: true, filterable: true, sortable: false },
+  { key: 'url', label: '官网漏洞披露地址', visible: true, filterable: false, sortable: false },
+  { key: 'risk', label: '集成风险', visible: false, filterable: false, sortable: false }, // 隐藏字段
+  { key: 'useType', label: '适用类型', visible: false, filterable: false, sortable: false }, // 隐藏字段
+  { key: 'status', label: '状态', visible: false, filterable: false, sortable: false }, // 隐藏字段
+  { key: 'key', label: '键值', visible: false, filterable: false, sortable: false }, // 隐藏字段
+  { key: 'created', label: '创建时间', visible: false, filterable: false, sortable: false }, // 隐藏字段
+  { key: 'updated', label: '更新时间', visible: false, filterable: false, sortable: false }, // 隐藏字段
 ]);
 const formData = ref({ title: '',type: '', useType: '',formData:'',select: '',time1:null,name:'',versionCode:'',pulishTime:'' });
 const typeOptions = reactive(['主软件', '依赖软件']);
 const riskOptions = reactive(['低', '中', '高']);
 const useTypeOptions = reactive(['软件', '文档', '文档+软件']);
 const isUseOptions = reactive(['是', '否']);
-
+// 定义 tableKey，用于强制刷新表格
+const tableKey = ref(0);
 const pager = ref({
   total: 10,
   pageIndex: 1,
@@ -168,6 +217,16 @@ const openDelete = (row: any) => {
 
 const router = useRouter();
 
+// 定义 showColumnList 状态
+const showColumnList = ref(false);
+
+// 更新 showColumnList 的方法
+const updateShowColumnList = (newValue) => {
+  showColumnList.value = newValue;
+  tableKey.value++; // 更新 tableKey，强制刷新表格
+};
+
+
 const handleBatchImport = async() => { // 多个项目导入
   // importRepo.value = queryTable.value.filter((val) => val.checked);
   loadingStatus.batchMigrating = true;
@@ -314,10 +373,13 @@ const signCla = (row: any) => {
   border-radius: 8px 0px 8px 8px;
   //background: #F2F5FC;
 
-  .output-btn {
+  .left-btn {
     position: absolute;
     right: 28px;
     bottom: 4px;
+  }
+
+  .output-btn {
     color: #191919;
     font-family: HarmonyOS Sans SC;
     font-weight: regular;
@@ -333,4 +395,10 @@ const signCla = (row: any) => {
   padding: 7px 20px 12px;
   background: #ffffff;
 }
+
+.tjsj {
+  display: flex;
+  align-items: center;
+  margin-left: 8px;
+}
 </style>
diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue
index 90813cf..6ca72a4 100644
--- a/src/views/Jyh/Search/Components/OssQuery.vue
+++ b/src/views/Jyh/Search/Components/OssQuery.vue
@@ -8,82 +8,67 @@
             <d-button variant="solid" color="secondary">清空</d-button>
           </gc-form-operation>
           <div class="left-btn">
-            <d-button class="output-btn" icon="icon-share" variant="text">导出</d-button>
-            <span style="height: 14px" class="split"></span>
-            <TableSetting />
+            <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
+            <span v-if="isLogin" style="height: 14px" class="split"></span>
+            <TableSetting :columns="columns" :show-column-list="showColumnList" @update:show-column-list="updateShowColumnList"/>
           </div>
 
         </template>
       </AdvanceSearch>
     </div>
     <div class="mt-3 px-20">
-      <d-table class="jyh-table" v-if="tableData.length" :striped="false" :data="tableData" table-layout="auto">
+      <d-table :key="tableKey" class="jyh-table" v-if="tableData.length" :striped="false" :data="tableData" table-layout="auto">
+        <!-- 索引列 -->
         <d-column type="index" width="40"></d-column>
-        <d-column field="versionName" header="选取版本火车名称" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a>{{scope.row.versionName}}</a>
-          </template>
-        </d-column>
-        <d-column field="name" header="软件名称" filterable :filter-list="filterList" @filter-change="handleFilterChange"></d-column>
-        <d-column field="code" header="软件编码" filterable :filter-list="filterList" @filter-change="handleFilterChange"></d-column>
-        <d-column field="version" header="软件版本"  filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a @click="gotoDetail(scope.row)">{{scope.row.version}}</a>
-          </template>
-        </d-column>
-        <d-column field="versionCode" header="版本编码"  sortable :sort-method="sortNameMethod" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a @click="gotoDetail(scope.row)">{{scope.row.versionCode}}</a>
-          </template>
-        </d-column>
-        <d-column field="smStatus" header="生命周期状态"  sortable :sort-method="sortNameMethod" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <a>{{scope.row.smStatus}}</a>
-          </template>
-        </d-column>
-        <d-column field="type" header="主/依赖软件类型">
-          <template #default="scope">
-            <d-tag type="success">{{scope.row.type}}</d-tag>
-          </template>
-        </d-column>
-        <d-column field="license" header="License名称" filterable :filter-list="filterList" @filter-change="handleFilterChange">
-          <template #default="scope">
-            <span class="mr-2">{{scope.row.license}}</span>
-            <d-tag color="gray">+3</d-tag>
-          </template>
-        </d-column>
-        <d-column field="url" header="官网漏洞披露地址">
-          <template #default="scope">
-            <a>{{scope.row.url}}</a>
-          </template>
-        </d-column>
-<!--        <d-column field="risk" header="集成风险"></d-column>-->
-<!--        <d-column field="useType" header="适用类型"></d-column>-->
-<!--        <d-column field="status" header="状态">-->
-<!--          <d-status>未开始</d-status>-->
-<!--        </d-column>-->
-<!--        <d-column field="key" header="键值"></d-column>-->
-<!--        <d-column field="created" header="创建时间"></d-column>-->
-<!--        <d-column field="updated" header="更新时间"></d-column>-->
-<!--        <d-column header="操作" width="300">-->
-<!--          <template #default="scope">-->
-<!--            <div class="flex">-->
-<!--              <div class="cursor-pointer flex items-center mr-[32px]" @click="editRow(scope.row)">-->
-<!--                <GIcon class="mr-[8px]" name="gt-plane-edit" />-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">编辑</span>-->
-<!--              </div>-->
-<!--              <div class="flex items-center mr-[32px]">-->
-<!--                <d-switch v-model="scope.row.status" class="mr-[8px]" @change="setClaStatus(scope.row)"-->
-<!--                          :active-value="1" :inactive-value="0"> </d-switch>-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">{{ scope.row.status === 0 ? '停用' : '启用' }}</span>-->
-<!--              </div>-->
-<!--              <div class="cursor-pointer flex items-center" @click="openDelete(scope.row)">-->
-<!--                <GIcon class="mr-[8px]" name="gt-plane-delete" />-->
-<!--                <span class="text-[#3B3E55] text-base font-normal">删除</span>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </template>-->
-<!--        </d-column>-->
+
+        <!-- 动态渲染列 -->
+        <template v-for="column in columns" :key="column.key">
+          <d-column
+            v-if="column.visible"
+            :field="column.key"
+            :header="column.label"
+            :filterable="column.filterable"
+            :filter-list="column.filterList"
+            :sortable="column.sortable"
+            @filter-change="handleFilterChange"
+          >
+            <!-- 自定义列内容 -->
+            <template #default="scope">
+              <template v-if="column.key === 'versionName'">
+                <a>{{ scope.row.versionName }}</a>
+              </template>
+              <template v-else-if="column.key === 'version'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.version }}</a>
+              </template>
+              <template v-else-if="column.key === 'softwareVersion'">
+                <a @click="gotoDetail(scope.row)">{{ scope.row.softwareVersion }}</a>
+              </template>
+              <template v-else-if="column.key === 'smStatus'">
+                <a>{{ scope.row.smStatus }}</a>
+              </template>
+              <template v-else-if="column.key === 'industryCategory'">
+                <d-tag type="success">{{ scope.row.industryCategory }}</d-tag>
+              </template>
+              <template v-else-if="column.key === 'programmingLanguage'">
+                <d-tag type="success">{{ scope.row.programmingLanguage }}</d-tag>
+              </template>
+              <template v-else-if="column.key === 'contributorCountries'">
+                <span class="mr-2">美国 3.57%</span>
+                <d-tag color="gray">+3</d-tag>
+              </template>
+              <template v-else-if="column.key === 'contributorOrganizations'">
+                <span class="mr-2">microsoft 3.57%</span>
+                <d-tag color="gray">+3</d-tag>
+              </template>
+              <template v-else-if="column.key === 'sourceCodeDownload'">
+                <a>{{ scope.row.sourceCodeDownload }}</a>
+              </template>
+              <template v-else>
+                {{ scope.row[column.key] }}
+              </template>
+            </template>
+          </d-column>
+        </template>
       </d-table>
 
       <DataPanel v-else skeleton :card="false" :empty="true">
@@ -118,30 +103,255 @@ import TableSetting from '@/components/TableSetting/index.vue';
 import { reqCatch } from '@/utils/catch';
 import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
 import { Message } from 'vue-devui';
+import { storeToRefs } from 'pinia';
+import { useAccountStore } from '@/stores/user';
 const { namespace } = getOrgInfo();
+const userInfo = useAccountStore();
+const { isLogin } = storeToRefs(userInfo);
 
+// 定义 tableKey，用于强制刷新表格
+const tableKey = ref(0);
 const tableData = ref([
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
-  {versionName:'CleanSource V8.0', name:'eslint-plugin-import',code: '05811AFV',version: '2.29.0',versionCode: '0583423820',smStatus: '同主软件(GA)',type:'依赖软件',license:'Apache License V2.0',risk:'中',useType:'软件',status:'未开始',url:'https://example17.com/security_updates_page',key:'',created:'2025-03-10 17:25:19',updated:'2025-03-10 17:25:19'},
+  {
+    softwareName: 'eslint-plugin-import',
+    softwareVersion: '2.29.0',
+    releaseDate: '2025-03-10',
+    licenseCount: 3,
+    dependencyCount: 15,
+    productComponentUsage: ['供应链系统A', '供应链系统B'],
+    codeSize: '150KB',
+    vulnerabilityCount: 5,
+    industryCategory: '软件开发工具',
+    developer: 'ESLint团队',
+    contributorCountries: ['美国', '中国', '德国'],
+    contributorOrganizations: ['Google', 'Microsoft', 'Alibaba'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'a1b2c3d4',
+    softwareScore: 8.5,
+    sourceCodeDownload: 'https://github.com/eslint/eslint-plugin-import',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-1234',
+    versionDescription: '修复了若干安全漏洞',
+    compatibilityRisk: '低',
+    communityEOL: '2028-12-31',
+  },
+  {
+    softwareName: 'react',
+    softwareVersion: '18.2.0',
+    releaseDate: '2025-02-15',
+    licenseCount: 1,
+    dependencyCount: 10,
+    productComponentUsage: ['供应链系统C'],
+    codeSize: '500KB',
+    vulnerabilityCount: 2,
+    industryCategory: '前端框架',
+    developer: 'Facebook',
+    contributorCountries: ['美国', '加拿大', '英国'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Airbnb'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'e5f6g7h8',
+    softwareScore: 9.0,
+    sourceCodeDownload: 'https://github.com/facebook/react',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-5678',
+    versionDescription: '新增了并发渲染功能',
+    compatibilityRisk: '中',
+    communityEOL: '2030-12-31',
+  },
+  {
+    softwareName: 'vue',
+    softwareVersion: '3.2.0',
+    releaseDate: '2025-01-20',
+    licenseCount: 1,
+    dependencyCount: 8,
+    productComponentUsage: ['供应链系统D'],
+    codeSize: '300KB',
+    vulnerabilityCount: 1,
+    industryCategory: '前端框架',
+    developer: 'Evan You',
+    contributorCountries: ['中国', '美国', '日本'],
+    contributorOrganizations: ['Alibaba', 'Tencent', 'Baidu'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'i9j0k1l2',
+    softwareScore: 9.2,
+    sourceCodeDownload: 'https://github.com/vuejs/vue',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-9101',
+    versionDescription: '优化了性能',
+    compatibilityRisk: '低',
+    communityEOL: '2029-12-31',
+  },
+  {
+    softwareName: 'webpack',
+    softwareVersion: '5.75.0',
+    releaseDate: '2025-04-05',
+    licenseCount: 2,
+    dependencyCount: 20,
+    productComponentUsage: ['供应链系统E'],
+    codeSize: '1MB',
+    vulnerabilityCount: 3,
+    industryCategory: '构建工具',
+    developer: 'Webpack团队',
+    contributorCountries: ['美国', '德国', '俄罗斯'],
+    contributorOrganizations: ['Google', 'Microsoft', 'Yandex'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'm3n4o5p6',
+    softwareScore: 8.8,
+    sourceCodeDownload: 'https://github.com/webpack/webpack',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-1122',
+    versionDescription: '修复了构建性能问题',
+    compatibilityRisk: '高',
+    communityEOL: '2027-12-31',
+  },
+  {
+    softwareName: 'babel',
+    softwareVersion: '7.20.0',
+    releaseDate: '2025-03-25',
+    licenseCount: 1,
+    dependencyCount: 12,
+    productComponentUsage: ['供应链系统F'],
+    codeSize: '400KB',
+    vulnerabilityCount: 4,
+    industryCategory: '编译器',
+    developer: 'Babel团队',
+    contributorCountries: ['美国', '英国', '印度'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Uber'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'q7r8s9t0',
+    softwareScore: 8.7,
+    sourceCodeDownload: 'https://github.com/babel/babel',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-3344',
+    versionDescription: '新增了对新语法的支持',
+    compatibilityRisk: '中',
+    communityEOL: '2026-12-31',
+  },
+  {
+    softwareName: 'typescript',
+    softwareVersion: '5.0.0',
+    releaseDate: '2025-05-01',
+    licenseCount: 1,
+    dependencyCount: 5,
+    productComponentUsage: ['供应链系统G'],
+    codeSize: '2MB',
+    vulnerabilityCount: 0,
+    industryCategory: '编程语言',
+    developer: 'Microsoft',
+    contributorCountries: ['美国', '中国', '加拿大'],
+    contributorOrganizations: ['Microsoft', 'Google', 'Alibaba'],
+    programmingLanguage: 'TypeScript',
+    communityHash: 'u1v2w3x4',
+    softwareScore: 9.5,
+    sourceCodeDownload: 'https://github.com/microsoft/TypeScript',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: '无',
+    versionDescription: '新增了装饰器功能',
+    compatibilityRisk: '低',
+    communityEOL: '2035-12-31',
+  },
+  {
+    softwareName: 'jest',
+    softwareVersion: '29.0.0',
+    releaseDate: '2025-06-10',
+    licenseCount: 1,
+    dependencyCount: 18,
+    productComponentUsage: ['供应链系统H'],
+    codeSize: '600KB',
+    vulnerabilityCount: 2,
+    industryCategory: '测试工具',
+    developer: 'Facebook',
+    contributorCountries: ['美国', '德国', '法国'],
+    contributorOrganizations: ['Facebook', 'Netflix', 'Spotify'],
+    programmingLanguage: 'JavaScript',
+    communityHash: 'y5z6a7b8',
+    softwareScore: 9.1,
+    sourceCodeDownload: 'https://github.com/facebook/jest',
+    copyright: 'MIT License',
+    externalVulnerabilitySource: 'CVE-2025-5566',
+    versionDescription: '优化了测试性能',
+    compatibilityRisk: '中',
+    communityEOL: '2032-12-31',
+  },
+  {
+    softwareName: 'docker',
+    softwareVersion: '24.0.0',
+    releaseDate: '2025-07-15',
+    licenseCount: 1,
+    dependencyCount: 25,
+    productComponentUsage: ['供应链系统I'],
+    codeSize: '10MB',
+    vulnerabilityCount: 6,
+    industryCategory: '容器化工具',
+    developer: 'Docker Inc.',
+    contributorCountries: ['美国', '英国', '澳大利亚'],
+    contributorOrganizations: ['Docker Inc.', 'Google', 'Amazon'],
+    programmingLanguage: 'Go',
+    communityHash: 'c9d0e1f2',
+    softwareScore: 9.3,
+    sourceCodeDownload: 'https://github.com/docker/docker',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: 'CVE-2025-7788',
+    versionDescription: '新增了对ARM架构的支持',
+    compatibilityRisk: '高',
+    communityEOL: '2030-12-31',
+  },
+  {
+    softwareName: 'kubernetes',
+    softwareVersion: '1.28.0',
+    releaseDate: '2025-08-20',
+    licenseCount: 1,
+    dependencyCount: 30,
+    productComponentUsage: ['供应链系统J'],
+    codeSize: '15MB',
+    vulnerabilityCount: 8,
+    industryCategory: '容器编排工具',
+    developer: 'CNCF',
+    contributorCountries: ['美国', '中国', '德国'],
+    contributorOrganizations: ['Google', 'Red Hat', 'IBM'],
+    programmingLanguage: 'Go',
+    communityHash: 'g3h4i5j6',
+    softwareScore: 9.4,
+    sourceCodeDownload: 'https://github.com/kubernetes/kubernetes',
+    copyright: 'Apache License 2.0',
+    externalVulnerabilitySource: 'CVE-2025-9900',
+    versionDescription: '优化了集群管理功能',
+    compatibilityRisk: '高',
+    communityEOL: '2033-12-31',
+  },
+  {
+    softwareName: 'postgresql',
+    softwareVersion: '15.0.0',
+    releaseDate: '2025-09-25',
+    licenseCount: 1,
+    dependencyCount: 7,
+    productComponentUsage: ['供应链系统K'],
+    codeSize: '8MB',
+    vulnerabilityCount: 3,
+    industryCategory: '数据库',
+    developer: 'PostgreSQL团队',
+    contributorCountries: ['美国', '加拿大', '日本'],
+    contributorOrganizations: ['PostgreSQL Inc.', 'Amazon', 'Microsoft'],
+    programmingLanguage: 'C',
+    communityHash: 'k7l8m9n0',
+    softwareScore: 9.6,
+    sourceCodeDownload: 'https://github.com/postgres/postgres',
+    copyright: 'PostgreSQL License',
+    externalVulnerabilitySource: 'CVE-2025-1122',
+    versionDescription: '新增了JSONB索引功能',
+    compatibilityRisk: '低',
+    communityEOL: '2035-12-31',
+  },
 ]);
 const formData = ref({ title: '',type: '', useType: '',formData:'',select: '',time1:null,name:'',versionCode:'',pulishTime:'' });
 const typeOptions = reactive(['主软件', '依赖软件']);
 const riskOptions = reactive(['低', '中', '高']);
 const useTypeOptions = reactive(['软件', '文档', '文档+软件']);
 const isUseOptions = reactive(['是', '否']);
-
 const newFormData = ref({
-  licenseName: '',
+  license: '',
   searchWord: '',
-  softwareVersion: '',
+  version: '',
   dependentSoftware: '',
   programmingLanguage: '',
   dateRange: ['', '']
@@ -163,6 +373,40 @@ const openDelete = (row: any) => {
   deletevModels.value = true;
 };
 
+// 定义 columns 数据
+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: '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: 'codeSize', 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: 'developer', 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: 'programmingLanguage', label: '编程语言', visible: false, filterable: true, sortable: false },
+  { key: 'communityHash', label: '社区hash值', visible: false, filterable: false, sortable: false },
+  { key: 'softwareScore', label: '软件评分', visible: false, filterable: false, sortable: true },
+  { key: 'sourceCodeDownload', label: '源码包下载地址', visible: true, 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 },
+  { key: 'compatibilityRisk', label: '兼容性风险描述', visible: false, filterable: false, sortable: false },
+  { key: 'communityEOL', label: '社区EOL时间', visible: false, filterable: true, sortable: true },
+]);
+
+// 定义 showColumnList 状态
+const showColumnList = ref(false);
+
+// 更新 showColumnList 的方法
+const updateShowColumnList = (newValue) => {
+  showColumnList.value = newValue;
+  tableKey.value++; // 更新 tableKey，强制刷新表格
+};
+
 const router = useRouter();
 const route = useRoute();
 // 跳转
diff --git a/src/views/Jyh/Version/Detail/VersionInfo.vue b/src/views/Jyh/Version/Detail/VersionInfo.vue
index 31909d6..d3facfa 100644
--- a/src/views/Jyh/Version/Detail/VersionInfo.vue
+++ b/src/views/Jyh/Version/Detail/VersionInfo.vue
@@ -97,12 +97,12 @@
           <d-column field="detail" header="应用场景"></d-column>
         </d-table>
       </div>
-      <d-row>
-        <d-col :span="24">
-          <span class="card-key width-140">主License分析报告</span>
-          <a class="card-url" href="https://designcloud.uiplus.huawei.com/developer/main/index.html">https://designcloud.uiplus.huawei.com/developer/main/index.html</a>
-        </d-col>
-      </d-row>
+<!--      <d-row>-->
+<!--        <d-col :span="24">-->
+<!--          <span class="card-key width-140">主License分析报告</span>-->
+<!--          <a class="card-url" href="https://designcloud.uiplus.huawei.com/developer/main/index.html">https://designcloud.uiplus.huawei.com/developer/main/index.html</a>-->
+<!--        </d-col>-->
+<!--      </d-row>-->
     </Card>
     <Card simple class="jyh-card mb-4">
       <div class="card-title">Copyright报告</div>