From 60bbcca0954e6df899024b61e3c7b2e613766782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Thu, 3 Aug 2023 22:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/inProgress/index.vue | 21 ++++++++++-----------
 ruoyi-ui/src/views/index_v1.vue         |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/inProgress/index.vue b/ruoyi-ui/src/views/inProgress/index.vue
index 677733d..5359033 100644
--- a/ruoyi-ui/src/views/inProgress/index.vue
+++ b/ruoyi-ui/src/views/inProgress/index.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="app-mian">
- 
+
       <!-- 搜索栏 -->
       <div class="index">
         <el-form ref="queryForm" size="small" :inline="true" :model="queryParams">
            <div class="left">
-      
+
           <el-form-item label="班级" prop="content" class="formIpt">
             <el-select placeholder="选择分类" clearable type="image" v-model="queryParams.classId">
               <el-option v-for="item in classeslist" :key="item" :label="item.name" :value="item.id"/>
@@ -23,7 +23,7 @@
             <el-button    size="mini"    icon="el-icon-arrow-left" @click="back">返回</el-button>
           </el-form-item>
            </div>
-        
+
         </el-form>
         <el-table v-loading="loading" :data="transactionlist" style="width: 100%" >
           <el-table-column prop="stuRank" label="排名" width="100" align="center" />
@@ -39,11 +39,11 @@
               <span v-else-if="scope.row.profit < 0" style="color: #36b9b2">{{scope.row.cumulativeProfitLoss}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="yield" label="收益率" align="center" />
+          <el-table-column prop="strYield" label="收益率" align="center" />
           <el-table-column prop="openingTrades" label="开仓次数" align="center" />
-         
+
           <el-table-column prop="closingTrades" label="平仓次数" align="center" />
-        
+
           <el-table-column label="交易记录" align="center">
             <template   slot-scope="scope">
               <el-button   size="mini"  type="primary"  @click="trade(scope.row)" >交易记录</el-button>
@@ -75,7 +75,7 @@
           index: 1,
           classId:'',
           size: 10,
-       
+
         },
         tasklist:null,
         classeslist:null,
@@ -113,16 +113,16 @@
         })
       },
       trade(data) {
-        // alert(data.memberId)  
+        // alert(data.memberId)
         this.$store.commit('SET_MEMBERID', data.memberId)
         setmemberId(data.memberId)
         this.$tab.openPage('交易记录', `/teacher/transactionRecords/index?id=${data.trainingId}`)
-      
+
       },
       back() {
       this.$router.back()
     }
-    
+
     }
   }
   </script>
@@ -144,4 +144,3 @@
     justify-content: space-between;
   }
   </style>
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/index_v1.vue b/ruoyi-ui/src/views/index_v1.vue
index 7f3a35a..50ed3cc 100644
--- a/ruoyi-ui/src/views/index_v1.vue
+++ b/ruoyi-ui/src/views/index_v1.vue
@@ -45,7 +45,7 @@
             <span v-else-if="scope.row.profit < 0" style="color: #36b9b2">{{scope.row.cumulativeProfitLoss}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="strYieId" label="收益率" align="center" />
+        <el-table-column prop="strYield" label="收益率" align="center" />
         <el-table-column prop="tradeTrainingScore" label="模拟交易实训成绩"  align="center"/>
         <el-table-column prop="reportScore" label="实验报告成绩" align="center" />
         <el-table-column prop="totalScore" label="总成绩" align="center" />