From ee1689664da51decab06e031571aa123fecabb1d Mon Sep 17 00:00:00 2001 From: Porter Date: Wed, 17 Sep 2025 16:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChanKLC.py | 4 ++-- web/templates/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChanKLC.py b/ChanKLC.py index 35bbca5..7ce75d6 100644 --- a/ChanKLC.py +++ b/ChanKLC.py @@ -79,7 +79,7 @@ class ChanKLC(): self.bb_out = True if self.low <= klu.bblow30 and klu.bblow30 > 0 and self.next and (self.macd - self.next.macd) < 0: self.klc_fx_type = Chan_KLC_FX.BOTTOM4 - if self.fx == Chan_FX_TYPE.TOP: + if self.klc_fx_type == Chan_KLC_FX.TOP1 or self.klc_fx_type == Chan_KLC_FX.TOP2: #print(self.end_time, self.fx, self.macd, self.macdhist, len(self.klus)) if self.macdhist < 0 and self.macd > 0: self.klc_fx_type = Chan_KLC_FX.TOP5 @@ -88,7 +88,7 @@ class ChanKLC(): #print(self.end_time, self.state, self.macd, self.klc_fx_type) self.klc_fx_type = Chan_KLC_FX.TOP6 else: - if self.fx == Chan_FX_TYPE.BOTTOM: + if self.klc_fx_type == Chan_KLC_FX.BOTTOM1 or self.klc_fx_type == Chan_KLC_FX.BOTTOM2: if self.macdhist > 0 and self.macd < 0: self.klc_fx_type = Chan_KLC_FX.BOTTOM5 self.bb_out = True diff --git a/web/templates/index.html b/web/templates/index.html index 80a448e..178df81 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -5183,7 +5183,7 @@ if (fx.fx_strength < 1.0) { // 降低阈值，让更多分型显示 displayText = fx.fx_strength >= 0.8 ? '' : '' // 0.8以上显示点，0.8以下不显示文本 } - displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("1", "").replace("2", "").replace("3", "").replace("41", "").replace("51", ""); + displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("11", "").replace("21", "").replace("31", "").replace("41", "").replace("51", ""); // 添加标记配置 const markerConfig = { time: timestamp, @@ -5247,7 +5247,7 @@ if (fx.fx_strength < 1.0) { // 降低阈值，让更多分型显示 displayText = fx.fx_strength >= 1.5 ? '' : '' // 0.8以上显示点，0.8以下不显示文本 } - displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("1", "").replace("2", "").replace("3", "").replace("41", "").replace("51", ""); + displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("11", "").replace("21", "").replace("31", "").replace("41", "").replace("51", ""); // 添加标记配置 const markerConfig = { time: timestamp,