添加笔中枢，删除了很多没有用的方法
This commit is contained in:
jackyu66git
+275
-519
@@ -48,9 +48,10 @@
|
||||
margin-bottom: 6px;
|
||||
color: #495057;
|
||||
}
|
||||
/*主图大小*/
|
||||
.chart-container {
|
||||
width: 100%;
|
||||
height: 900px;
|
||||
height: 1200px;
|
||||
margin-top: 10px;
|
||||
border: 1px solid #e9ecef;
|
||||
border-radius: 8px;
|
||||
@@ -635,9 +636,6 @@
|
||||
margin-right: 4px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.bb-config-modal {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
@@ -877,22 +875,22 @@
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showMainZs">
|
||||
<label class="form-check-label" for="showMainZs">中枢</label>
|
||||
<label class="form-check-label" for="showMainZs">SEG中枢</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showMainUncompletedZs">
|
||||
<label class="form-check-label" for="showMainUncompletedZs">未完成中枢</label>
|
||||
<input class="form-check-input" type="checkbox" id="showMainBiZs">
|
||||
<label class="form-check-label" for="showMainBiZs">BI中枢</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showKlcFxType" checked>
|
||||
<label class="form-check-label" for="showKlcFxType">KLC分型</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showMainTrend" checked>
|
||||
<input class="form-check-input" type="checkbox" id="showMainTrend">
|
||||
<label class="form-check-label" for="showMainTrend">Trend</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="toggleUOnMain" checked>
|
||||
<input class="form-check-input" type="checkbox" id="toggleUOnMain">
|
||||
<label class="form-check-label" for="toggleUOnMain">显示U</label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -915,11 +913,11 @@
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showElementZs">
|
||||
<label class="form-check-label" for="showElementZs">中枢</label>
|
||||
<label class="form-check-label" for="showElementZs">SEG中枢</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showElementUncompletedZs">
|
||||
<label class="form-check-label" for="showElementUncompletedZs">未完成中枢</label>
|
||||
<input class="form-check-input" type="checkbox" id="showElementBiZs">
|
||||
<label class="form-check-label" for="showElementBiZs">BI中枢</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showElementKlcFxType">
|
||||
@@ -1712,9 +1710,10 @@
|
||||
$('#showMainZs').change(function() {
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
// 添加未完成中枢复选框变更事件
|
||||
$('#showMainUncompletedZs').change(function() {
|
||||
// 添加主周期BI中枢复选框变更事件（委托绑定，避免DOM更新后失效）
|
||||
console.log('初始化BI中枢事件绑定');
|
||||
$(document).on('change', '#showMainBiZs', function() {
|
||||
console.log('主BI中枢切换为:', $('#showMainBiZs').is(':checked'));
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
@@ -1740,9 +1739,9 @@
|
||||
$('#showElementZs').change(function() {
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
// 添加未完成中枢复选框变更事件
|
||||
$('#showElementUncompletedZs').change(function() {
|
||||
// 添加次周期BI中枢复选框变更事件（委托绑定，避免DOM更新后失效）
|
||||
$(document).on('change', '#showElementBiZs', function() {
|
||||
console.log('次BI中枢切换为:', $('#showElementBiZs').is(':checked'));
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
@@ -1843,11 +1842,16 @@
|
||||
}
|
||||
|
||||
console.log('更新图表显示');
|
||||
console.log('BI中枢输入状态:', {
|
||||
main: $('#showMainBiZs').is(':checked'),
|
||||
element: $('#showElementBiZs').is(':checked')
|
||||
});
|
||||
console.log('- 显示K线:', $('#showOriginalKline').is(':checked'));
|
||||
console.log('- 显示笔:', $('#showMainBi').is(':checked'));
|
||||
console.log('- 显示线段:', $('#showMainSeg').is(':checked'));
|
||||
console.log('- 显示中枢:', $('#showMainZs').is(':checked'));
|
||||
console.log('- 显示未完成中枢:', $('#showMainUncompletedZs').is(':checked'));
|
||||
console.log('- 显示BI中枢(主):', $('#showMainBiZs').is(':checked'));
|
||||
console.log('- 显示BI中枢(次):', $('#showElementBiZs').is(':checked'));
|
||||
console.log('- 显示MACD:', true);
|
||||
console.log('- 显示成交量:', false);
|
||||
console.log('- 显示分型类型:', $('#showKlcFxType').is(':checked'));
|
||||
@@ -2033,6 +2037,11 @@
|
||||
|
||||
// 检查和记录服务器返回的时区
|
||||
console.log('服务器返回的时区:', data.timezone || '未指定');
|
||||
// BI中枢调试输出
|
||||
console.log('主周期BI中枢(完成):', Array.isArray(data.bi_zs_list) ? data.bi_zs_list.length : 0);
|
||||
console.log('主周期BI中枢(未完成):', Array.isArray(data.uncompleted_bi_zs_list) ? data.uncompleted_bi_zs_list.length : 0);
|
||||
console.log('次周期BI中枢(完成):', Array.isArray(data.element_bi_zs_list) ? data.element_bi_zs_list.length : 0);
|
||||
console.log('次周期BI中枢(未完成):', Array.isArray(data.element_uncompleted_bi_zs_list) ? data.element_uncompleted_bi_zs_list.length : 0);
|
||||
|
||||
// 刷新图表
|
||||
refreshChart(data);
|
||||
@@ -2077,7 +2086,6 @@
|
||||
} catch (e) {
|
||||
console.warn('释放旧图表资源失败（可忽略）:', e);
|
||||
}
|
||||
|
||||
console.log('初始化TradingView图表:', symbol, timeframe);
|
||||
|
||||
// 获取当前交易对的配置
|
||||
@@ -2624,7 +2632,6 @@
|
||||
console.log('处理后的ATR数据点数:', atrData.length);
|
||||
console.log('ATR数据样本:', atrData.slice(0, 5));
|
||||
}
|
||||
|
||||
console.log('处理后的ATR数据点数:', atrData.length);
|
||||
atrLineSeries.setData(atrData);
|
||||
tvWidget.series.atrLineSeries = atrLineSeries;
|
||||
@@ -3851,7 +3858,7 @@
|
||||
} else {
|
||||
console.log('绘制线段 - 已禁用');
|
||||
}
|
||||
// 显示中枢的绘制 - 分别处理主周期和次周期
|
||||
// 显示中枢的绘制 - 分别处理主周期和次周期（包含BI中枢，沿用同样样式与开关）
|
||||
if ($('#showMainZs').is(':checked') || $('#showElementZs').is(':checked')) {
|
||||
console.log('绘制中枢 - 已启用');
|
||||
|
||||
@@ -4133,12 +4140,199 @@
|
||||
} else {
|
||||
console.log('绘制中枢 - 已禁用');
|
||||
}
|
||||
// BI中枢（已完成）- 使用独立的BI开关
|
||||
if ($('#showMainBiZs').is(':checked') && currentData.bi_zs_list && currentData.bi_zs_list.length > 0) {
|
||||
try {
|
||||
console.log(`绘制主周期BI中枢数据，共${currentData.bi_zs_list.length}条`);
|
||||
} catch (e) {}
|
||||
currentData.bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = zs.end_time ? Math.floor(new Date(zs.end_time).getTime() / 1000) : Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg); const zd = parseFloat(zs.zd); const gg = parseFloat(zs.gg); const dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#F1C40F';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
const rightSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
rightSeries.setData([{ time: endTime, value: zd }, { time: endTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('主周期BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
if ($('#showElementBiZs').is(':checked') && currentData.element_bi_zs_list && currentData.element_bi_zs_list.length > 0) {
|
||||
try {
|
||||
console.log(`绘制次周期BI中枢数据，共${currentData.element_bi_zs_list.length}条`);
|
||||
} catch (e) {}
|
||||
currentData.element_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = zs.end_time ? Math.floor(new Date(zs.end_time).getTime() / 1000) : Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg); const zd = parseFloat(zs.zd); const gg = parseFloat(zs.gg); const dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#3f51b5';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
const rightSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
rightSeries.setData([{ time: endTime, value: zd }, { time: endTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('次周期BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 显示未完成中枢 - 分别处理主周期和次周期
|
||||
if ($('#showMainUncompletedZs').is(':checked') || $('#showElementUncompletedZs').is(':checked')) {
|
||||
if ($('#showMainZs').is(':checked') || $('#showElementZs').is(':checked')) {
|
||||
console.log('绘制未完成中枢 - 已启用');
|
||||
// 显示BI中枢绘制（沿用中枢样式）
|
||||
if ($('#showMainBiZs').is(':checked') || $('#showElementBiZs').is(':checked')) {
|
||||
console.log('绘制BI中枢 - 已启用');
|
||||
// 主周期 BI 中枢
|
||||
console.log('主BI开关:', $('#showMainBiZs').is(':checked'), '数据长度:', currentData.bi_zs_list ? currentData.bi_zs_list.length : 0);
|
||||
if ($('#showMainBiZs').is(':checked') && currentData.bi_zs_list && currentData.bi_zs_list.length > 0) {
|
||||
console.log(`绘制主周期BI中枢数据，共${currentData.bi_zs_list.length}条`);
|
||||
currentData.bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = zs.end_time ? Math.floor(new Date(zs.end_time).getTime() / 1000) : Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg), zd = parseFloat(zs.zd), gg = parseFloat(zs.gg), dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#9C27B0'; // 主周期BI中枢颜色（紫色）
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
const rightSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
rightSeries.setData([{ time: endTime, value: zd }, { time: endTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('主周期BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 主周期 未完成 BI 中枢
|
||||
console.log('主未完成BI长度:', currentData.uncompleted_bi_zs_list ? currentData.uncompleted_bi_zs_list.length : 0);
|
||||
if ($('#showMainBiZs').is(':checked') && currentData.uncompleted_bi_zs_list && currentData.uncompleted_bi_zs_list.length > 0) {
|
||||
console.log(`绘制主周期未完成BI中枢数据，共${currentData.uncompleted_bi_zs_list.length}条`);
|
||||
currentData.uncompleted_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg), zd = parseFloat(zs.zd), gg = parseFloat(zs.gg), dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#9C27B0';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('主周期未完成BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 次周期 BI 中枢
|
||||
console.log('次BI开关:', $('#showElementBiZs').is(':checked'), '数据长度:', currentData.element_bi_zs_list ? currentData.element_bi_zs_list.length : 0);
|
||||
if ($('#showElementBiZs').is(':checked') && currentData.element_bi_zs_list && currentData.element_bi_zs_list.length > 0) {
|
||||
console.log(`绘制次周期BI中枢数据，共${currentData.element_bi_zs_list.length}条`);
|
||||
currentData.element_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = zs.end_time ? Math.floor(new Date(zs.end_time).getTime() / 1000) : Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg), zd = parseFloat(zs.zd), gg = parseFloat(zs.gg), dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#8BC34A'; // 次周期BI中枢颜色（绿）
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
const rightSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
rightSeries.setData([{ time: endTime, value: zd }, { time: endTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('次周期BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 次周期 未完成 BI 中枢
|
||||
console.log('次未完成BI长度:', currentData.element_uncompleted_bi_zs_list ? currentData.element_uncompleted_bi_zs_list.length : 0);
|
||||
if ($('#showElementBiZs').is(':checked') && currentData.element_uncompleted_bi_zs_list && currentData.element_uncompleted_bi_zs_list.length > 0) {
|
||||
console.log(`绘制次周期未完成BI中枢数据，共${currentData.element_uncompleted_bi_zs_list.length}条`);
|
||||
currentData.element_uncompleted_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg), zd = parseFloat(zs.zd), gg = parseFloat(zs.gg), dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#8BC34A';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('次周期未完成BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 主周期未完成中枢
|
||||
if ($('#showMainUncompletedZs').is(':checked') && currentData.uncompleted_zs_list && currentData.uncompleted_zs_list.length > 0) {
|
||||
if ($('#showMainZs').is(':checked') && currentData.uncompleted_zs_list && currentData.uncompleted_zs_list.length > 0) {
|
||||
console.log(`绘制主周期未完成中枢数据，共${currentData.uncompleted_zs_list.length}条`);
|
||||
|
||||
currentData.uncompleted_zs_list.forEach(function(zs) {
|
||||
@@ -4281,7 +4475,7 @@
|
||||
}
|
||||
|
||||
// 次周期未完成中枢
|
||||
if ($('#showElementUncompletedZs').is(':checked') && currentData.element_uncompleted_zs_list && currentData.element_uncompleted_zs_list.length > 0) {
|
||||
if ($('#showElementZs').is(':checked') && currentData.element_uncompleted_zs_list && currentData.element_uncompleted_zs_list.length > 0) {
|
||||
console.log(`绘制次周期未完成中枢数据，共${currentData.element_uncompleted_zs_list.length}条`);
|
||||
|
||||
currentData.element_uncompleted_zs_list.forEach(function(zs) {
|
||||
@@ -4425,6 +4619,62 @@
|
||||
} else {
|
||||
console.log('绘制未完成中枢 - 已禁用');
|
||||
}
|
||||
// 未完成BI中枢 - 使用独立的BI开关
|
||||
if ($('#showMainBiZs').is(':checked') && currentData.uncompleted_bi_zs_list && currentData.uncompleted_bi_zs_list.length > 0) {
|
||||
try { console.log(`绘制主周期未完成BI中枢数据，共${currentData.uncompleted_bi_zs_list.length}条`); } catch (e) {}
|
||||
currentData.uncompleted_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg); const zd = parseFloat(zs.zd); const gg = parseFloat(zs.gg); const dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#F1C40F';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('主周期未完成BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 次周期 未完成 BI 中枢
|
||||
if ($('#showElementBiZs').is(':checked') && currentData.element_uncompleted_bi_zs_list && currentData.element_uncompleted_bi_zs_list.length > 0) {
|
||||
try { console.log(`绘制次周期未完成BI中枢数据，共${currentData.element_uncompleted_bi_zs_list.length}条`); } catch (e) {}
|
||||
currentData.element_uncompleted_bi_zs_list.forEach(function(zs) {
|
||||
try {
|
||||
const startTime = Math.floor(new Date(zs.start_time).getTime() / 1000);
|
||||
const endTime = Math.floor(new Date(currentData.kline_data[currentData.kline_data.length-1].date).getTime() / 1000);
|
||||
if (isNaN(startTime) || isNaN(endTime)) { return; }
|
||||
const zg = parseFloat(zs.zg); const zd = parseFloat(zs.zd); const gg = parseFloat(zs.gg); const dd = parseFloat(zs.dd);
|
||||
if (isNaN(zg) || isNaN(zd)) { return; }
|
||||
const color = '#3f51b5';
|
||||
const topSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
topSeries.setData([{ time: startTime, value: zg }, { time: endTime, value: zg }]);
|
||||
const bottomSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
bottomSeries.setData([{ time: startTime, value: zd }, { time: endTime, value: zd }]);
|
||||
const leftSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
leftSeries.setData([{ time: startTime, value: zd }, { time: startTime, value: zg }]);
|
||||
if (!isNaN(gg) && gg > 0) {
|
||||
const ggSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ggSeries.setData([{ time: startTime, value: gg }, { time: endTime, value: gg }]);
|
||||
}
|
||||
if (!isNaN(dd) && dd > 0) {
|
||||
const ddSeries = mainChart.addLineSeries({ color, lineWidth: 1, lastValueVisible: false, priceLineVisible: false });
|
||||
ddSeries.setData([{ time: startTime, value: dd }, { time: endTime, value: dd }]);
|
||||
}
|
||||
} catch (e) { console.error('次周期未完成BI中枢处理出错:', e); }
|
||||
});
|
||||
}
|
||||
// 添加买卖点标记
|
||||
if ($('#showTradePoints').is(':checked')) {
|
||||
console.log('绘制买卖点 - 已启用');
|
||||
@@ -5044,7 +5294,6 @@
|
||||
if (currentData.klu_fx_info && currentData.klu_fx_info.length > 0) {
|
||||
console.log('前3个klu分型数据样本:', currentData.klu_fx_info.slice(0, 3));
|
||||
}
|
||||
|
||||
// 收集所有主周期分型标记
|
||||
const allMainFxMarkers = [];
|
||||
const mainFxMarkers = []; // 用于tooltip支持
|
||||
@@ -5674,17 +5923,6 @@
|
||||
setDefaultTimeRange();
|
||||
}
|
||||
|
||||
// 添加买卖点提示
|
||||
// 初始化 tooltip 与 U 显示状态
|
||||
window.showUOnMain = $('#toggleUOnMain').is(':checked');
|
||||
window.showUOnElement = $('#toggleUOnElement').is(':checked');
|
||||
setupTooltip(mainChart, [], [], mainChartContainer, volumeChartContainer, atrChartContainer, macdChartContainer, chanMacdChartContainer, volumeChart, atrChart, macdChart, chanMacdChart, showMacd);
|
||||
|
||||
// 显示买卖点
|
||||
if ($('#showTradePoints').is(':checked')) {
|
||||
displayTradePoints();
|
||||
}
|
||||
|
||||
// 更新EMA52显示
|
||||
if (currentData) {
|
||||
updateEMA52Display(currentData);
|
||||
@@ -5962,7 +6200,6 @@
|
||||
initTradingView($('#symbol').val(), $('#timeframe').val());
|
||||
}
|
||||
}
|
||||
|
||||
function bindSyncEvents(mainChartContainer, volumeChartContainer, atrChartContainer, macdChartContainer, chanMacdChartContainer, mainChart, volumeChart, atrChart, macdChart, chanMacdChart, showMacd) {
|
||||
// 防止同步过程中的无限循环
|
||||
let syncInProgress = false;
|
||||
@@ -6210,266 +6447,7 @@
|
||||
}, 200);
|
||||
});
|
||||
}
|
||||
function setupTooltip(mainChart, buyMarkers = [], sellMarkers = [], mainChartContainer, volumeChartContainer, atrChartContainer, macdChartContainer, chanMacdChartContainer, volumeChart, atrChart, macdChart, chanMacdChart, showMacd) {
|
||||
// 调试变量
|
||||
window.debugMode = true;
|
||||
// 初始化 U 显示状态（主/次周期分开控制）
|
||||
const isShowUMain = $('#toggleUOnMain').is(':checked');
|
||||
const isShowUElement = $('#toggleUOnElement').is(':checked');
|
||||
window.showUOnMain = isShowUMain;
|
||||
window.showUOnElement = isShowUElement;
|
||||
if (!isShowUMain && !isShowUElement) {
|
||||
// 隐藏时清空子图上的 U 标记
|
||||
if (tvWidget.series && tvWidget.series.chanMacdLineSeries) {
|
||||
try { tvWidget.series.chanMacdLineSeries.setMarkers([]); } catch (e) {}
|
||||
}
|
||||
if (tvWidget.series && tvWidget.series.chanMacdSignalSeries) {
|
||||
try { tvWidget.series.chanMacdSignalSeries.setMarkers([]); } catch (e) {}
|
||||
}
|
||||
}
|
||||
|
||||
// 添加买卖点悬浮提示元素
|
||||
const tooltipElement = document.createElement('div');
|
||||
tooltipElement.className = 'point-tooltip';
|
||||
// document.body.appendChild(tooltipElement);
|
||||
|
||||
// 添加自定义十字线信息显示
|
||||
const crosshairTooltip = document.createElement('div');
|
||||
crosshairTooltip.className = 'crosshair-tooltip';
|
||||
crosshairTooltip.style.position = 'absolute';
|
||||
crosshairTooltip.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
|
||||
crosshairTooltip.style.color = 'white';
|
||||
crosshairTooltip.style.padding = '5px 10px';
|
||||
crosshairTooltip.style.borderRadius = '4px';
|
||||
crosshairTooltip.style.fontSize = '12px';
|
||||
crosshairTooltip.style.zIndex = '1000';
|
||||
crosshairTooltip.style.pointerEvents = 'none';
|
||||
crosshairTooltip.style.display = 'none';
|
||||
// document.body.appendChild(crosshairTooltip);
|
||||
|
||||
// 添加鼠标悬停事件显示提示
|
||||
if (mainChart) {
|
||||
mainChart.subscribeCrosshairMove(param => {
|
||||
// 十字线同步到其他图表 - 通过DOM元素绘制垂直线实现虚线延长效果
|
||||
if (param.time && param.point && volumeChart) {
|
||||
try {
|
||||
// 清除之前的十字线标记
|
||||
const existingVolumeLines = document.querySelectorAll('.volume-crosshair-line');
|
||||
existingVolumeLines.forEach(line => line.remove());
|
||||
const existingAtrLines = document.querySelectorAll('.atr-crosshair-line');
|
||||
existingAtrLines.forEach(line => line.remove());
|
||||
const existingMacdLines = document.querySelectorAll('.macd-crosshair-line');
|
||||
existingMacdLines.forEach(line => line.remove());
|
||||
const existingChanMacdLines = document.querySelectorAll('.chanmacd-crosshair-line');
|
||||
existingChanMacdLines.forEach(line => line.remove());
|
||||
|
||||
// 获取时间对应的坐标位置
|
||||
const mainTimeCoordinate = mainChart.timeScale().timeToCoordinate(param.time);
|
||||
if (mainTimeCoordinate !== null) {
|
||||
// 获取主图容器的位置
|
||||
const mainChartRect = mainChartContainer.getBoundingClientRect();
|
||||
|
||||
// 在交易量图上绘制垂直线
|
||||
const volumeTimeCoordinate = volumeChart.timeScale().timeToCoordinate(param.time);
|
||||
if (volumeTimeCoordinate !== null) {
|
||||
const volumeChartRect = volumeChartContainer.getBoundingClientRect();
|
||||
const volumeLine = document.createElement('div');
|
||||
volumeLine.className = 'volume-crosshair-line';
|
||||
volumeLine.style.position = 'fixed'; // 改为fixed定位
|
||||
volumeLine.style.left = (volumeChartRect.left + volumeTimeCoordinate) + 'px';
|
||||
volumeLine.style.top = volumeChartRect.top + 'px';
|
||||
volumeLine.style.width = '1px';
|
||||
volumeLine.style.height = volumeChartRect.height + 'px';
|
||||
volumeLine.style.backgroundColor = 'rgba(128, 128, 128, 0.5)';
|
||||
volumeLine.style.borderLeft = '1px dashed rgba(128, 128, 128, 0.5)';
|
||||
volumeLine.style.pointerEvents = 'none';
|
||||
volumeLine.style.zIndex = '1000';
|
||||
document.body.appendChild(volumeLine);
|
||||
}
|
||||
|
||||
// 在ATR图上绘制垂直线
|
||||
if (atrChart && atrChartContainer) {
|
||||
const atrTimeCoordinate = atrChart.timeScale().timeToCoordinate(param.time);
|
||||
if (atrTimeCoordinate !== null) {
|
||||
const atrChartRect = atrChartContainer.getBoundingClientRect();
|
||||
const atrLine = document.createElement('div');
|
||||
atrLine.className = 'atr-crosshair-line';
|
||||
atrLine.style.position = 'fixed'; // 改为fixed定位
|
||||
atrLine.style.left = (atrChartRect.left + atrTimeCoordinate) + 'px';
|
||||
atrLine.style.top = atrChartRect.top + 'px';
|
||||
atrLine.style.width = '1px';
|
||||
atrLine.style.height = atrChartRect.height + 'px';
|
||||
atrLine.style.backgroundColor = 'rgba(128, 128, 128, 0.5)';
|
||||
atrLine.style.borderLeft = '1px dashed rgba(128, 128, 128, 0.5)';
|
||||
atrLine.style.pointerEvents = 'none';
|
||||
atrLine.style.zIndex = '1000';
|
||||
document.body.appendChild(atrLine);
|
||||
}
|
||||
}
|
||||
|
||||
// 如果有MACD图，也在MACD图上绘制垂直线
|
||||
if (showMacd && macdChart && macdChartContainer) {
|
||||
const macdTimeCoordinate = macdChart.timeScale().timeToCoordinate(param.time);
|
||||
if (macdTimeCoordinate !== null) {
|
||||
const macdChartRect = macdChartContainer.getBoundingClientRect();
|
||||
const macdLine = document.createElement('div');
|
||||
macdLine.className = 'macd-crosshair-line';
|
||||
macdLine.style.position = 'fixed'; // 改为fixed定位
|
||||
macdLine.style.left = (macdChartRect.left + macdTimeCoordinate) + 'px';
|
||||
macdLine.style.top = macdChartRect.top + 'px';
|
||||
macdLine.style.width = '1px';
|
||||
macdLine.style.height = macdChartRect.height + 'px';
|
||||
macdLine.style.backgroundColor = 'rgba(128, 128, 128, 0.5)';
|
||||
macdLine.style.borderLeft = '1px dashed rgba(128, 128, 128, 0.5)';
|
||||
macdLine.style.pointerEvents = 'none';
|
||||
macdLine.style.zIndex = '1000';
|
||||
document.body.appendChild(macdLine);
|
||||
}
|
||||
}
|
||||
|
||||
// 如果有ChanMACD图，也在ChanMACD图上绘制垂直线
|
||||
if (showMacd && chanMacdChart && chanMacdChartContainer) {
|
||||
const chanMacdTimeCoordinate = chanMacdChart.timeScale().timeToCoordinate(param.time);
|
||||
if (chanMacdTimeCoordinate !== null) {
|
||||
const chanMacdChartRect = chanMacdChartContainer.getBoundingClientRect();
|
||||
console.log('ChanMACD图表位置(第二个位置):', {
|
||||
left: chanMacdChartRect.left,
|
||||
top: chanMacdChartRect.top,
|
||||
width: chanMacdChartRect.width,
|
||||
height: chanMacdChartRect.height,
|
||||
timeCoordinate: chanMacdTimeCoordinate
|
||||
});
|
||||
const chanMacdLine = document.createElement('div');
|
||||
chanMacdLine.className = 'chanmacd-crosshair-line';
|
||||
chanMacdLine.style.position = 'fixed';
|
||||
chanMacdLine.style.left = (chanMacdChartRect.left + chanMacdTimeCoordinate) + 'px';
|
||||
chanMacdLine.style.top = chanMacdChartRect.top + 'px';
|
||||
chanMacdLine.style.width = '1px';
|
||||
chanMacdLine.style.height = chanMacdChartRect.height + 'px';
|
||||
chanMacdLine.style.backgroundColor = 'rgba(128, 128, 128, 0.5)';
|
||||
chanMacdLine.style.borderLeft = '1px dashed rgba(128, 128, 128, 0.5)';
|
||||
chanMacdLine.style.pointerEvents = 'none';
|
||||
chanMacdLine.style.zIndex = '1000';
|
||||
document.body.appendChild(chanMacdLine);
|
||||
console.log('ChanMACD垂直线已创建(第二个位置)，位置:', chanMacdLine.style.left, chanMacdLine.style.top);
|
||||
} else {
|
||||
console.log('ChanMACD时间坐标为空(第二个位置)');
|
||||
}
|
||||
} else {
|
||||
console.log('ChanMACD图表条件不满足(第二个位置):', {
|
||||
showMacd: showMacd,
|
||||
hasChanMacdChart: !!chanMacdChart,
|
||||
hasChanMacdChartContainer: !!chanMacdChartContainer
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.debug('十字线同步出错:', e);
|
||||
}
|
||||
} else {
|
||||
// 当十字线离开时，清除垂直线
|
||||
try {
|
||||
const existingVolumeLines = document.querySelectorAll('.volume-crosshair-line');
|
||||
existingVolumeLines.forEach(line => line.remove());
|
||||
const existingAtrLines = document.querySelectorAll('.atr-crosshair-line');
|
||||
existingAtrLines.forEach(line => line.remove());
|
||||
const existingMacdLines = document.querySelectorAll('.macd-crosshair-line');
|
||||
existingMacdLines.forEach(line => line.remove());
|
||||
const existingChanMacdLines = document.querySelectorAll('.chanmacd-crosshair-line');
|
||||
existingChanMacdLines.forEach(line => line.remove());
|
||||
} catch (e) {
|
||||
console.debug('清除十字线时出错:', e);
|
||||
}
|
||||
}
|
||||
|
||||
if (param.time && param.point) {
|
||||
const timeStr = param.time;
|
||||
const markers = [...buyMarkers, ...sellMarkers].filter(m => m.time === timeStr);
|
||||
|
||||
// 同时检查分型标记
|
||||
const fxMarkers = (window.fxMarkers || []).filter(m => m.time === timeStr);
|
||||
const allMarkers = [...markers, ...fxMarkers];
|
||||
|
||||
// 显示时区调试信息
|
||||
if (window.debugMode) {
|
||||
const timezone = $('#timezone').val();
|
||||
const formattedTime = formatTimeWithTimezone(timeStr * 1000, timezone);
|
||||
|
||||
// 获取当前价格 - 通过param.seriesPrices获取
|
||||
let priceInfo = '';
|
||||
if (param.seriesPrices && param.seriesPrices.size > 0) {
|
||||
// 依次从当前可能的主系列中获取价格
|
||||
if (tvWidget.series.candleSeries && param.seriesPrices.get(tvWidget.series.candleSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.candleSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.renkoSeries && param.seriesPrices.get(tvWidget.series.renkoSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.renkoSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.heikinSeries && param.seriesPrices.get(tvWidget.series.heikinSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.heikinSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.barSeries && param.seriesPrices.get(tvWidget.series.barSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.barSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.lineSeries && param.seriesPrices.get(tvWidget.series.lineSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.lineSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.areaSeries && param.seriesPrices.get(tvWidget.series.areaSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.areaSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
} else if (tvWidget.series.baselineSeries && param.seriesPrices.get(tvWidget.series.baselineSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.baselineSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
}
|
||||
// 如果没有蜡烛图系列价格，尝试从区域图系列获取
|
||||
else if (tvWidget.series.areaSeries && param.seriesPrices.get(tvWidget.series.areaSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.areaSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
}
|
||||
// 如果没有蜡烛图系列价格，尝试从基线图系列获取
|
||||
else if (tvWidget.series.baselineSeries && param.seriesPrices.get(tvWidget.series.baselineSeries)) {
|
||||
const price = param.seriesPrices.get(tvWidget.series.baselineSeries);
|
||||
priceInfo = `价格: ${price.toFixed(2)}`;
|
||||
}
|
||||
}
|
||||
|
||||
// 仅记录最简短的调试信息
|
||||
console.debug(`十字线: ${timeStr} -> ${formattedTime} (${timezone})`);
|
||||
|
||||
// 显示自定义时区工具提示，包含价格信息
|
||||
crosshairTooltip.innerHTML = `<div style="font-weight:bold">时间: ${formattedTime}</div>` +
|
||||
(priceInfo ? `<div>${priceInfo}</div>` : '');
|
||||
crosshairTooltip.style.display = 'block';
|
||||
crosshairTooltip.style.left = (param.point.x + 15) + 'px';
|
||||
crosshairTooltip.style.top = (param.point.y - 30) + 'px';
|
||||
}
|
||||
|
||||
if (allMarkers.length > 0) {
|
||||
// 有买卖点或分型标记，显示自定义提示
|
||||
const tooltips = allMarkers.map(m => m.tooltip).join('<br><hr style="margin: 5px 0;">');
|
||||
tooltipElement.innerHTML = tooltips;
|
||||
tooltipElement.style.display = 'block';
|
||||
tooltipElement.style.left = (param.point.x + 15) + 'px';
|
||||
tooltipElement.style.top = (param.point.y + 15) + 'px';
|
||||
} else {
|
||||
// 隐藏提示
|
||||
tooltipElement.style.display = 'none';
|
||||
}
|
||||
} else {
|
||||
// 隐藏提示
|
||||
tooltipElement.style.display = 'none';
|
||||
crosshairTooltip.style.display = 'none';
|
||||
}
|
||||
});
|
||||
|
||||
// 处理图表缩放、平移等事件，隐藏提示
|
||||
mainChart.timeScale().subscribeVisibleTimeRangeChange(() => {
|
||||
tooltipElement.style.display = 'none';
|
||||
crosshairTooltip.style.display = 'none';
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 辅助函数：使用指定时区格式化时间戳
|
||||
function formatTimeWithTimezone(timestamp, timezone) {
|
||||
try {
|
||||
@@ -6487,220 +6465,6 @@
|
||||
return new Date(timestamp).toLocaleString();
|
||||
}
|
||||
}
|
||||
function displayTradePoints() {
|
||||
// 优先使用小周期数据，如果不存在则使用主周期数据
|
||||
const tradePointsData = currentData.element_trade_points || currentData.trade_points;
|
||||
console.log(`绘制${currentData.element_trade_points ? '元素周期' : '主周期'}买卖点数据，共${tradePointsData ? tradePointsData.length : 0}条`);
|
||||
|
||||
// 调试信息 - 输出完整的买卖点数据
|
||||
if (tradePointsData && tradePointsData.length > 0) {
|
||||
console.log("买卖点数据样例:", tradePointsData[0]);
|
||||
|
||||
// 检查数据格式，如果time不是标准格式，进行格式化处理
|
||||
const checkDataFormat = () => {
|
||||
for (let i = 0; i < tradePointsData.length; i++) {
|
||||
if (tradePointsData[i].time) {
|
||||
// 确保时间是标准格式
|
||||
try {
|
||||
const timeValue = new Date(tradePointsData[i].time);
|
||||
if (isNaN(timeValue.getTime())) {
|
||||
console.error(`买卖点 #${i} 时间格式无效:`, tradePointsData[i].time);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(`买卖点 #${i} 时间格式异常:`, e);
|
||||
}
|
||||
} else {
|
||||
console.error(`买卖点 #${i} 缺少时间属性`);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 执行格式检查
|
||||
checkDataFormat();
|
||||
|
||||
// 对买卖点按时间排序，用于后续优化显示
|
||||
const sortedPoints = [...tradePointsData].sort((a, b) => {
|
||||
return new Date(a.time) - new Date(b.time);
|
||||
});
|
||||
|
||||
// 记录已处理的时间点 - 按类型分开计数
|
||||
const processedTimes = {};
|
||||
|
||||
// 创建买卖点标记系列
|
||||
const buyMarkers = [];
|
||||
const sellMarkers = [];
|
||||
|
||||
// 计数器，追踪成功和失败的处理次数
|
||||
let successCount = 0;
|
||||
let errorCount = 0;
|
||||
|
||||
sortedPoints.forEach(function(point, index) {
|
||||
try {
|
||||
// 检查所有必要的属性是否存在且有效
|
||||
if (!point.time || !point.price || point.type === undefined) {
|
||||
console.error(`买卖点 #${index} 数据不完整:`, point);
|
||||
errorCount++;
|
||||
return;
|
||||
}
|
||||
|
||||
const time = Math.floor(new Date(point.time).getTime() / 1000);
|
||||
const price = parseFloat(point.price);
|
||||
const type = parseInt(point.type);
|
||||
|
||||
if (isNaN(time) || isNaN(price) || isNaN(type)) {
|
||||
console.error(`买卖点 #${index} 数据格式错误:`,
|
||||
{ time: isNaN(time), price: isNaN(price), type: isNaN(type) }, point);
|
||||
errorCount++;
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取买卖点样式
|
||||
const style = TRADE_POINT_STYLE[type] || {
|
||||
color: '#999999',
|
||||
shape: 'circle',
|
||||
text: '?',
|
||||
size: 1
|
||||
};
|
||||
|
||||
// 初始化该时间点的类型计数器
|
||||
if (!processedTimes[time]) {
|
||||
processedTimes[time] = {};
|
||||
}
|
||||
|
||||
// 优化：检查是否有相同时间点和相同类型的标记，如果有，进行类型内的偏移
|
||||
let stackIndex = 0;
|
||||
if (processedTimes[time][type]) {
|
||||
// 已经有相同时间和类型的标记，记录堆叠索引
|
||||
stackIndex = processedTimes[time][type];
|
||||
processedTimes[time][type]++;
|
||||
} else {
|
||||
// 第一次出现这个时间点的这个类型
|
||||
processedTimes[time][type] = 1;
|
||||
}
|
||||
|
||||
// 为不同类型的买卖点获取基础垂直偏移系数
|
||||
const baseOffset = TRADE_POINT_OFFSET[type] || 0;
|
||||
|
||||
// 创建标记对象，包含额外的信息用于悬停提示
|
||||
const marker = {
|
||||
time: time,
|
||||
position: 'inBar', // 改为在K线内部显示，不影响数据
|
||||
color: style.color,
|
||||
shape: style.shape,
|
||||
text: style.text,
|
||||
size: style.size,
|
||||
// 记录堆叠索引
|
||||
stackIndex: stackIndex,
|
||||
// 添加悬停提示的数据
|
||||
tooltip: `<span class="${type > 0 ? 'buy-point' : 'sell-point'}">${point.desc || (type > 0 ? '买点' : '卖点')}</span><br>
|
||||
时间: ${formatTime(point.time)}<br>
|
||||
价格: ${price.toFixed(2)}`,
|
||||
// 额外添加基础类型偏移
|
||||
baseOffset: baseOffset,
|
||||
// 添加边框
|
||||
borderColor: 'white',
|
||||
borderWidth: 1,
|
||||
// 添加价格偏移系数
|
||||
pricePercentOffset: PRICE_PERCENT_OFFSET[type] || 0,
|
||||
// 保存实际价格用于计算
|
||||
price: price,
|
||||
// 保存类型
|
||||
type: type
|
||||
};
|
||||
|
||||
// 区分买卖点
|
||||
if (type > 0) {
|
||||
buyMarkers.push(marker);
|
||||
} else {
|
||||
sellMarkers.push(marker);
|
||||
}
|
||||
|
||||
successCount++;
|
||||
} catch (e) {
|
||||
console.error(`处理买卖点 #${index} 出错:`, e, point);
|
||||
errorCount++;
|
||||
}
|
||||
});
|
||||
|
||||
console.log(`买卖点处理完成: 成功=${successCount}, 失败=${errorCount}, 买点=${buyMarkers.length}, 卖点=${sellMarkers.length}`);
|
||||
|
||||
// 分别添加买卖点标记
|
||||
if (buyMarkers.length > 0) {
|
||||
const buyMarkersSeries = mainChart.addLineSeries({
|
||||
lastValueVisible: false,
|
||||
priceLineVisible: false,
|
||||
lineVisible: false,
|
||||
title: '买点'
|
||||
});
|
||||
|
||||
// 设置临时的数据点
|
||||
buyMarkersSeries.setData([{ time: buyMarkers[0].time, value: 0 }]);
|
||||
|
||||
try {
|
||||
// 设置买点标记，并添加偏移
|
||||
buyMarkersSeries.setMarkers(
|
||||
buyMarkers.map(marker => {
|
||||
// 使用固定偏移而非百分比
|
||||
const fixedOffset = PRICE_FIXED_OFFSET[marker.type] || 20;
|
||||
|
||||
// 为同一时间点的多个买点额外增加堆叠偏移
|
||||
const stackOffset = marker.stackIndex > 0 ?
|
||||
10 * marker.stackIndex : 0;
|
||||
|
||||
// 使用实际价格位置添加标记，不使用偏移
|
||||
return {
|
||||
...marker,
|
||||
position: 'aboveBar', // 显示在K线上方
|
||||
// 使用原始价格
|
||||
price: marker.price
|
||||
};
|
||||
})
|
||||
);
|
||||
console.log(`成功添加 ${buyMarkers.length} 个买点标记`);
|
||||
} catch (e) {
|
||||
console.error("设置买点标记时出错:", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (sellMarkers.length > 0) {
|
||||
const sellMarkersSeries = mainChart.addLineSeries({
|
||||
lastValueVisible: false,
|
||||
priceLineVisible: false,
|
||||
lineVisible: false,
|
||||
title: '卖点'
|
||||
});
|
||||
|
||||
// 设置临时的数据点
|
||||
sellMarkersSeries.setData([{ time: sellMarkers[0].time, value: 0 }]);
|
||||
|
||||
try {
|
||||
// 设置卖点标记，并添加偏移
|
||||
sellMarkersSeries.setMarkers(
|
||||
sellMarkers.map(marker => {
|
||||
// 使用固定偏移而非百分比
|
||||
const fixedOffset = PRICE_FIXED_OFFSET[marker.type] || 20;
|
||||
|
||||
// 为同一时间点的多个卖点额外增加堆叠偏移
|
||||
const stackOffset = marker.stackIndex > 0 ?
|
||||
10 * marker.stackIndex : 0;
|
||||
|
||||
// 使用实际价格位置添加标记，不使用偏移
|
||||
return {
|
||||
...marker,
|
||||
position: 'belowBar', // 显示在K线下方
|
||||
// 使用原始价格
|
||||
price: marker.price
|
||||
};
|
||||
})
|
||||
);
|
||||
console.log(`成功添加 ${sellMarkers.length} 个卖点标记`);
|
||||
} catch (e) {
|
||||
console.error("设置卖点标记时出错:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function updateTables(currentData) {
|
||||
// 检查数据有效性
|
||||
if (!currentData) {
|
||||
@@ -7334,7 +7098,6 @@
|
||||
const timeStr = nextRefreshTime.toLocaleTimeString();
|
||||
$('#nextRefreshTime').text(`下次刷新: ${timeStr}`);
|
||||
}
|
||||
|
||||
// 倒计时定时器
|
||||
let countdownTimer = null;
|
||||
|
||||
@@ -7475,7 +7238,6 @@
|
||||
|
||||
console.log('重绘分形元素 - 完成');
|
||||
}
|
||||
|
||||
// 只更新分形元素（笔、线段、中枢）的表格数据
|
||||
function updateFractalTables() {
|
||||
if (!currentData) return;
|
||||
@@ -7682,7 +7444,6 @@
|
||||
'showMainBi': $('#showMainBi').is(':checked'),
|
||||
'showMainSeg': $('#showMainSeg').is(':checked'),
|
||||
'showMainZs': $('#showMainZs').is(':checked'),
|
||||
'showMainUncompletedZs': $('#showMainUncompletedZs').is(':checked'),
|
||||
'showVolume': false,
|
||||
'showMacd': $('#showMacd').is(':checked'),
|
||||
'showKlcFxType': $('#showKlcFxType').is(':checked'),
|
||||
@@ -7908,7 +7669,6 @@
|
||||
|
||||
console.log('✅ EMA52系列已清理');
|
||||
}
|
||||
|
||||
// 存储上次的EMA52数据，用于比较
|
||||
let lastEMA52Data = null;
|
||||
|
||||
@@ -8264,7 +8024,6 @@
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// 更新技术指标面板（统一面板）
|
||||
function updateIndicatorPanel() {
|
||||
const panel = $('#indicatorPanel');
|
||||
@@ -8547,7 +8306,6 @@
|
||||
try { updateIndicatorPanel(); } catch(e) {}
|
||||
try { if ($('#maConfigModal').is(':visible')) { hideMAConfig(); } } catch(e) {}
|
||||
}
|
||||
|
||||
// 获取当前K线数据的辅助函数
|
||||
function getCurrentCandleData() {
|
||||
if (!currentData || !currentData.kline_data) {
|
||||
@@ -9063,7 +8821,6 @@
|
||||
// 监听配置变化以更新预览
|
||||
$(document).on('change', '#maColor, #maLineWidth, #maLineStyle', updateLinePreview);
|
||||
$(document).on('change', '#bbUpperColor, #bbMiddleColor, #bbLowerColor, #bbLineWidth, #bbLineStyle', updateBBLinePreview);
|
||||
|
||||
// 点击弹窗外部关闭
|
||||
$(document).on('click', '#bbConfigModal', function(e) {
|
||||
if (e.target === this) {
|
||||
@@ -9159,7 +8916,6 @@
|
||||
// 清空全局UnitTF标记，避免旧数据残留影响主图合并
|
||||
window.unittfMarkers = [];
|
||||
}
|
||||
|
||||
// 添加所有ChanMACD标记
|
||||
function addAllChanMacdMarkers(segList, unittfList, histsetList, stateMarkers) {
|
||||
const macdMarkers = [];
|
||||
|
||||
Reference in New Issue
Block a user