diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue index e28a559..7c5f7c3 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue @@ -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> diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue index 14bd6ec..e2a1c7e 100644 --- a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue @@ -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> diff --git a/cmdb-ui/src/style/static.less b/cmdb-ui/src/style/static.less index 12c6c32..2dcadca 100644 --- a/cmdb-ui/src/style/static.less +++ b/cmdb-ui/src/style/static.less @@ -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;