From 3ba67d48261481e1c35a30316b73caee5db514d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Mon, 15 May 2023 10:46:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?class=E5=85=B3=E9=94=AE=E5=AD=97=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Error.vue                   | 5 +++--
 src/components/common/TimeRange/DateTimeRange.vue | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/common/Error.vue b/src/components/common/Error.vue
index 9698768f..093c50e2 100644
--- a/src/components/common/Error.vue
+++ b/src/components/common/Error.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="showDefault" class="error-component" :style="style" :class="class">
+  <div v-if="showDefault" class="error-component" :style="style" :class="myClass">
     <div class="error-block" :style="{'max-width': localMaxWidth, 'width': localWidth}">
       <svg class="icon error-icon-default" aria-hidden="true">
         <use xlink:href="#cn-icon-baocuo"></use>
@@ -115,7 +115,8 @@ export default {
       showSmall: false, // 显示错误的类型，true为图表模块内显示报错，false为标题后显示报错
       localWidth: '',
       localMaxWidth: '',
-      localPopoverWidth: ''
+      localPopoverWidth: '',
+      myClass: this.class
     }
   },
   mounted () {
diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index 9444f8e2..58c0583f 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -1,6 +1,6 @@
 <template>
-  <div v-ele-click-outside="changeDropdown" style="position: relative;z-index: 4" class="date-range-box">
-    <div @click="showDropdown" class="date-range-text" :class="class" :style="style">
+  <div v-ele-click-outside="changeDropdown" style="position: relative;" class="date-range-box">
+    <div @click="showDropdown" class="date-range-text" :class="myClass" :style="style">
       <div class="calendar-popover-text"><i class="cn-icon cn-icon-Data"></i></div>
       <div class="calendar-popover-text" style="display: flex" v-if="isCustom">
         <div class="calendar-popover-text">{{ dateFormatByAppearance(getMillisecond(startTime)) }}</div>
@@ -14,7 +14,7 @@
         <i class="cn-icon cn-icon-dropdown" :class="dropdownFlag ? 'cn-icon-up' : ''"></i>
       </div>
     </div>
-    <transition name="el-zoom-in-top">
+    <transition name="el-zoom-in-top" style="z-index: 4;">
       <div v-if="dropdownFlag" class="date-range-panel">
         <el-row class="date-range-panel-top" style="position: relative">
           <el-col :span="16" class="date-range-panel-content date-range-panel-content-left">
@@ -109,6 +109,7 @@ export default {
     const store = useStore()
     const myStartTime = ref(props.startTime)
     const myEndTime = ref(props.endTime)
+    const myClass = ref(props.class)
     // 时间选择器绑定的值
     const newDateValue = ref([
       new Date(...timestampToList(myStartTime.value)),
@@ -282,6 +283,7 @@ export default {
     return {
       myStartTime,
       myEndTime,
+      myClass,
       dropdownFlag,
       utcStr,
       rangeEchartsData,