update

src/api.js

@@ -116,6 +116,10 @@ export default {
 	getGroupList: params => {
 		return axios.get(`${baseURL}/api/admin/match/group/search`, { params: params })
 	},
+	// 股票列表
+	getStockList: params => {
+		return axios.get(`${baseURL}/api/admin/stock/search`, { params: params })
+	},
 	//获取所有模板列表
 	getAllTemplateList: params => {
 		return axios.get(`${baseURL}/api/admin/message/template/all`, { params: params })

src/router.js

@@ -11,11 +11,11 @@ export default new Router({
     },
     {
       path: '/data',
-      name: '数据统计',
+      name: '参赛数据',
       icon: 'el-icon-pie-chart',
       component: () => import('./views/Home.vue'),
       show: 1,
-      isLeaf: 1,
+      isLeaf: 0,
       children: [{
         path: '/data',
         component: () => import('./views/data/index.vue'),
@@ -28,13 +28,30 @@ export default new Router({
       icon: 'el-icon-trophy-1',
       component: () => import('./views/Home.vue'),
       show: 1,
-      isLeaf: 1,
+      isLeaf: 0,
       children: [{
         path: '/match',
         component: () => import('./views/match/index.vue'),
         name: '赛事管理'
+      },{
+        path: '/group',
+        component: () => import('./views/match/index.vue'),
+        name: '赛事分组'
       }, ]
     },
+    {
+      path: '/player',
+      name: '选手管理',
+      icon: 'el-icon-trophy-1',
+      component: () => import('./views/Home.vue'),
+      show: 1,
+      isLeaf: 0,
+      children: [{
+        path: '/player',
+        component: () => import('./views/match/index.vue'),
+        name: '参数选手'
+      } ]
+    },
     {
       path: '/user',
       name: '用户管理',

src/views/Home.vue

@@ -24,7 +24,7 @@
 								<i :class="item.icon"></i>
 								<span slot="title">{{item.name}}</span>
 							</el-menu-item>
-							<!-- <el-submenu   v-if='item.show&&!item.isLeaf' :index="'index_'+index"  :key='index'>
+							<el-submenu   v-if='item.show&&!item.isLeaf' :index="'index_'+index"  :key='index'>
 								<template slot="title" >
 								<i :class="item.icon"></i>
 								<span>{{item.name}}</span>
@@ -34,7 +34,7 @@
 									{{child.name}}
 									</el-menu-item>
 								</el-menu-item-group>
-							</el-submenu> -->
+							</el-submenu>
 					</template>
 				</el-menu>
 			</el-aside>

src/views/data/index.vue

@@ -11,36 +11,38 @@
 </style>
 <template>
     <section class="content data">
-        <h1>数据统计</h1>
+        <h4>数据统计</h4>
         <el-divider></el-divider>
         <el-form label-width="80px" class="filter-form">
             <el-row>
-                <el-col :span="9">
+                <el-col :span="4">
                     <el-form-item label="选手名字">
-                        <el-input v-model="queryParams.username" placeholder="请输入选手名字/代码"></el-input>
+                        <el-input v-model="queryParams.username" placeholder="请输入选手名字/代码" size="mini"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="9">
+                <el-col :span="4">
                     <el-form-item label="比赛日期">
                         <el-date-picker
                         v-model="queryParams.date"
                         type="date"
                         placeholder="选择日期"
                         format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd">
+                        value-format="yyyy-MM-dd"
+                        size="mini"
+                        >
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="9">
+                <el-col :span="4">
                     <el-form-item label="比赛名称" prop="match_id">
-                        <el-select v-model="queryParams.match_id" placeholder="请选择比赛">
+                        <el-select v-model="queryParams.match_id" placeholder="请选择比赛" size="mini">
                             <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <el-col :span="9">
+                <el-col :span="4">
                     <el-form-item label="比赛分组">
-                        <el-select v-model="queryParams.groupId" placeholder="请选择比赛分组">
+                        <el-select v-model="queryParams.groupId" placeholder="请选择比赛分组" size="mini">
                         <el-option v-for="item in groupList" :key='item.id' :label="item.name" :value="item.id"></el-option>
 
                         </el-select>
@@ -48,30 +50,27 @@
                 </el-col>
                 <el-col :span="4">
                     <el-form-item>
-                        <el-button type="primary" @click="getData">筛选</el-button>
+                        <el-button type="primary" @click="getData" size="mini">筛选</el-button>
+                        <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        >上传数据</el-button>
                     </el-form-item>
                 </el-col>
             </el-row>
         </el-form>
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                >新增</el-button>
-            </el-col>
-        </el-row>
         <el-table :data="list" height='39vh' style="width: 100%;margin-top:10px;">
                 <el-table-column prop="rank" label="排名"/>
                 <el-table-column prop="username" label="选手"/>
+                <el-table-column prop="stock_date" label="持股日期"/>
                 <el-table-column prop="init_fund" label="初始资产"/>
                 <el-table-column prop="yesterday_fund" label="昨日资产"/>
                 <el-table-column prop="today_fund" label="今日资产"/>
                 <el-table-column prop="today_income" label="今日盈亏"/>
-                <el-table-column prop="date" label="总盈亏"/>
+                <el-table-column prop="total_income" label="总盈亏"/>
                 <el-table-column prop="date" label="金日持股" width="150">
                     <template slot-scope="scope">
                         <p v-for="(item,index) in scope.row.today_stock" :key='index'>
@@ -101,11 +100,16 @@
         />
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="比赛名称" prop="match_id">
+                <el-form-item label="赛事名称" prop="match_id">
                         <el-select v-model="form.match_id" placeholder="请选择比赛">
                             <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                 </el-form-item>
+                <el-form-item label="参赛选手" prop="player_id">
+                    <el-select v-model="form.player_id" placeholder="请选择用户代码">
+                            <el-option v-for="item in playerList" :key='item.id' :label="item.username" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="持仓日期" prop="stock_date">
                         <el-date-picker
                         v-model="form.stock_date"
@@ -116,18 +120,13 @@
                         </el-date-picker>
                 </el-form-item>
                 <el-form-item label="今日资产" prop="today_fund">
-                    <el-input clearable v-model="form.today_fund" placeholder="请输入代码"></el-input>
-                </el-form-item>
-                <el-form-item label="用户代码" prop="player_id">
-                    <el-select v-model="form.player_id" placeholder="请选择用户代码">
-                            <el-option v-for="item in matchList" :key='item.id' :label="item.usercode" :value="item.id"></el-option>
-                    </el-select>
-                    <!-- <el-input clearable v-model="form.player_id" placeholder="请输入代码"></el-input> -->
+                    <el-input clearable v-model="form.today_fund" placeholder="请输入今日资产"></el-input>
                 </el-form-item>
                 <el-form-item label="股票名称">
                     <div v-for="(item,index) in form.today_stock" :key='index' style="margin-bottom:5px;">
-                        <el-input style="width:28%" clearable v-model="item.name" placeholder="名称"></el-input>
-                        &nbsp;<el-input style="width:28%" clearable v-model="item.code" placeholder="代码"></el-input>
+                        <el-select filterable v-model="item.name" placeholder="请选择股票" style="width:58%;display:inline-block">
+                            <el-option v-for="item in stockList" :key='item.id' :label="item.label" :value="item.label"></el-option>
+                        </el-select>
                         &nbsp;<el-input style="width:29%" clearable v-model="item.fund" placeholder="资金"></el-input>
                         <i @click="form.today_stock.splice(index,1)" style="margin-top:5px;" class="el-icon-circle-close del"></i>
                     </div>
@@ -189,7 +188,8 @@ export default {
             },
             matchList:[],
             playerList:[],
-            groupList:[]
+            groupList:[],
+            stockList:[]
         }
     },
     methods:{
@@ -263,6 +263,9 @@ export default {
        this.$api.getGroupList().then(res=>{
            this.groupList=res.data.data
        })
+       this.$api.getStockList().then(res=>{
+           this.stockList=res.data.data
+       })
        
        
     }