cfy777/Situation-Awareness-Platform-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge lll into master

Browse Source 
所有软件/组件的名称统一改成软件

Created-by: LovableCat
Commit-by: LovableCat
Merged-by: LovableCat
Description: 解决 组织介绍的文本框长度不够，无法显示200个字 问题
所有软件/组件的名称统一改成软件

See merge request: hk_openRepo/OpenRepo_Portal!23
This commit is contained in:
LovableCat
2025-03-18 17:38:12 +08:00
parent 1c34806625 61b3a9d3f6
commit 1cc76ee2f2
10 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/AdvanceSearch/index.vue
View File

@@ -9,8 +9,8 @@
</d-form-item>
</d-col>
<d-col :span="8">
<d-form-item field="name" label="软件/组件名称">
<d-input placeholder="请输入软件/组件名称" v-model="formData.searchWord"/>
<d-form-item field="name" label="软件名称">
<d-input placeholder="请输入软件名称" v-model="formData.searchWord"/>
</d-form-item>
</d-col>
<d-col :span="8">
@@ -132,4 +132,4 @@ getLanguageList();
<style scoped lang="scss">
</style>
</style>

8
src/views/Jyh/Home/index.vue
View File

@@ -16,7 +16,7 @@
</div>
<template #menu>
<ul class="list-menu">
<li class="menu-item" @click="onCategoryChange('组件/软件')">组件/软件</li>
<li class="menu-item" @click="onCategoryChange('软件')">软件</li>
<d-dropdown :position="position" :offset="0">
<li class="menu-item">
行业
@@ -98,8 +98,8 @@ const inputGlow = ref(false);
const searchStr = ref('');
const position = ref(['right-start', 'right-end']);
const industryOptions = ref(['通信', '军工', '金融', '能源'])
const searchType = ref('组件/软件');
const searchOptions = ref(['组件/软件']);
const searchType = ref('软件');
const searchOptions = ref(['软件']);
const offset = ref({ mainAxis: 7 , crossAxis: -10 });
const isOpen = ref(false);
const rotate = ref(0);
@@ -127,7 +127,7 @@ const infoList = ref([
const homeSearch = ref(null);
const dropdownWidth = ref(0);
const selectedCate = ref('组件/软件');
const selectedCate = ref('软件');
const searchInput = ref(null);
const openAdvancedSearch = () => {

4
src/views/Jyh/LicenseInfo/index.vue
View File

@@ -70,7 +70,7 @@ const tableConfig = ref([
},
{
field: 'affectedComponent',
header: '影响组件',
header: '影响软件',
sortable: true,
sortMethod: null
},
@@ -147,4 +147,4 @@ const list = ref([
width: 14px;
height: 14px;
}
</style>
</style>

2
src/views/Jyh/PersonalCenter 2/Detail/OrgSubscription.vue
View File

@@ -4,7 +4,7 @@
<div class="mb-3">
<d-table class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
<d-column field="code" header="订阅时间"></d-column>
<d-column field="name" header="软件/组件名称"></d-column>
<d-column field="name" header="软件名称"></d-column>
<d-column field="detail" header="版本号"></d-column>
<d-column field="owner" header="订阅人"></d-column>
<d-column header="操作" width="100">

2
src/views/Jyh/PersonalCenter 2/Detail/PersonageSubscription.vue
View File

@@ -4,7 +4,7 @@
<div class="mb-3">
<d-table class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
<d-column field="code" header="订阅时间"></d-column>
<d-column field="name" header="软件/组件名称"></d-column>
<d-column field="name" header="软件名称"></d-column>
<d-column field="detail" header="版本号"></d-column>
<d-column header="操作" width="100">
<template #default="scope">

2
src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue
View File

@@ -4,7 +4,7 @@
<div class="mb-3">
<d-table class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
<d-column field="code" header="订阅时间"></d-column>
<d-column field="name" header="软件/组件名称"></d-column>
<d-column field="name" header="软件名称"></d-column>
<d-column field="detail" header="版本号"></d-column>
<d-column field="owner" header="订阅人"></d-column>
<d-column header="操作" width="100">

2
src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue
View File

@@ -4,7 +4,7 @@
<div class="mb-3">
<d-table class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
<d-column field="code" header="订阅时间"></d-column>
<d-column field="name" header="软件/组件名称"></d-column>
<d-column field="name" header="软件名称"></d-column>
<d-column field="detail" header="版本号"></d-column>
<d-column header="操作" width="100">
<template #default="scope">

19
src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue
View File

@@ -18,7 +18,7 @@
<div v-else>{{ organizationInfo.organizationName }}</div>
</d-form-item>
<d-form-item field="organizationProfile" label="组织简介">
<d-textarea v-if="isEdit" v-model="createFormData.organizationProfile" show-count maxlength="200" />
<d-textarea v-if="isEdit" v-model="createFormData.organizationProfile" show-count maxlength="200" :rows="5" />
<div v-else>{{ organizationInfo.organizationProfile }}</div>
</d-form-item>
</d-form>
@@ -35,10 +35,9 @@
<d-search icon-position="left" class="w-[296px]" placeholder="请输入搜索内容" />
</div>
<d-table
v-if="memberTableData.length"
:data="memberTableData"
class="w-full mb-[20px]"
fix-header
class="w-full mb-[20px] organ-table"
:fix-header="memberTableData.length > 0"
header-bg
max-height="500px"
>
@@ -52,11 +51,13 @@
<d-column field="joinDate" header="加入时间" />
<d-column header="操作">
<template #default="{ row }">
<d-button variant="text" color="primary" @click="openDeleteModal(row)">删除</d-button>
<d-button size="sm" variant="text" color="primary" class="p-0 justify-start" @click="openDeleteModal(row)">删除</d-button>
</template>
</d-column>
<template #empty>
<NoData />
</template>
</d-table>
<NoData v-else />
<d-pagination
class="flex justify-end"
:total="pager.total"
@@ -83,7 +84,7 @@
<d-input v-model="createFormData.organizationName" />
</d-form-item>
<d-form-item field="organizationProfile" label="组织简介" required>
<d-textarea v-model="createFormData.organizationProfile" show-count maxlength="200" />
<d-textarea v-model="createFormData.organizationProfile" show-count maxlength="200" :rows="6" />
</d-form-item>
</d-form>
@@ -112,7 +113,7 @@
</d-modal>
<d-modal v-model="deleteMemberModalCtrl" title="删除成员" class="w-[600px]">
<div>即将删除成员‘{{ deleteRow.userName }}’，请确认是否继续？</div>
<div class="mb-[20px]">即将删除成员‘{{ deleteRow.userName }}’，请确认是否继续？</div>
<div class="flex justify-center">
<d-button variant="solid" class="mr-[8px]" @click="deleteMember">确定</d-button>
<d-button @click="closeDeleteMemberModal">取消</d-button>
@@ -363,7 +364,7 @@ function closeDeleteMemberModal() {
</script>
<style scoped lang="scss">
:deep(.devui-table__row td) {
.organ-table :deep(.devui-table__row td) {
padding: 10px 16px;
}
</style>

6
src/views/Jyh/Version/Detail/Dependency.vue
View File

@@ -34,9 +34,9 @@
<d-table ref="table" :data="baseTreeTableData1" >
<d-column width="20px" type="index">
</d-column>
<d-column field="name" header="组件版本名称" show-overflow-tooltip></d-column>
<d-column field="name" header="软件版本名称" show-overflow-tooltip></d-column>
<d-column field="groupid" header="groupid"></d-column>
<d-column field="code" filterable :filter-list="filterList" @filter-change="handleFilterChange" header="组件编号">
<d-column field="code" filterable :filter-list="filterList" @filter-change="handleFilterChange" header="软件编号">
<template #default="scope">
<a class="devui-link" @click="showDetail = true">{{ scope.row.code }}</a>
</template>
@@ -44,7 +44,7 @@
<d-column field="packageName" filterable :filter-list="packageFilterList" @filter-change="handleFilterChange" header="packageName"></d-column>
<d-column field="version" filterable :filter-list="versionFilterList" @filter-change="handleFilterChange" header="version"></d-column>
<d-column field="language" filterable :filter-list="languageFilterList" @filter-change="handleFilterChange" header="编程语言"></d-column>
<d-column field="number" header="组件漏洞数量">
<d-column field="number" header="软件漏洞数量">
<template #default="scope">
<a class="devui-link" @click="showDetail = true">{{ scope.row.number }}</a>
</template>

4
src/views/Jyh/Version/Detail/SBOM.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="flex align-center justify-start">
<d-search icon-position="left" style="width: 380px" placeholder="请输入搜索组件名称"></d-search>
<d-checkbox class="ml-10" label="只显示有漏洞的组件" :isShowTitle="false" v-model="checked" />
<d-search icon-position="left" style="width: 380px" placeholder="请输入搜索软件名称"></d-search>
<d-checkbox class="ml-10" label="只显示有漏洞的软件" :isShowTitle="false" v-model="checked" />
</div>
<Card simple class="jyh-card mt-3">
<div class="clear-padding">