From 75f6a06e383305d4ac070568ad420d310894049d Mon Sep 17 00:00:00 2001
From: simple321vip <simple321@vip.qq.com>
Date: Sun, 18 Sep 2022 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCTA=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AD=96=E7=95=A5=E6=97=B6=EF=BC=8C=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E6=96=87=E4=BB=B6=E6=9C=AA=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/capital/index.vue            | 22 ++++++-------------
 src/view/dashboard/index.vue          | 10 ---------
 src/view/trader/cta_strategy.vue      | 31 ++++++++++++++-------------
 src/view/trader/cta_strategy_file.vue |  4 ++--
 4 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/src/view/capital/index.vue b/src/view/capital/index.vue
index 3c559ed..ee107d9 100644
--- a/src/view/capital/index.vue
+++ b/src/view/capital/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="demo-collapse">
     <el-collapse v-model="activeNames">
-      <el-collapse-item title="Account Info" name="1">
-        <el-row>
+      <el-collapse-item title="Accounts list" name="1">
+        <el-row v-for="account_data in account_datas">
           <el-col :span="1">
             <div class="cell-item">
               <el-icon style="iconStyle">
@@ -184,12 +184,7 @@ const activeName = ref(1)
 const volume = ref(1)
 const price = ref(3000)
 const timer = ref(0)
-const account_data = reactive<AccountData>({
-  gateway_name: '',
-  account_id: '',
-  balance: 0.0,
-  frozen: 0.0
-})
+const account_datas = reactive<AccountData[]>([])
 const positions_data = reactive<PositionData[]>([])
 const trades_data = reactive<TradeData[]>([])
 const orders_data = reactive<OrderData[]>([])
@@ -197,13 +192,10 @@ const activeNames = ref(['1'])
 
 const on_query_accounts = () => {
   get_accounts().then(res => {
-    let accounts: [] = res.data.accounts
-    let account: any = accounts.pop()
-    account_data.account_id = account.account_id
-    account_data.balance = account.balance
-    account_data.gateway_name = account.gateway_name
-    account_data.frozen = account.frozen
-
+    account_datas.length = 0
+    res.data.accounts.forEach((account: AccountData) => {
+      account_datas.push(account)
+    })
     positions_data.length = 0
     res.data.positions.forEach((element: PositionData) => {
       positions_data.push(element)
diff --git a/src/view/dashboard/index.vue b/src/view/dashboard/index.vue
index 96667fc..b97dc9d 100644
--- a/src/view/dashboard/index.vue
+++ b/src/view/dashboard/index.vue
@@ -21,16 +21,6 @@ onMounted(() => {
 
 const init = () => {
 
-  get_strategy_load_files().then(res => {
-    store.$patch({ class_names: res.data.class_names })
-  }).catch(error => {
-    ElMessage({
-      message: h('p', null, [
-        h('i', { style: 'color: teal' }, "读取策略文件失败"),
-      ]),
-    })
-  })
-
   get_vt_symbols().then(res => {
     console.log(res)
     let map = new Map()
diff --git a/src/view/trader/cta_strategy.vue b/src/view/trader/cta_strategy.vue
index a768cda..ca3994a 100644
--- a/src/view/trader/cta_strategy.vue
+++ b/src/view/trader/cta_strategy.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import create_strategy_dialog from './dialog.vue'
 import {
   get_strategies,
@@ -71,17 +71,11 @@ import {
   remove_strategy,
   get_strategy_status,
   get_strategy_load_files,
-  get_vt_symbols
 } from '../../api/cta_strategy'
 import { h } from 'vue'
 import { ElMessage } from 'element-plus'
 import { strategyStore } from '../../store/strategy'
 
-const store = strategyStore()
-
-let createStrategyDialogVisible = ref(false)
-
-
 type Strategy = {
   strategy_name: string,
   class_name: string,
@@ -90,7 +84,10 @@ type Strategy = {
   status: number,
 }
 
+const store = strategyStore()
+let createStrategyDialogVisible = ref(false)
 const strategy_list = reactive<Strategy[]>([])
+const dialogRef = ref()
 
 const on_list = () => {
   createStrategyDialogVisible.value = false
@@ -101,7 +98,7 @@ const on_list = () => {
     })
   })
 }
-const dialogRef = ref()
+
 const handle_create = () => {
   createStrategyDialogVisible.value = true
   dialogRef.value.clear_form()
@@ -114,8 +111,6 @@ const on_start = (row: any) => {
       row.status = 2
     })
   })
-
-
 }
 
 const on_stop = (row: any) => {
@@ -135,12 +130,18 @@ const on_status = (row: any) => {
     row.status = res.data.status
   })
 }
-
-const init = () => {
+onMounted(() => {
   on_list()
-}
-// init process
-init()
+  get_strategy_load_files().then(res => {
+    store.$patch({ class_names: res.data.class_names })
+  }).catch(error => {
+    ElMessage({
+      message: h('p', null, [
+        h('i', { style: 'color: teal' }, "读取策略文件失败"),
+      ]),
+    })
+  })
+})
 
 </script>
 
diff --git a/src/view/trader/cta_strategy_file.vue b/src/view/trader/cta_strategy_file.vue
index af5dec5..582392f 100644
--- a/src/view/trader/cta_strategy_file.vue
+++ b/src/view/trader/cta_strategy_file.vue
@@ -37,7 +37,7 @@
       <el-table-column prop="url" label="加载" width="60">
         <template #default="scope">
           <span v-if="scope.row.status == 0" style="cursor: pointer">
-            <el-icon :size="20" @click="on_remove(scope.row)" color="blue">
+            <el-icon :size="20" @click="on_load(scope.row)" color="blue">
               <CirclePlusFilled />
             </el-icon>
           </span>
@@ -46,7 +46,7 @@
       <el-table-column prop="url" label="卸载" width="60">
         <template #default="scope">
           <span v-if="scope.row.status == 1" style="cursor: pointer">
-            <el-icon :size="20" @click="on_remove(scope.row)" color="red">
+            <el-icon :size="20" @click="on_unload(scope.row)" color="red">
               <RemoveFilled />
             </el-icon>
           </span>