浏览代码

nealy done

xjc 4 年之前
父节点
当前提交
ca6f292738
共有 8 个文件被更改,包括 129 次插入72 次删除
  1. 16 0
      src/api.js
  2. 3 3
      src/style/home.scss
  3. 2 2
      src/views/Login.vue
  4. 33 22
      src/views/data/index.vue
  5. 9 9
      src/views/match/group.vue
  6. 34 24
      src/views/match/index.vue
  7. 31 8
      src/views/player/index.vue
  8. 1 4
      src/views/user/index.vue

+ 16 - 0
src/api.js

@@ -167,5 +167,21 @@ export default {
 	getGroups: params => {
 		return axios.get(`${baseURL}/api/admin/match/group/list`, { params: params })
 	},
+	// 新增赛事
+	addMatch: params => {
+		return axios.post(`${baseURL}/api/admin/match`, params);
+	},
+	// 修改赛事
+	updateMatch: params => {
+		return axios.put(`${baseURL}/api/admin/match`, params);
+	},
+	// 新增分组
+	addGroup: params => {
+		return axios.post(`${baseURL}/api/admin/match/group`, params);
+	},
+	// 修改分组
+	updateGroup: params => {
+		return axios.put(`${baseURL}/api/admin/match/group`, params);
+	},
 
 }

+ 3 - 3
src/style/home.scss

@@ -234,7 +234,7 @@ tbody{
 	}
 }
 
-.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before{
-	content: '';
-}
+// .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before{
+// 	content: '';
+// }
 

+ 2 - 2
src/views/Login.vue

