test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

style(系统设置): 系统-资源池-调整表格里icon展示

This commit is contained in:
teukkk 2024-10-17 17:54:27 +08:00 committed by Craftsman
parent e1d6ec26f8
commit 9051dec329
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/views/setting/system/resourcePool/detail.vue
View File

@ -326,7 +326,7 @@
<template #label> <template #label>
<div class="flex items-center gap-[4px]"> <div class="flex items-center gap-[4px]">
<div>{{ t('system.resourcePool.testResourceDTO.concurrentNumber') }}</div> <div>{{ t('system.resourcePool.testResourceDTO.concurrentNumber') }}</div>
<a-tooltip :content="t('system.resourcePool.concurrentNumberTip')" position="tl" mini> <a-tooltip v-if="!isXpack" :content="t('system.resourcePool.concurrentNumberTip')" position="tl" mini>
<icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" /> <icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" />
</a-tooltip> </a-tooltip>
</div> </div>
@ -346,7 +346,12 @@
<template #label> <template #label>
<div class="flex items-center gap-[4px]"> <div class="flex items-center gap-[4px]">
<div>{{ t('system.resourcePool.testResourceDTO.podThreads') }}</div> <div>{{ t('system.resourcePool.testResourceDTO.podThreads') }}</div>
<a-tooltip :content="t('system.resourcePool.testResourceDTO.podThreadsTip')" position="tl" mini> <a-tooltip
v-if="!isXpack"
:content="t('system.resourcePool.testResourceDTO.podThreadsTip')"
position="tl"
mini
>
<icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" /> <icon-question-circle class="ml-[4px] text-[var(--color-text-4)] hover:text-[rgb(var(--primary-6))]" />
</a-tooltip> </a-tooltip>
</div> </div>

9
frontend/src/views/setting/system/resourcePool/index.vue
View File

@ -22,7 +22,7 @@
<template #name="{ record }"> <template #name="{ record }">
<div class="flex items-center gap-[8px]"> <div class="flex items-center gap-[8px]">
<a-tooltip <a-tooltip
v-if="record.type !== 'Kubernetes'" v-if="record.type === 'Node' && record.enable"
:content="t('system.resourcePool.viewCapacityInfo')" :content="t('system.resourcePool.viewCapacityInfo')"
:mouse-enter-delay="300" :mouse-enter-delay="300"
position="bottom" position="bottom"
@ -179,13 +179,6 @@
showTooltip: true, showTooltip: true,
width: 150, width: 150,
}, },
{
title: 'system.resourcePool.remainingConcurrency',
slotName: 'lastConcurrentNumber',
dataIndex: 'lastConcurrentNumber',
showTooltip: true,
width: 150,
},
{ {
title: 'system.resourcePool.orgRange', title: 'system.resourcePool.orgRange',
slotName: 'orgNames', slotName: 'orgNames',