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

src/views/charts2/charts/entityDetail/tabs/DigitalCertificate.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chart-error v-if="showError" style="margin-top: 18px;margin-left: 8px;"></chart-error>
+    <chart-error v-if="showError" :content="errorMsg" style="margin-top: 18px;margin-left: 8px;"></chart-error>
     <chart-no-data v-if="isNoData && !showError"></chart-no-data>
 
     <div class="digital-certificate" v-if="!showError && !isNoData" :style="{width: moreCertificatesWidth}">
@@ -52,7 +52,8 @@ export default {
     return {
       showError: false,
       isNoData: false,
-      infoList: []
+      infoList: [],
+      errorMsg: ''
     }
   },
   mixins: [chartMixin],

src/views/charts2/charts/entityDetail/tabs/PerformanceEvent.vue

@@ -1,5 +1,5 @@
 <template>
-  <chart-error v-if="showError" class="entity-detail-event-error"></chart-error>
+  <chart-error v-if="showError" :content="errorMsg" class="entity-detail-event-error"></chart-error>
   <chart-no-data v-if="isNoData && !showError"></chart-no-data>
 
   <div v-if="!isNoData && !showError" class="entity-detail-event-block">
@@ -67,7 +67,8 @@ export default {
     return {
       eventList: [],
       showError: false,
-      eventSeverityColor1
+      eventSeverityColor1,
+      errorMsg: ''
     }
   },
   setup () {

src/views/charts2/charts/entityDetail/tabs/SecurityEvent.vue

@@ -1,5 +1,5 @@
 <template>
-  <chart-error v-if="showError" class="entity-detail-event-error"></chart-error>
+  <chart-error v-if="showError" :content="errorMsg" class="entity-detail-event-error"></chart-error>
   <chart-no-data v-if="isNoData && !showError"></chart-no-data>
 
   <div v-if="!isNoData && !showError" class="entity-detail-event-block">
@@ -89,7 +89,8 @@ export default {
     return {
       eventList: [],
       showError: false,
-      eventSeverityColor1
+      eventSeverityColor1,
+      errorMsg: ''
     }
   },
   setup () {