@@ -118,8 +118,8 @@ export default {
       tp:'xt',
       code:'',
       logindata:{
-        username:'',
-        password:'',
+        username:'root',
+        password:'123456',
         imgcode_id:'',
         imgcode:'',
         utype:2

+ 33 - 22
src/views/data/index.vue

@@ -15,6 +15,13 @@
         <el-divider></el-divider>
         <el-form label-width="80px" class="filter-form">
             <el-row>
+                <el-col :span="4">
+                    <el-form-item label="比赛名称" prop="match_id">
+                        <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="4">
                     <el-form-item label="选手名字">
                         <el-input v-model="queryParams.username" placeholder="请输入选手名字/代码" size="mini"></el-input>
@@ -33,13 +40,6 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="4">
-                    <el-form-item label="比赛名称" prop="match_id">
-                        <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="4">
                     <el-form-item label="比赛分组">
                         <el-select v-model="queryParams.groupId" placeholder="请选择比赛分组" size="mini">
@@ -61,7 +61,7 @@
                 </el-col>
             </el-row>
         </el-form>
-        <el-table :data="list" height='39vh' style="width: 100%;margin-top:10px;">
+        <el-table :data="list" height='39vh' style="width: 100%;margin-top:10px;" v-loading='loading'>
                 <el-table-column prop="rank" label="排名"/>
                 <el-table-column prop="username" label="选手"/>
                 <el-table-column prop="stock_date" label="持股日期"/>
@@ -70,23 +70,24 @@
                 <el-table-column prop="today_fund" label="今日资产"/>
                 <el-table-column prop="today_income" label="今日盈亏"/>
                 <el-table-column prop="total_income" label="总盈亏"/>
-                <el-table-column prop="date" label="日持股" width="150">
+                <el-table-column prop="date" label="日持股" width="150">
                     <template slot-scope="scope">
                         <p v-for="(item,index) in scope.row.today_stock" :key='index'>
-                            {{item.name}}({{item.code}})
+                            {{item.name}}
                         </p>
                     </template>
                 </el-table-column>
                 <el-table-column prop="date" label="昨日持股" width="150">
                     <template slot-scope="scope">
                         <p v-for="(item,index) in scope.row.yesterday_stock" :key='index'>
-                            {{item.name}}({{item.code}})
+                            {{item.name}}
                         </p>
                     </template>
                 </el-table-column>
+                <el-table-column prop="ctime" label="创建时间"/>
                 <el-table-column prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑数据',open=true,form=scope.row" size="mini" type="primary">编辑</el-button>
+                        <el-button @click="title='编辑数据',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -119,19 +120,23 @@
                         </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-input clearable v-model="form.today_fund" placeholder="请输入今日资产">
+                        <template slot="append">万元</template>
+                    </el-input>
                 </el-form-item>
-                <el-form-item label="股票名称">
+                <el-form-item label="股票名称" prop="today_stock">
                     <div v-for="(item,index) in form.today_stock" :key='index' style="margin-bottom:5px;">
-                        <el-select filterable v-model="item.name" placeholder="请选择股票" style="width:58%;display:inline-block">
+                        <el-select filterable v-model="item.name" placeholder="请选择股票" style="width:48%;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>
+                        &nbsp;<el-input style="width:39%" clearable v-model="item.fund" placeholder="资金">
+                            <template slot="append">万元</template>
+                        </el-input>
                         <i @click="form.today_stock.splice(index,1)" style="margin-top:5px;" class="el-icon-circle-close del"></i>
                     </div>
-                    <el-button @click="addCode" type="danger" size="small" plain>新增代码</el-button>
+                    <el-button @click="addCode" type="primary" size="small" plain>新增股票</el-button>
                 </el-form-item>
-                <el-form-item label="股票名称">
+                <el-form-item label="股票截图" prop="today_stock_img">
                     <div class="imgs" v-for="(item,index) in form.today_stock_img" :key='index'>
                         <img  width="150" :src="item" alt="">
                         <i @click="form.today_stock_img.splice(index,1)" class="el-icon-circle-close del"></i>
@@ -141,7 +146,7 @@
                         :show-file-list	='false'
                         :on-success="handleSuccess"
                         action="/api/admin/uploadfile">
-                        <el-button size="small" type="danger" plain>上传图片</el-button>
+                        <el-button size="small" type="primary" plain>上传股票截图</el-button>
                     </el-upload>
                 </el-form-item>
             </el-form>
@@ -162,6 +167,7 @@ export default {
         return{
             loading:false,
             queryParams:{
+                match_id:0,
                 page:1
             },
             form:{
@@ -184,6 +190,12 @@ export default {
                 today_fund: [
                     { required: true, message: '请输入今日资产', trigger: 'blur' }
                 ],
+                today_stock: [
+                    { required: true, message: '请输入今日资产', trigger: 'blur' }
+                ],
+                today_stock_img: [
+                    { required: true, message: '请输入股票截图', trigger: 'blur' }
+                ]
             },
             matchList:[],
             playerList:[],
@@ -252,9 +264,10 @@ export default {
     },
     },
     created(){
-       this.getData() 
        this.$api.getMatchList().then(res=>{
            this.matchList=res.data.data
+           this.queryParams.match_id = this.matchList[0].id
+           this.getData()
        })
        this.$api.getPlayerList().then(res=>{
            this.playerList=res.data.data
@@ -265,8 +278,6 @@ export default {
        this.$api.getStockList().then(res=>{
            this.stockList=res.data.data
        })
-       
-       
     }
 }
 </script>

+ 9 - 9
src/views/match/group.vue

@@ -31,7 +31,7 @@
                 <el-table-column align="center"  prop="out_count" label="退赛人数"/>
                 <el-table-column align="center"  prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="title='编辑分组',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -47,7 +47,7 @@
                 <el-form-item label="分组名称" prop="name">
                     <el-input clearable v-model="form.name" placeholder="请输入分组名称" size="mini"></el-input>
                 </el-form-item>
-                <el-form-item label="比赛名称">
+                <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>
@@ -78,11 +78,11 @@ export default {
             title:'新增分组',
             open:false,
             rules:{
-                username: [
-                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                name: [
+                    { required: true, message: '请输入分组名称', trigger: 'blur' }
                 ],
-                usercode: [
-                    { required: true, message: '请输入用户代码', trigger: 'blur' }
+                match_id: [
+                    { required: true, message: '请选择比赛', trigger: 'blur' }
                 ],
             },
             matchList:[],
@@ -118,7 +118,7 @@ export default {
         },
         handleAdd(){
             this.open=true;
-            this.title='新增用户';
+            this.title='新增分组';
             this.form={}
         },
         /** 提交按钮 */
@@ -126,13 +126,13 @@ export default {
             this.$refs["form"].validate(valid => {
                 if (valid) {
                 if (this.form.id != null) {
-                    this.$api.updatePlayer(this.form).then(response => {
+                    this.$api.updateGroup(this.form).then(response => {
                     this.msgSuccess("修改成功");
                     this.open = false;
                     this.getData();
                     });
                 } else {
-                    this.$api.addPlayer(this.form).then(response => {
+                    this.$api.addGroup(this.form).then(response => {
                     this.msgSuccess("新增成功");
                     this.open = false;
                     this.getData();

+ 34 - 24
src/views/match/index.vue

@@ -32,7 +32,7 @@
                 <el-table-column align="center"  prop="end_time" label="结束时间"/>
                 <el-table-column align="center"  prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="title='编辑赛事',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -45,23 +45,30 @@
         />
         <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="user_id">
-                    <el-select filterable v-model="form.user_id" placeholder="请选择用户代码">
-                        <el-option v-for="item in userList" :key='item.id' :label="item.label" :value="item.id"></el-option>
-                    </el-select>
+                <el-form-item label="比赛名称" prop="name">
+                    <el-input clearable v-model="form.name" placeholder="请输入比赛名称"></el-input>
                 </el-form-item>
-                <el-form-item label="比赛资金" prop="fund">
-                    <el-input clearable v-model="form.fund" placeholder="请输入比赛资金"></el-input>
+                <el-form-item label="开始时间" prop="start_time">
+                    <el-date-picker
+                    v-model="form.start_time"
+                    type="date"
+                    placeholder="选择日期"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    size="mini"
+                    >
+                    </el-date-picker>
                 </el-form-item>
-                <el-form-item label="比赛名称">
-                    <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="比赛分组">
-                    <el-select v-model="form.match_group" placeholder="请选择比赛分组">
-                        <el-option v-for="item in groupList" :key='item.id' :label="item.name" :value="item.id"></el-option>
-                    </el-select>
+                <el-form-item label="结束时间" prop="end_time">
+                    <el-date-picker
+                    v-model="form.end_time"
+                    type="date"
+                    placeholder="选择日期"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    size="mini"
+                    >
+                    </el-date-picker>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -86,15 +93,18 @@ export default {
             form:{},
             list:[{},{}],
             total:0,
-            title:'新增选手',
+            title:'新增赛事',
             open:false,
             rules:{
-                username: [
-                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                name: [
+                    { required: true, message: '请输入比赛名称', trigger: 'blur' }
                 ],
-                usercode: [
-                    { required: true, message: '请输入用户代码', trigger: 'blur' }
+                start_time: [
+                    { required: true, message: '请输入开始时间', trigger: 'blur' }
                 ],
+                end_time: [
+                    { required: true, message: '请输入结束时间', trigger: 'blur' }
+                ]
             },
             matchList:[],
             groupList:[],
@@ -129,7 +139,7 @@ export default {
         },
         handleAdd(){
             this.open=true;
-            this.title='新增用户';
+            this.title='新增赛事';
             this.form={}
         },
         /** 提交按钮 */
@@ -137,13 +147,13 @@ export default {
             this.$refs["form"].validate(valid => {
                 if (valid) {
                 if (this.form.id != null) {
-                    this.$api.updatePlayer(this.form).then(response => {
+                    this.$api.updateMatch(this.form).then(response => {
                     this.msgSuccess("修改成功");
                     this.open = false;
                     this.getData();
                     });
                 } else {
-                    this.$api.addPlayer(this.form).then(response => {
+                    this.$api.addMatch(this.form).then(response => {
                     this.msgSuccess("新增成功");
                     this.open = false;
                     this.getData();

+ 31 - 8
src/views/player/index.vue

@@ -53,7 +53,7 @@
                 </el-table-column>
                 <el-table-column align="center"  prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="title='编辑选手',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -72,18 +72,27 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="比赛资金" prop="fund">
-                    <el-input clearable v-model="form.fund" placeholder="请输入比赛资金"></el-input>
+                    <el-input clearable v-model="form.fund" placeholder="请输入比赛资金">
+                        <template slot="append">万元</template>
+                    </el-input>
                 </el-form-item>
-                <el-form-item label="比赛名称">
+                <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="比赛分组">
+                <el-form-item label="比赛分组" prop="match_group">
                     <el-select v-model="form.match_group" placeholder="请选择比赛分组">
                         <el-option v-for="item in groupList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="参数状态" prop="match_status">
+                    <el-select v-model="form.match_status" placeholder="请选择参数状态">
+                        <el-option key='1' label="参赛中" :value="1"></el-option>
+                        <el-option key='0' label="暂停" :value="0"></el-option>
+                        <el-option key='-1' label="已退赛" :value="-1"></el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -104,18 +113,32 @@ export default {
             queryParams:{
                 page:1
             },
-            form:{},
+            form:{
+                match_status:1
+            },
             list:[{},{}],
             total:0,
             title:'新增选手',
             open:false,
             rules:{
-                username: [
-                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                user_id: [
+                    { required: true, message: '请选择选手', trigger: 'change' }
+                ],
+                fund: [
+                    { required: true, message: '请输入比赛资金', trigger: 'blur' }
+                ],
+                match_id: [
+                    { required: true, message: '请选择比赛', trigger: 'change' }
                 ],
                 usercode: [
                     { required: true, message: '请输入用户代码', trigger: 'blur' }
                 ],
+                match_group: [
+                    { required: true, message: '请选择分组', trigger: 'change' }
+                ],
+                match_status: [
+                    { required: true, message: '请选择参数状态', trigger: 'change' }
+                ],
             },
             matchList:[],
             groupList:[],
@@ -150,7 +173,7 @@ export default {
         },
         handleAdd(){
             this.open=true;
-            this.title='新增用户';
+            this.title='新增选手';
             this.form={}
         },
         /** 提交按钮 */

+ 1 - 4
src/views/user/index.vue

@@ -35,7 +35,7 @@
                 <el-table-column align="center"  prop="date" label="资产"/>
                 <el-table-column align="center"  prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="primary">编辑</el-button>
+                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -89,9 +89,6 @@ export default {
                 username: [
                     { required: true, message: '请输入用户名', trigger: 'blur' }
                 ],
-                usercode: [
-                    { required: true, message: '请输入用户代码', trigger: 'blur' }
-                ],
             }
         }
     },