From b7c0b742474b09f7b19a5a569a12ffc13e8c9780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Tue, 20 Feb 2024 11:01:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AF=B9=E4=BA=8E=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?tag=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/tools.js                                        | 2 +-
 .../charts/entityDetail/tabs/InformationAggregation.vue   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/utils/tools.js b/src/utils/tools.js
index 979d6298..c8238c26 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -1534,7 +1534,7 @@ export const formatTagsOfDetails = (data, type, list) => {
         intelligenceContent: []
       }
       if (k === 'userDefinedTag') {
-        aggregation.intelligenceContent.push({ key: k, value: r[k].tagValue, type: 'normal' })
+        aggregation.intelligenceContent.push({ key: k, value: r[k].tagValue, type: 'normal', color: r[k].knowledgeBase ? (r[k].knowledgeBase.color || entityDefaultColor) : entityDefaultColor })
       } else {
         if (_.isArray(r[k])) {
           r[k].forEach(k3 => {
diff --git a/src/views/charts2/charts/entityDetail/tabs/InformationAggregation.vue b/src/views/charts2/charts/entityDetail/tabs/InformationAggregation.vue
index 9c3115f3..0a364d6f 100644
--- a/src/views/charts2/charts/entityDetail/tabs/InformationAggregation.vue
+++ b/src/views/charts2/charts/entityDetail/tabs/InformationAggregation.vue
@@ -41,7 +41,10 @@
           <template #default="scope">
               <div class="information-aggregation-tags">
                 <div  v-for="ic in scope.row.intelligenceContent" :key="ic.key"
-                      class="entity-tag entity-tag--small margin-r-6" :test-id="`entity-tag${scope.$index}`" :class="`entity-tag--level-two-${ic.type}`">
+                      class="entity-tag entity-tag--small margin-r-6"
+                      :test-id="`entity-tag${scope.$index}`"
+                      :style="getTagColor(ic.color)"
+                      :class="`entity-tag--level-two-${ic.type}`">
                   {{ic.value}}
                 </div>
               </div>
@@ -75,7 +78,7 @@ import { entityDetailTabsName } from '@/utils/constants'
 import { dateFormatByAppearance, getNowTime } from '@/utils/date-util'
 import chartNoData from '@/views/charts/charts/ChartNoData'
 import { ref } from 'vue'
-import { formatTagsOfDetails } from '@/utils/tools'
+import { formatTagsOfDetails, getTagColor } from '@/utils/tools'
 
 export default {
   name: 'InformationAggregation',
@@ -101,6 +104,7 @@ export default {
   components: { chartNoData },
   methods: {
     dateFormatByAppearance,
+    getTagColor,
     intelligenceContentClass ({ columnIndex }) {
       if (columnIndex === 2) {
         return 'padding-0'