From 4320f35a527553853994f3b8dc2df4ea2c4c9636 Mon Sep 17 00:00:00 2001
From: simple321vip <simple321@vip.qq.com>
Date: Wed, 14 Sep 2022 23:11:36 +0800
Subject: [PATCH] =?UTF-8?q?simnow=20=E4=BB=BF=E7=9C=9F=E5=AE=9E=E6=B5=8B?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/capital/index.vue   | 128 +++++++++++++++++++++++++----------
 src/view/dashboard/index.vue |   2 +-
 src/view/recommend/index.vue |  34 +++++++---
 3 files changed, 117 insertions(+), 47 deletions(-)

diff --git a/src/view/capital/index.vue b/src/view/capital/index.vue
index 80816e0..a1969a9 100644
--- a/src/view/capital/index.vue
+++ b/src/view/capital/index.vue
@@ -57,28 +57,45 @@
       <el-tab-pane label="委托" name=3></el-tab-pane>
       <el-tab-pane label="成交" name=4></el-tab-pane>
     </el-tabs>
-    <el-table v-if="activeName == 1" :data="position_data" stripe style="width: 100%">
-      <el-table-column prop="symbol" label="合约名称" width="180" />
-      <el-table-column prop="direction" label="多空" width="180" />
-      <el-table-column prop="open_price" label="开仓价格" width="180" />
-      <el-table-column prop="gain_loss" label="盈亏" />
+    <el-table v-if="activeName == 1" :data="positions_data" stripe style="width: 100%">
+      <el-table-column prop="symbol" label="合约名称" width="100" />
+      <el-table-column prop="exchange" label="交易所" width="100" />
+      <el-table-column prop="direction" label="多空" width="100" />
+      <el-table-column prop="volume" label="成交量" width="100" />
+      <el-table-column prop="price" label="开仓价格" width="100" />
+      <el-table-column prop="frozen" label="frozen" width="100" />
+      <el-table-column prop="pnl" label="pnl" width="100" />
+      <el-table-column prop="yd_volume" label="yd_volume" width="120" />
     </el-table>
-    <el-table v-if="activeName == 2" :data="position_data" stripe style="width: 100%">
-      <el-table-column prop="symbol" label="合约名称" width="180" />
-      <el-table-column prop="direction" label="多空" width="180" />
-      <el-table-column prop="balance" label="盈亏" />
+    <el-table v-if="activeName == 2" :data="orders_data" stripe style="width: 100%">
+      <el-table-column prop="symbol" label="合约名称" width="100" />
+      <el-table-column prop="exchange" label="交易所" width="100" />
+      <el-table-column prop="direction" label="多空" width="100" />
+      <el-table-column prop="volume" label="成交量" width="100" />
+      <el-table-column prop="price" label="开仓价格" width="100" />
     </el-table>
-    <el-table v-if="activeName == 3" :data="position_data" stripe style="width: 100%">
-      <el-table-column prop="symbol" label="合约名称" width="180" />
-      <el-table-column prop="direction" label="多空" width="180" />
-      <el-table-column prop="balance" label="盈亏" />
+    <el-table v-if="activeName == 3" :data="orders_data" stripe style="width: 100%">
+      <el-table-column prop="symbol" label="合约名称" width="80" />
+      <el-table-column prop="exchange" label="交易所" width="80" />
+      <el-table-column prop="direction" label="多空" width="80" />
+      <el-table-column prop="volume" label="成交量" width="80" />
+      <el-table-column prop="price" label="委托价格" width="100" />
+      <el-table-column prop="orderid" label="orderid" width="160" />
+      <el-table-column prop="type" label="type" width="80" />
+      <el-table-column prop="offset" label="开平" width="80" />
+      <el-table-column prop="traded" label="traded" width="80" />
+      <el-table-column prop="status" label="status" width="80" />
+      <el-table-column prop="reference" label="reference" width="100" />
     </el-table>
-    <el-table v-if="activeName == 4" :data="deal_data" stripe style="width: 100%">
-      <el-table-column prop="symbol" label="合约名称" width="180" />
-      <el-table-column prop="direction" label="开平" width="180" />
-      <el-table-column prop="price" label="成交价" width="180" />
-      <el-table-column prop="volume" label="成交量" width="180" />
-      <el-table-column prop="balance" label="成交时间" width="180" />
+    <el-table v-if="activeName == 4" :data="trades_data" stripe style="width: 100%">
+      <el-table-column prop="symbol" label="合约名称" width="100" />
+      <el-table-column prop="exchange" label="交易所" width="100" />
+      <el-table-column prop="direction" label="多空" width="100" />
+      <el-table-column prop="volume" label="成交量" width="100" />
+      <el-table-column prop="price" label="开仓价格" width="100" />
+      <el-table-column prop="orderid" label="orderid" width="100" />
+      <el-table-column prop="orderid" label="orderid" width="100" />
+      <el-table-column prop="offset" label="offset" width="100" />
     </el-table>
   </div>
 </template>
@@ -87,7 +104,7 @@
 
 import { ElMessage, TabsPaneContext } from 'element-plus'
 import { reactive, ref, h, onMounted, onUnmounted } from 'vue'
