Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

nezha-fronted/src/assets/css/components/chart/chart.scss

@@ -34,7 +34,6 @@
       transition: height linear 0.3s, opacity linear 0.3s;
       .chart-header__tools {
         .chart-header__tool .tool__icon {
-          // visibility: visible;
         }
       }
     }
@@ -158,10 +157,8 @@
 
       .chart-header__tool {
         margin-left: 20px;
-        cursor: pointer;
 
         .tool__icon {
-          visibility: hidden;
           font-size: 14px;
           color: $--color-text-primary;
         }

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

@@ -1,4 +1,5 @@
 .multiple-time-box {
+  cursor: pointer;
   display: flex;
   justify-content: space-between;
   align-items: center;

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

@@ -37,12 +37,14 @@
           <i class="nz-icon nz-icon-info-normal tool__icon"></i>
         </el-tooltip>
       </span>
-      <span class="chart-header__tool" v-if="showTime(chartInfo.type)&&!isExportHtml">
+      <span class="chart-header__tool" v-if="showTime(chartInfo.type)">
         <pick-time
           :refresh-data-func="dateChange"
           v-model="searchTime"
-          :use-chart-unit="showUnit(from)"
-          :showMultiple="showMultiple(chartInfo.type)"
+          :useChartUnit="showUnit(from)&&!isExportHtml"
+          :showMultiple="showMultiple(chartInfo.type)&&!isExportHtml"
+          :showTimePicker="!isExportHtml"
+          :useRefresh="!isExportHtml"
           ref="pickTime"
           style="height: 28px;"
           id="line-chart"
@@ -79,7 +81,7 @@ export default {
     },
     fatherNowTimeType () {
       return this.$store.getters.getNowTimeType
-    },
+    }
   },
   data () {
     return {
@@ -93,7 +95,7 @@ export default {
   methods: {
     dateChange () {
       const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
-      this.setSearchTime('searchTime', nowTimeType,'', false)
+      this.setSearchTime('searchTime', nowTimeType, '', false)
       this.filter.start_time = bus.timeFormate(this.searchTime[0])
       this.filter.end_time = bus.timeFormate(this.searchTime[1])
       this.filter.value = this.searchTime[2]