From d37ceed2ad5b94bbfc71a8a4cbdb7b498ddf724d Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 19 Jul 2025 14:14:18 +0800
Subject: [PATCH] 1
---
src/eastmoney/HQData.js | 49 ++++++++++++++++---------------------------------
1 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/src/eastmoney/HQData.js b/src/eastmoney/HQData.js
index 4dfc7da..f3ea47e 100644
--- a/src/eastmoney/HQData.js
+++ b/src/eastmoney/HQData.js
@@ -405,6 +405,7 @@
stock.date = date;
stock.minute.push(stockItem);
+ // stock.minute= stockItem;
}
var hqchartData = { stock: [stock], code: 0 };
@@ -1328,32 +1329,19 @@
};
HQData.GetMinuteKLineApiUrl = function(symbol, period, right, option) {
- // https://push2his.eastmoney.com/api/qt/stock/kline/get?fields1=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61&beg=0&end=20500101&ut=fa5fd1943c7b386f172d6893dbfba10b&rtntype=6&secid=0.300059&klt=101&fqt=0
-
var internalSymbol = HQData.GetInternalSymbol(symbol);
- // console.log(internalSymbol,'caonima');
var internalPeriod = HQData.GetInternalPeriod(period);
var internalRight = HQData.GetInternalRight(right);
console.log(internalPeriod);
var url = "";
if (option && option.Update === true) {
var beginDate = option.End;
- // url = `https://kline.mitrade.cc11/api/qt/stock/kline/get?fields1=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61&beg=${beginDate}&end=20500101&ut=fa5fd1943c7b386f172d6893dbfba10b&rtntype=6&secid=${internalSymbol.Market}.${internalSymbol.Symbol}&klt=${internalPeriod}&fqt=${internalRight}`
- // var url = `https://kline.mitrade.cc11/api/qt/stock/kline/get?fields1=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61&beg=${beginDate}&end=20500101&ut=fa5fd1943c7b386f172d6893dbfba10b&rtntype=6&secid=${internalSymbol.Market}.${internalSymbol.Symbol}&klt=${internalPeriod}&fqt=${internalRight}`
} else {
- // var url = `http://api-in.js-stock.top/kline?interval=${internalPeriod}&key=nvmihAoT51LnAWCpDeuw&pid=${internalSymbol.Symbol}`
- // url = `http://api-in.js-stock.top/kline?interval=${internalPeriod}&key=nvmihAoT51LnAWCpDeuw&pid=${internalSymbol.Symbol}`
const kLines = JSON.parse(window.localStorage.getItem("kLine"));
- // if (kLines.type === 'IN' ||kLines.type === 'US') {
url =
window.globalVar +
`api/stock/getKData.do?pid=${kLines.pid}&interval=${internalPeriod}&stockType=${kLines.type}`;
- // }
- // if (kLines.type === 'qh') {
- // const internalPe = internalPeriod === 1 ? 5 : internalPeriod
- // url = window.globalVar+`api/stock/getKData.do?symbol=${encodeURIComponent(kLines.pid)}&cmd=history&period=${internalPe}&stockType=${kLines.type}`
- // url = window.globalVar+`api/stock/getKData.do?symbol=${encodeURIComponent(kLines.pid)}&cmd=history&period=${internalPe}&key=jssj2023key`
- // }
+
}
return {
@@ -1536,7 +1524,7 @@
HQData.RecvRealtimeData = function(recvData, callback, option) {
var data = recvData.data;
// var stock = { symbol: option.Obj.Symbol, name: 'K线图' }
- var stock = { symbol: option.Obj.Symbol, name: data.name || "" };
+ // var stock = { symbol: option.Obj.Symbol, name: data.name || "" };
// var yClose = data[0].c
// for (var i = 0; i < data.length; ++i) {
// var item = data[i]
@@ -1564,7 +1552,8 @@
// yClose = close
// }
const kLines = JSON.parse(window.localStorage.getItem("kLine"));
- var yClose = data.preKPrice;
+ // var yClose = data.preKPrice;
+ var yClose = '123';
console.log("recvDatadata====", data);
if (kLines.type === "IN" || kLines.type === "US") {
for (var i = 0; i < data.klines.length; ++i) {
@@ -1618,10 +1607,10 @@
var hqchartData = { code: 0, stock: [stock] };
- if (option.Data.Self.IsDestroy === false) {
+ // if (option.Data.Self.IsDestroy === false) {
HQData.Log("[HQData.RecvRealtimeData] hqchartData ", hqchartData);
callback(hqchartData);
- }
+ // }
};
HQData.RequestHistoryMinuteData = function(data, callback) {
data.PreventDefault = true;
@@ -1650,14 +1639,11 @@
// hqChartData.name = data.name
const kLines = JSON.parse(window.localStorage.getItem("kLine"));
hqChartData.name = "123";
- // console.log('data.name', data.name)
- //
- // var yClose = data.preKPrice
+
var yClose = "";
console.log("recvData===data.name22", recvData, kLines);
recvData = JSON.parse(recvData);
-
if (kLines.type === "SZHB") {
recvData = recvData.data;
recvData.reverse();
@@ -1667,7 +1653,7 @@
// var today = new Date(strItem.t)
// var date = today.getFullYear() * 10000 + (today.getMonth() + 1) * 100 + today.getDate()
var date = moment.unix(strItem.id).format("YYYYMMDD");
- //
+ var time = moment.unix(strItem.id).format("HHmm");
var open = parseFloat(strItem.open);
var close = parseFloat(strItem.close);
var high = parseFloat(strItem.high);
@@ -1675,19 +1661,21 @@
var vol = parseFloat(strItem.vol) * 100;
var amount = parseFloat(Math.random() * 100 + "");
//
- var newItem = [date, yClose, open, high, low, close, vol, amount];
+ var newItem = [date, yClose, open, high, low, close, vol, amount, time];
hqChartData.data.push(newItem);
//
yClose = close;
}
- }else{
+ } else {
for (var i = 0; i < recvData.length; ++i) {
var strItem = recvData[i];
// var item = strItem.split(',')
// var today = new Date(strItem.t)
// var date = today.getFullYear() * 10000 + (today.getMonth() + 1) * 100 + today.getDate()
var date = moment.unix(strItem.t).format("YYYYMMDD");
+ var time = moment.unix(strItem.t).format("HHmm");
+
var open = parseFloat(strItem.o);
var close = parseFloat(strItem.c);
var high = parseFloat(strItem.h);
@@ -1695,14 +1683,14 @@
var vol = parseFloat(strItem.v) * 100;
var amount = parseFloat(Math.random() * 100 + "");
//
- var newItem = [date, yClose, open, high, low, close, vol, amount];
+ var newItem = [date, yClose, open, high, low, close, vol, amount, time];
hqChartData.data.push(newItem);
//
yClose = close;
}
}
-
+
if (option.Data.Self.IsDestroy === false) {
HQData.Log("[HQData.RecvHistoryData] hqchartData ", hqChartData);
callback(hqChartData);
@@ -1750,13 +1738,8 @@
for (var i = 0; i < data.klines.length; ++i) {
var strItem = data.klines[i];
var item = strItem.split(",");
- var today = new Date(Date.parse(item[0]));
- var date =
- today.getFullYear() * 10000 +
- (today.getMonth() + 1) * 100 +
- today.getDate();
- var time = today.getHours() * 100 + today.getMinutes();
+ var time = moment.unix(item[0]).format("HHmm");
var open = parseFloat(item[1]);
var close = parseFloat(item[2]);
var high = parseFloat(item[3]);
--
Gitblit v1.9.3