-import { get_accounts, send_order, get_contract, subscribe } from '../../api/capital'
+import { get_accounts, send_order, get_tick } from '../../api/capital'
 import { strategyStore } from '../../store/strategy';
 type AccountData = {
   geteway_name: string
@@ -97,19 +114,41 @@ type AccountData = {
 }
 type PositionData = {
   symbol: string
+  exchange: string
   direction: string
-  open_price: number
-  gain_loss: number
-}
-type DealData = {
-  symbol: string
-  direction: string
-  price: number
   volume: number
+  price: number
+  frozen: number
+  pnl: number
+  yd_volume: number
+}
+type OrderData = {
+  symbol: string
+  exchange: string
+  direction: string
+  volume: number
+  price: number
+  orderid: string
+  type: string
+  offset: string
+  traded: number
+  status: string
+  // datetime :datetime
+  reference: string
+}
+type TradeData = {
+  symbol: string
+  exchange: string
+  direction: string
+  volume: number
+  price: number
+  orderid: string
+  tradeid: string
+  offset: string
+  // datetime: datetime
 }
 const store = strategyStore()
 const vt_symbol = ref<string>("")
-const contracts = reactive<string[]>([])
 const direction = ref('多')
 const offset = ref('开')
 const activeName = ref(1)
@@ -122,20 +161,39 @@ const account_data = reactive<AccountData>({
   balance: 0.0,
   frozen: 0.0
 })
-const position_data = reactive<PositionData[]>([])
-const deal_data = reactive<DealData[]>([])
+const positions_data = reactive<PositionData[]>([])
+const trades_data = reactive<TradeData[]>([])
+const orders_data = reactive<OrderData[]>([])
 
 
 const on_query_accounts = () => {
   get_accounts().then(res => {
-    account_data.account_id = res.data.account_id
-    account_data.balance = res.data.balance
-    account_data.geteway_name = res.data.geteway_name
-    account_data.frozen = res.data.frozen
+    let accounts: [] = res.data.accounts
+    let account: any = accounts.pop()
+    account_data.account_id = account.account_id
+    account_data.balance = account.balance
+    account_data.geteway_name = account.geteway_name
+    account_data.frozen = account.frozen
+
+    positions_data.length = 0
+    res.data.positions.forEach((element: PositionData) => {
+      positions_data.push(element)
+    })
+
+    trades_data.length = 0
+    res.data.trades.forEach((element: TradeData) => {
+      trades_data.push(element)
+    })
+
+    orders_data.length = 0
+    res.data.orders.forEach((element: OrderData) => {
+      orders_data.push(element)
+    })
+
   })
 }
 const select_contract = () => {
-  subscribe(vt_symbol.value).then(res => {
+  get_tick(vt_symbol.value).then(res => {
     price.value = res.data.tick.last_price
   })
 }
diff --git a/src/view/dashboard/index.vue b/src/view/dashboard/index.vue
index 365a75f..96667fc 100644
--- a/src/view/dashboard/index.vue
+++ b/src/view/dashboard/index.vue
@@ -48,7 +48,7 @@ const init = () => {
   })
 
   get_subscribe_vt_symbols().then(res => {
-    store.$patch({ vt_symbols: res.data.vt_symbols })
+    store.$patch({ subscribe_vt_symbols: res.data.vt_symbols })
   }).catch(error => {
     ElMessage({
       message: h('p', null, [
diff --git a/src/view/recommend/index.vue b/src/view/recommend/index.vue
index 01686ea..bcb9cfe 100644
--- a/src/view/recommend/index.vue
+++ b/src/view/recommend/index.vue
@@ -1,22 +1,22 @@
 <template>
   <el-row>
     <el-col :span="4">
-      <el-select v-model="exchange" placeholder="select a exchange" @change="filter_vt_symbols">
-        <el-option v-for="ex in store.exchanges" :value="ex" />
+      <el-select v-model="exchange" placeholder="select a exchange">
+        <el-option v-for="ex in exchanges" :value="ex" />
       </el-select>
     </el-col>
     <el-col :span="1">
     </el-col>
     <el-col :span="4">
       <el-select v-model="vt_symbol" placeholder="select a vt_symbol">
-        <el-option v-for="symbol in store.vt_symbols.get(exchange)" :value="symbol" />
+        <el-option v-for="symbol in vt_symbols" :value="symbol" />
       </el-select>
     </el-col>
     <el-col :span="1">
     </el-col>
     <el-col :span="4">
       <span style="cursor: pointer">
-        <el-icon :size="25" @click="on_subscribe(vt_symbol)">
+        <el-icon :size="25" @click="on_subscribe()">
           <ZoomIn />
         </el-icon>
       </span>
@@ -36,14 +36,19 @@
 </template>
 
 <script setup lang="ts">
-import { ref, h, onMounted, onUnmounted, reactive } from 'vue'
+import { ref, h, onMounted, onUnmounted, reactive, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { get_ticks, subscribe } from '../../api/capital'
 import { strategyStore } from '../../store/strategy'
 
 const store = strategyStore()
-const vt_symbol = ref<string>("")
+const vt_symbol = ref<string>()
+const vt_symbols = reactive<string[]>([])
 const exchange = ref<string>()
+const exchanges = reactive<string[]>([])
+store.exchanges.forEach(exchange => {
+  exchanges.push(exchange)
+})
 const timer = ref(0)
 
 type TickData = {
@@ -58,8 +63,11 @@ type TickData = {
 }
 const ticks_data = reactive<TickData[]>([])
 
-const on_subscribe = (vt_symbol: string) => {
-  subscribe(vt_symbol).then(res => {
+const on_subscribe = () => {
+  if (!vt_symbol.value) {
+    return
+  }
+  subscribe(vt_symbol.value).then(res => {
     ElMessage({
       message: h('p', null, [
         h('i', { style: 'color: green' }, "行情订阅成功"),
@@ -83,9 +91,13 @@ const on_ticks = () => {
   })
 }
 
-const filter_vt_symbols = () => {
-
-}
+watch(exchange, (newVal, oldVal) => {
+  vt_symbols.length = 0
+  // let sp_vt_symbol: [] = store.vt_symbols.get(vt_symbol.value)
+  // sp_vt_symbol.forEach((record: string) => {
+  //   vt_symbols.push(record)
+  // })
+})
 
 onMounted(() => {
   clearInterval(timer.value)