From 0eeb39d97ff6d647a89484b80fd28c18b1e2892c Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 23 Oct 2024 14:58:38 +0800
Subject: [PATCH] 1
---
src/locales/en.json | 2
src/page/list/tradingList/data.list.vue | 2
src/page/kline/index.vue | 11 +++--
src/page/user/Warehouse/data.list.vue | 12 +++---
src/page/kline/components/kLine.vue | 29 ++++++++++++--
src/components/Language/index.vue | 8 ++--
src/eastmoney/HQData.js | 25 +++---------
7 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/src/components/Language/index.vue b/src/components/Language/index.vue
index 304a3f1..1141a79 100644
--- a/src/components/Language/index.vue
+++ b/src/components/Language/index.vue
@@ -39,10 +39,10 @@
text: "English",
lang: "en",
},
- {
- text: "简体中文",
- lang: "zh-CN",
- },
+ // {
+ // text: "简体中文",
+ // lang: "zh-CN",
+ // },
{ text: "हिंदी", lang: "hi" },
// {
// text: "Deutsch",
diff --git a/src/eastmoney/HQData.js b/src/eastmoney/HQData.js
index 5ab9adc..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;
diff --git a/src/locales/en.json b/src/locales/en.json
index ca041b7..0dc7290 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -203,7 +203,7 @@
"hj71": "The index currently does not support self-selection! ",
"hj72": "Open today",
"hj73": "Highest",
- "hj74": "Harvested yesterday",
+ "hj74": "Yesterday",
"hj75": "Lowest",
"hj76": "Fifth gear",
"hj77": "Purchase",
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index 4e0db31..ab87dd2 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -994,6 +994,8 @@
},
data() {
return {
+ key:0,
+ active:0,
MinuteDayMenu: DefaultData.GetMinuteDayMenu(),
MinuteDayIndex: 0,
KLinePeriodMenu: DefaultData.GetKLinePeriodMenu(),
@@ -1015,10 +1017,12 @@
VolChartHeight: 10,
chartType: "kline",
+ timerss:null,
isShow: false,
xData: [],
};
},
+
created() {
const { query } = this.$route;
if (query.if_zhishu === "0") {
@@ -1040,8 +1044,18 @@
this.OnSize();
this.SetChartStyle();
this.$nextTick(() => {
- // this.CreateMinuteChart();
- this.CreateKLineChart();
+ this.CreateMinuteChart();
+ this.CreateKLineChart();
+ // this.timerss = setInterval(() => {
+ // this.CreateKLineChart();
+ // console.log(this.KLinePeriodMenu);
+ // // this.KLineChart.ChangePeriod(this.KLinePeriodMenu[this.KLinePeriodIndex].ID);
+ // //此处为了 让k线实时刷新
+ // this.OnClickKLinePeriodMenu(this.KLinePeriodIndex, 0, 'kline')
+ // this.OnClickKLinePeriodMenu(this.KLinePeriodIndex, this.KLinePeriodMenu[this.KLinePeriodIndex], 'kline')
+ // // this.OnClickKLinePeriodMenu(this.KLinePeriodIndex+1, this.KLinePeriodMenu[this.KLinePeriodIndex+1], 'kline')
+ // // this.OnClickKLinePeriodMenu(this.KLinePeriodIndex-1, this.KLinePeriodMenu[this.KLinePeriodIndex-1], 'kline')
+ // }, 5000);
});
let that = this;
window.onresize = _.debounce(this.OnSize, 200);
@@ -1075,8 +1089,12 @@
that.OnSize();
});
},
-
+ beforeDestroy() {
+ clearInterval(this.timerss); // 在组件销毁前清除定时器
+ this.timerss = null
+ },
methods: {
+
OnSize() {
var width = this.$refs.right.clientWidth;
// var rightTab = this.$refs.rightTab
@@ -1117,7 +1135,7 @@
},
CreateMinuteChart() {
- if (this.Chart) return;
+ // if (this.Chart) return;
var option = DefaultData.GetMinuteOption();
option.Symbol = this.Symbol;
@@ -1137,6 +1155,8 @@
option.Symbol = this.Symbol;
option.NetworkFilter = (data, callback) => {
this.NetworkFilter(data, callback);
+
+ // this.NetworkFilter(data, callback);
}; // 网络请求回调函数
var chart = HQChart.Chart.JSChart.Init(this.$refs.kline2);
HQChart.Chart.JSChart.GetResource().FrameLogo.Text = null;
@@ -1178,6 +1198,7 @@
item,
type // K线周期
) {
+ console.log('1');
//分时额外处理才注释的
this.chartType = type;
this.KLinePeriodIndex = index;
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index 31deba3..b06051d 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -150,7 +150,7 @@
>₹{{ singDetails.preclose_px }}</span
>
</div>
- <div class="rights bots">
+ <div class="rights bots">
<span class="titles">{{ $t("hj75") }}</span>
<!-- <span :class="singDetails.preclose_px < 0 ? 'number green' : 'number red'">{{
singDetails.today_min
@@ -167,7 +167,7 @@
</div>
</div>
<div class="k_line_detail">
- <Kline :type="singDetails.type" />
+ <Kline :key="key" :type="singDetails.type" />
</div>
<div
class="priect_top_bottom"
@@ -471,6 +471,7 @@
newsdetailList: [],
bayType: "",
timer: null,
+ key:0,
};
},
components: {
@@ -485,7 +486,7 @@
} else {
this.timer = setInterval(() => {
this.getSingDetails();
- }, 500);
+ }, 5000);
}
this.getOpation();
// this.$Lazyload();
@@ -930,10 +931,10 @@
.top_now {
width: 100%;
// height: 65%;
- font-size: 0.741rem;
+ font-size: 25px;
display: flex;
align-items: center;
-
+ font-weight: bold;
span {
font-weight: 500;
}
diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 738e855..3192c10 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -75,7 +75,7 @@
<van-col span="3">
<div style="text-align: right">
- {{ (item.gid || item.stockGid) == "nse" ? "NSE" : "BSE" }}
+ {{ (item.gid || item.stockGid).toUpperCase() }}
</div>
</van-col>
diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 567d052..03e2e22 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -42,7 +42,7 @@
<div class="sport-content-title2" >
{{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text" style="color:#3e9976;">
+ <div class="sport-content-text2" :style="item.profitAndLoseParent.charAt(0)=='-'?'color:#cc1b1b;':'color:#3e9976;'">
₹{{ item.profitAndLose | _toLocaleString }}
</div>
</div>
@@ -52,7 +52,7 @@
<div class="sport-content-title2">
{{ $t("hj141") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2" style="color:#3e9976;">
+ <div class="sport-content-text2" :style="item.profitAndLoseParent.charAt(0)=='-'?'color:#cc1b1b;':'color:#3e9976;'">
{{ item.profitAndLoseParent }}
</div>
</div>
@@ -60,7 +60,7 @@
<van-col span="8">
<div style="text-align: right">
<div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
- <div class="sport-content-text">{{ item.orderNum }}</div>
+ <div class="sport-content-text2">{{ item.orderNum }}</div>
</div></van-col
>
</van-row>
@@ -186,7 +186,7 @@
<div class="sport-content-title2">
{{ $t("盈虧") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text" style="color:#3e9976;">
+ <div class="sport-content-text2" :style="item.profitAndLoseParent.charAt(0)=='-'?'color:#cc1b1b;':'color:#3e9976;'">
₹{{ item.profitAndLose | _toLocaleString }}
</div>
</div>
@@ -196,7 +196,7 @@
<div class="sport-content-title2">
{{ $t("hj141") }} ({{ activeObj.symbolCode }})
</div>
- <div class="sport-content-text2" style="color:#3e9976;">
+ <div class="sport-content-text2" :style="item.profitAndLoseParent.charAt(0)=='-'?'color:#cc1b1b;':'color:#3e9976;'">
{{ item.profitAndLoseParent }}
</div>
</div>
@@ -204,7 +204,7 @@
<van-col span="8">
<div style="text-align: right">
<div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
- <div class="sport-content-text">{{ item.orderNum }}</div>
+ <div class="sport-content-text2">{{ item.orderNum }}</div>
</div></van-col
>
</van-row>
--
Gitblit v1.9.3