li.shaoyi há 2 anos atrás
pai
commit
dd07ccca56

+ 20 - 5
src/hooks/echarts/candlestick/index.ts

@@ -147,9 +147,24 @@ export function useCandlestickChart(goodscode: string) {
             // } else {
             // 判断时间差是否大于周期时间
             if (lastIndex === -1 || diffTime > cycleMilliseconds) {
+                const newtime = (() => {
+                    switch (options.cycleType) {
+                        case ChartCycleType.Day: {
+                            return moment(lasttime).format('YYYY-MM-DD')
+                        }
+                        case ChartCycleType.Hours2:
+                        case ChartCycleType.Hours4: {
+                            return moment(lasttime).format('YYYY-MM-DD HH:00:00')
+                        }
+                        default: {
+                            return moment(lasttime).format('YYYY-MM-DD HH:mm:00')
+                        }
+                    }
+                })()
+
                 // 新增K线数据
                 candlestick.source.push({
-                    date: lasttime,
+                    date: newtime,
                     open: last,
                     close: last,
                     lowest: last,
@@ -161,7 +176,7 @@ export function useCandlestickChart(goodscode: string) {
 
                 // 新增MACD数据
                 macd.source.push({
-                    date: lasttime,
+                    date: newtime,
                     ema12: 0,
                     ema26: 0,
                     dif: 0,
@@ -171,13 +186,13 @@ export function useCandlestickChart(goodscode: string) {
 
                 // 新增VOL数据
                 vol.source.push({
-                    date: lasttime,
+                    date: newtime,
                     vol: 0,
                 })
 
                 // 新增KDJ数据
                 kdj.source.push({
-                    date: lasttime,
+                    date: newtime,
                     k: '-',
                     d: '-',
                     j: '-',
@@ -185,7 +200,7 @@ export function useCandlestickChart(goodscode: string) {
 
                 // 新增CCI数据
                 cci.source.push({
-                    date: lasttime,
+                    date: newtime,
                     cci: '-',
                 })
             } else {

+ 0 - 1
src/packages/pc/components/layouts/page/index.vue

@@ -31,7 +31,6 @@
     </div>
     <div class="app-page__statusbar">
       <div class="statusbar-left">
-
       </div>
       <div class="statusbar-right">
         {{ serverTime?.format('HH:mm:ss') }}