Merge remote-tracking branch 'origin/dev-css-refact' into dev

# Conflicts:
#	src/Login.vue
#	src/assets/css/components/components/rightBox/report/reportBox.scss
#	src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
#	src/assets/css/components/views/charts2/networkOverviewApps.scss
#	src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss
#	src/assets/css/components/views/entityExplorer/entityList/row.scss
#	src/components/rightBox/report/ReportBox.vue
#	src/components/table/setting/knowledgeBaseTableForCard.vue
#	src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
#	src/views/entityExplorer/entityList/Row.vue

src/utils/constants.js

@@ -232,32 +232,32 @@ export const eventSeverity = {
   info: 'info'
 }
 export const eventSeverityColor = {
-  critical: '#D84C4C',
-  high: '#FE845D',
-  medium: '#FFB65A',
-  low: '#FFD82D',
-  info: '#D1BD50'
+  critical: 'var(--cn-color-critical)',
+  high: 'var(--cn-color-high)',
+  medium: 'var(--cn-color-medium)',
+  low: 'var(--cn-color-low)',
+  info: 'var(--cn-color-info)'
 }
 export const riskLevelColor = {
-  5: '#D84C4C',
-  4: '#FE845D',
-  3: '#FFB65A',
-  2: '#FFD82D',
-  1: '#D1BD50'
+  5: 'var(--cn-color-critical)',
+  4: 'var(--cn-color-high)',
+  3: 'var(--cn-color-medium)',
+  2: 'var(--cn-color-low)',
+  1: 'var(--cn-color-info)'
 }
 export const riskLevelColor1 = {
-  'High Risk': '#D84C4C',
-  Suspicious: '#FE845D',
-  'Moderate Risk': '#FFB65A',
-  'Low Risk': '#FFD82D',
-  Trustworthy: '#D1BD50'
+  'High Risk': 'var(--cn-color-critical)',
+  Suspicious: 'var(--cn-color-high)',
+  'Moderate Risk': 'var(--cn-color-medium)',
+  'Low Risk': 'var(--cn-color-low)',
+  Trustworthy: 'var(--cn-color-info)'
 }
 export const eventSeverityColor1 = {
-  Critical: '#D84C4C',
-  High: '#FE845D',
-  Medium: '#FFB65A',
-  Low: '#FFD82D',
-  Info: '#D1BD50'
+  Critical: 'var(--cn-color-critical)',
+  High: 'var(--cn-color-high)',
+  Medium: 'var(--cn-color-medium)',
+  Low: 'var(--cn-color-low)',
+  Info: 'var(--cn-color-info)'
 }
 export const securityType = {
   commandAndControl: 'common and control',
@@ -2797,27 +2797,27 @@ export const securityLevel = [
   {
     value: 'critical',
     label: 'overall.critical',
-    color: '#D84C4C'
+    color: 'var(--cn-color-critical)'
   },
   {
     value: 'high',
     label: 'overall.high',
-    color: '#FE845D'
+    color: 'var(--cn-color-high)'
   },
   {
     value: 'medium',
     label: 'overall.medium',
-    color: '#FFB65A'
+    color: 'var(--cn-color-medium)'
   },
   {
     value: 'low',
     label: 'overall.low',
-    color: '#FFD82D'
+    color: 'var(--cn-color-low)'
   },
   {
     value: 'info',
     label: 'overall.info',
-    color: '#D1BD50'
+    color: 'var(--cn-color-info)'
   }
 ]
 

src/utils/tools.js

@@ -1440,7 +1440,7 @@ export const myHighLight = {
           if (newText && newText !== '-') {
             // 此处不用el.className.indexOf('high-light-block')判断，是因为block可能会有多个，有一个满足所有的都会渲染
             if (newText.indexOf('highlight__block') > -1) {
-              el.style.cssText = el.style.cssText + 'background: #FEECC2;'
+              el.style.cssText = el.style.cssText + 'background: var(--el-color-warning-light-7);'
               // 此处是相关app、相关ip、相关domain弹窗获取不到dom的操作
               let dom
               if (document.getElementById('showRelatedApp')) {
@@ -1454,7 +1454,7 @@ export const myHighLight = {
                 if (itemDom) {
                   for (let i = 0; i < itemDom.length; i++) {
                     if (itemDom[i].innerHTML === el.innerHTML) {
-                      itemDom[i].style.cssText = itemDom[i].style.cssText + 'background: #FEECC2;'
+                      itemDom[i].style.cssText = itemDom[i].style.cssText + 'background: var(--el-color-warning-light-7);'
                     }
                   }
                 }