fix：解决冲突

nezha-fronted/package-lock.json

@@ -17233,7 +17233,7 @@
     },
     "sass-loader": {
       "version": "8.0.2",
-      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-8.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
       "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "requires": {

nezha-fronted/src/assets/css/common/tableCommon.scss

@@ -12,7 +12,7 @@
     flex-direction: column;
     height: 100%;
     width: 100%;
-    z-index: 0;
+    // z-index: 0;
   }
   .main-container {
     padding: 0px;

nezha-fronted/src/assets/css/components/common/alert/alertDaysInfo.scss

@@ -14,7 +14,7 @@
 }
 .alert-days-info-tooltip{
   position: fixed;
-  z-index: 1;
+  z-index: 3000;
   padding: 5px 10px 5px 10px;
   line-height: 20px;
   min-width: 120px;

nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss

@@ -76,6 +76,7 @@
   height: 50%;
   position: relative;
   padding: 0;
+  z-index: 10;
   .top-tools.top-tools--sub {
     border-bottom: 1px solid $--border-color-light;
     .top-tool-right {

nezha-fronted/src/components/chart/ChartScreenHeader.vue

@@ -201,8 +201,13 @@ export default {
       this.searchTime[1] = bus.timeFormate(this.timeRange[1])
       this.nowType.start_time = this.searchTime[0]
       this.nowType.end_time = this.searchTime[1]
-      this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
+      if (!this.nowTimeType) {
-      this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
+        this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
+        this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
+      } else {
+        this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowTimeType)
+        this.setSearchTime(this.nowType.type, this.nowType.value, this.nowTimeType)
+      }
     }
   }
 }

nezha-fronted/src/components/chart/chartHeaderMixin.js

@@ -27,6 +27,9 @@ export default {
       type: Boolean,
       default: false
     },
+    nowTimeType: {
+      type: Number
+    },
     hiddenText: { // 隐藏图表的悬浮文字
       type: String
     }

nezha-fronted/src/components/chart/panelChart.vue

@@ -8,6 +8,7 @@
       :isExportHtml="isExportHtml"
       :isError="isError"
       :from="from"
+      :nowTimeType="nowTimeType"
       :chartData="chartData"
       :chart-info="chartInfo"
       :showAllData.sync="showAllData"
@@ -27,6 +28,7 @@
       :is-group="isGroup(chartInfo.type)"
       :isError="isError"
       :from="from"
+      :nowTimeType="nowTimeType"
       :chartData="chartData"
       :chart-info="chartInfo"
       :showAllData.sync="showAllData"
@@ -95,6 +97,9 @@ export default {
       type: Boolean,
       default: true
     },
+    nowTimeType: {
+      type: Object
+    },
     isExportHtml: { // 是否是导出的html
       type: Boolean,
       default: false

nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue

@@ -113,6 +113,11 @@
     >
       <panel-chart
         v-if="prevChart"
+        :nowTimeType="{
+          id: 4,
+          type: 'hour',
+          value: 1
+        }"
         style="height: 100%;width: 100%"
         :ref="'chart-fullscreen-previewShow'"
         :chart-info="prevChart"