From 215b2e3ccff594195a64a47476df55a9ebf4231b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 29 Nov 2023 13:43:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E8=B0=83=E6=95=B4charttooltip?=
 =?UTF-8?q?=20=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/chart/ChartScreenHeader.vue    |  6 +++---
 .../chart/chart/uplot/chartTimeSeries.vue     |  8 +++++++-
 .../chart/chart/uplot/chartTimeSeriesMixin.js | 20 ++++++++++---------
 .../components/common/mixin/mainMixinFun.js   |  6 ++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index 8a21d7a07..268600ea1 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -88,7 +88,7 @@ export default {
   methods: {
     dateChange () {
       const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
-      this.setSearchTime('searchTime', nowTimeType)
+      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]
@@ -206,10 +206,10 @@ export default {
       this.nowType.end_time = this.searchTime[1]
       if (!this.nowTimeType) {
         this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
-        this.setSearchTime('searchTime', this.nowType)
+        this.setSearchTime('searchTime', this.nowType, '', false)
       } else {
         this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
-        this.setSearchTime('searchTime', this.nowType)
+        this.setSearchTime('searchTime', this.nowType, '', false)
       }
     }
   }
diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
index 626cac258..cc4835aa1 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
@@ -95,7 +95,9 @@ export default {
         clickIndex: undefined
       },
       isGrey: [],
-      seriesData: []
+      seriesData: [],
+      leftYaxisMin: undefined,
+      leftYaxisMax: undefined
     }
   },
   computed: {
@@ -403,9 +405,11 @@ export default {
         let chartUplot = ''
         chartUplot = new UPlot(opts, data, document.getElementById(`chart-canvas-${this.chartId}`))
         setChart(this.chartId, chartUplot)
+        this.isInit = false
       }, 100)
     },
     renderMinMax (opts) {
+      const that = this
       let leftMin = this.$lodash.get(this.chartInfo, 'param.min', undefined)
       let leftMax = this.$lodash.get(this.chartInfo, 'param.max', undefined)
       if (leftMin || leftMax) {
@@ -429,6 +433,8 @@ export default {
               leftMax = initMax / 2
             }
           }
+          that.leftYaxisMin = leftMin
+          that.leftYaxisMax = leftMax
           return [leftMin, leftMax]
         }
       }
diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
index 84fecb6b7..14f294891 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
@@ -511,7 +511,7 @@ export default {
       let tooltip = root.getElementsByClassName('nz-uplot-tooltip')
       if (tooltip.length) {
         tooltip = tooltip[0]
-        tooltip.style.display = 'block'
+        // tooltip.style.display = 'block'
       }
       over.addEventListener('mouseleave', this.uplotMouseleave)
       over.addEventListener('mousemove', this.uplotMousemove)
@@ -652,14 +652,16 @@ export default {
       const x0 = u.valToPos(xd[i0], 'x', true)
       const x1 = u.valToPos(xd[i1], 'x', true)
       thresholdsArr.forEach(item => {
-        const y0 = u.valToPos(item.value, 'left', true)
-        const y1 = u.valToPos(item.value, 'left', true)
-        ctx.beginPath()
-        ctx.strokeStyle = item.color
-        ctx.setLineDash([5, 5])
-        ctx.moveTo(x0, y0)
-        ctx.lineTo(x1, y1)
-        ctx.stroke()
+        if (item.value > this.leftYaxisMin && item.value < this.leftYaxisMax) {
+          const y0 = u.valToPos(item.value, 'left', true)
+          const y1 = u.valToPos(item.value, 'left', true)
+          ctx.beginPath()
+          ctx.strokeStyle = item.color
+          ctx.setLineDash([5, 5])
+          ctx.moveTo(x0, y0)
+          ctx.lineTo(x1, y1)
+          ctx.stroke()
+        }
       })
       ctx.restore()
     }
diff --git a/nezha-fronted/src/components/common/mixin/mainMixinFun.js b/nezha-fronted/src/components/common/mixin/mainMixinFun.js
index 24356f389..89a485f1e 100644
--- a/nezha-fronted/src/components/common/mixin/mainMixinFun.js
+++ b/nezha-fronted/src/components/common/mixin/mainMixinFun.js
@@ -217,10 +217,12 @@ export default {
       }
     },
     /* 时间条件查询--end */
-    setSearchTime (key, nowType, cb) { // 设置searchTime
+    setSearchTime (key, nowType, cb, flag = true) { // 设置searchTime
       if (this.$refs.pickTime) {
         const nowTimeType = nowType || this.$refs.pickTime.$refs.timePicker.nowTimeType
-        this.nowTimeType = nowType || this.$refs.pickTime.$refs.timePicker.nowTimeType
+        if (flag) {
+          this.nowTimeType = nowType || this.$refs.pickTime.$refs.timePicker.nowTimeType
+        }
         const type = nowTimeType.type
         const val = nowTimeType.value
         const oneDTimestamp = 24 * 60 * 60 * 1000