7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #558 from veops/dev_ui_ad 

fix: build error
This commit is contained in:
Leo Song 2024-06-20 20:03:40 +08:00 committed by GitHub
parent 23f1edcc65 e7f02817bf
commit c5761fc805
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue
View File

@ -10,14 +10,11 @@
<a-tab-pane key="3" :tab="$t('cmdb.ciType.autoDiscoveryTab')">
<ADTab v-if="activeKey === '3'" :CITypeId="CITypeId"></ADTab>
</a-tab-pane>
<a-tab-pane key="5" :tab="$t('cmdb.reconciliation.tab')">
<ReconciliationTable ref="reconciliationTable" :CITypeId="CITypeId" :CITypeChangeDisabled="true" />
</a-tab-pane>
<a-tab-pane key="6" :tab="$t('cmdb.ciType.trigger')">
<a-tab-pane key="5" :tab="$t('cmdb.ciType.trigger')">
<TriggerTable ref="triggerTable" :CITypeId="CITypeId"></TriggerTable>
</a-tab-pane>
<a-tab-pane key="7" :tab="$t('cmdb.ciType.grant')">
<template v-if="activeKey === '7'">
<a-tab-pane key="6" :tab="$t('cmdb.ciType.grant')">
<template v-if="activeKey === '6'">
<GrantComp :CITypeId="CITypeId" resourceType="CIType" :resourceTypeName="CITypeName"></GrantComp>
<div class="citype-detail-title">{{ $t('cmdb.components.relationGrant') }}</div>
<RelationTable isInGrantComp :CITypeId="CITypeId" :CITypeName="CITypeName"></RelationTable>

2
cmdb-ui/src/modules/cmdb/views/discovery/index.vue
View File

@ -70,7 +70,7 @@
</div>
</template>
<div class="setting-discovery-empty" v-else>
<img class="setting-discovery-empty-img" :src="require(`@/modules/monitor/assets/empty-state.svg`)" />
<img class="setting-discovery-empty-img" :src="require(`@/assets/data_empty.png`)" />
<p class="setting-discovery-empty-text">{{ $t('noData') }}</p>
</div>
</div>

2
cmdb-ui/src/style/static.less
View File

@ -11,6 +11,8 @@
@primary-color_7: #f7f8fa;
@primary-color_8: #b1c9ff;
@link-color: @primary-color;
// Neutral color
@text-color_1: #1d2129;
@text-color_2: #4e5969;