Browse Source

Merge branch 'master' of http://git.liuniu946.com/lhl/nzhbsr

hwq 3 years ago
parent
commit
162caa9006
1 changed files with 14 additions and 8 deletions
  1. 14 8
      hybrid/html/js/kline.js

+ 14 - 8
hybrid/html/js/kline.js

@@ -330,7 +330,7 @@ var app = new Vue({
 			axiosGet('/index/deal', {
 			// axiosGet('/api/v5/market/trades', {
 				instId: that.typeId,
-				limit: 100
+				limit: 150
 			}).then((res) => {
 				// 处理返回数据
 				this.dealHis = res.map((e) => {
@@ -382,7 +382,8 @@ var app = new Vue({
 		formatterNum(value, precision) {
 			// console.log(value)
 			let reg = new RegExp('^\\d+(?:\\.\\d{0,' + precision + '})?')
-			return value.toString().match(reg)
+			// return value.toString().match(reg)
+			return value.toString()
 		},
 		// 计算MA
 		calculateMA(dayCount, data) {
@@ -397,7 +398,8 @@ var app = new Vue({
 					sum += data[i - j][1];
 				}
 				// console.log(sum, dayCount)
-				result.push((sum / dayCount).toFixed(2));
+				result.push((sum / dayCount));
+				// result.push((sum / dayCount).toFixed(2));
 			}
 			return result;
 		},
@@ -538,7 +540,8 @@ var app = new Vue({
 						inside: true,
 						fontSize: 10,
 						formatter: function(value) {
-							return Number(value).toFixed(2)
+							return Number(value)
+							// return Number(value).toFixed(2)
 						}
 					},
 					splitLine: {
@@ -703,17 +706,20 @@ var app = new Vue({
 						markPoint: {
 							symbol: 'rect',
 							symbolSize: [-10, 0.5],
-							symbolOffset: [5, 0],
+							symbolOffset: [-5, 0],
 							itemStyle: {
 								color: 'rgba(255,255,255,.87)'
 							},
 							label: {
 								color: 'rgba(255,255,255,.87)',
-								offset: [10, 0],
+								offset: [3, 0],
 								fontSize: 10,
-								align: 'left',
+								position:"left", 
+								align: 'right',
 								formatter: function(params) {
-									return Number(params.value).toFixed(2)
+									console.log(params.value,'传入的处理数值');
+									// return Number(params.value).toFixed(2)
+									return Number(params.value)
 								}
 							},
 							data: [{