20190429

src/main/java/com/izouma/awesomeadmin/dao/PlayerInfoMapper.xml

@@ -690,10 +690,11 @@
 
         </where>
         order by
+
+        IFNULL(ranking,999) ,
         <if test="record.scoreType != null and !&quot;&quot;.equals(record.scoreType)">
             IFNULL(score,0) desc,
         </if>
-        IFNULL(ranking,999) ,
         IFNULL(live_time,999) ,
         id desc
     </select>
@@ -1162,10 +1163,6 @@
             AND player_info.del_flag = 'N'
 
             AND (
-            <if test="scoreType != null and !&quot;&quot;.equals(scoreType)">
-                (IFNULL(player_info.score, 0) > IFNULL(user_rank.score, 0))
-                OR ( (IFNULL(player_info.score, 0) = IFNULL(user_rank.score, 0)) AND
-            </if>
             <![CDATA[
                ( IFNULL(player_info.ranking, 999) < IFNULL(user_rank.ranking, 999)
                 OR (
@@ -1174,9 +1171,6 @@
                 ))
 
             ]]>
-            <if test="scoreType != null and !&quot;&quot;.equals(scoreType)">
-                )
-            </if>
             )
             AND user_rank.house_id = player_info.house_id
             AND user_rank.game_id = player_info.game_id
@@ -1392,12 +1386,15 @@
         AND status_flag IN (3, 7 , 8, 9)
         AND house_id = #{houseId}
 
+        <if test="ranking != null and !&quot;&quot;.equals(ranking)">
+            AND ranking = 1
+        </if>
+
         order by
+        IFNULL(ranking,999) ,
         <if test="scoreType != null and !&quot;&quot;.equals(scoreType)">
             IFNULL(score,0) desc,
         </if>
-
-        IFNULL(ranking,999) ,
         IFNULL(live_time,999) ,
         id desc
 

src/main/java/com/izouma/awesomeadmin/model/HouseLevel.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class HouseLevel{
+public class HouseLevel {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -28,178 +29,204 @@ public class HouseLevel{
     private BigDecimal feeRatio;
     private BigDecimal poolRatio;
 
-private String idStr;
+    private BigDecimal avgRatio;
+
+    private String idStr;
 
-private String searchKey;
+    private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getLevelName(){
+
+    public String getLevelName() {
         return this.levelName;
     }
 
-    public void setLevelName(String levelName){
+    public void setLevelName(String levelName) {
         this.levelName = levelName;
     }
-    public Integer getMaxNumber(){
+
+    public Integer getMaxNumber() {
         return this.maxNumber;
     }
 
-    public void setMaxNumber(Integer maxNumber){
+    public void setMaxNumber(Integer maxNumber) {
         this.maxNumber = maxNumber;
     }
-    public Integer getMinNumber(){
+
+    public Integer getMinNumber() {
         return this.minNumber;
     }
 
-    public void setMinNumber(Integer minNumber){
+    public void setMinNumber(Integer minNumber) {
         this.minNumber = minNumber;
     }
-    public String getIcon(){
+
+    public String getIcon() {
         return this.icon;
     }
 
-    public void setIcon(String icon){
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-    public Integer getRank(){
+
+    public Integer getRank() {
         return this.rank;
     }
 
-    public void setRank(Integer rank){
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
-    public BigDecimal getEntryCoin(){
+
+    public BigDecimal getEntryCoin() {
         return this.entryCoin;
     }
 
-    public void setEntryCoin(BigDecimal entryCoin){
+    public void setEntryCoin(BigDecimal entryCoin) {
         this.entryCoin = entryCoin;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public BigDecimal getFirstRatio(){
+
+    public BigDecimal getFirstRatio() {
         return this.firstRatio;
     }
 
-    public void setFirstRatio(BigDecimal firstRatio){
+    public void setFirstRatio(BigDecimal firstRatio) {
         this.firstRatio = firstRatio;
     }
-    public BigDecimal getSecondRatio(){
+
+    public BigDecimal getSecondRatio() {
         return this.secondRatio;
     }
 
-    public void setSecondRatio(BigDecimal secondRatio){
+    public void setSecondRatio(BigDecimal secondRatio) {
         this.secondRatio = secondRatio;
     }
-    public BigDecimal getThirdRatio(){
+
+    public BigDecimal getThirdRatio() {
         return this.thirdRatio;
     }
 
-    public void setThirdRatio(BigDecimal thirdRatio){
+    public void setThirdRatio(BigDecimal thirdRatio) {
         this.thirdRatio = thirdRatio;
     }
-    public BigDecimal getFeeRatio(){
+
+    public BigDecimal getFeeRatio() {
         return this.feeRatio;
     }
 
-    public void setFeeRatio(BigDecimal feeRatio){
+    public void setFeeRatio(BigDecimal feeRatio) {
         this.feeRatio = feeRatio;
     }
-    public BigDecimal getPoolRatio(){
+
+    public BigDecimal getPoolRatio() {
         return this.poolRatio;
     }
 
-    public void setPoolRatio(BigDecimal poolRatio){
+    public void setPoolRatio(BigDecimal poolRatio) {
         this.poolRatio = poolRatio;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
+
+    public BigDecimal getAvgRatio() {
+        return avgRatio;
+    }
 
+    public void setAvgRatio(BigDecimal avgRatio) {
+        this.avgRatio = avgRatio;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -213,6 +213,9 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                     BigDecimal secondRatio = houseLevel.getSecondRatio();
                     BigDecimal thirdRatio = houseLevel.getThirdRatio();
                     BigDecimal poolRatio = houseLevel.getPoolRatio();
+                    BigDecimal avgRatio = houseLevel.getAvgRatio();
+
+                    int winNum = 0;//吃鸡人数
 
 
                     PlayerInfo param = new PlayerInfo();
@@ -224,6 +227,13 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                     List<PlayerInfo> playerInfoList = playerInfoService.getSettlementPlayer(param);
 
                     if (CollectionUtils.isNotEmpty(playerInfoList)) {
+
+                        if (houseInfo.getScoreType() > 0) {//如果是平分模式，获取吃鸡人数。
+                            param.setRanking(1);
+                            List<PlayerInfo> winList = playerInfoService.getSettlementPlayer(param);
+                            winNum = winList.size();
+                        }
+
                         for (int i = 0; i < playerInfoList.size(); i++) {
                             PlayerInfo playerInfo = playerInfoList.get(i);
                             playerInfo.setHouseRank(i + 1);
@@ -269,27 +279,21 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                                         typeFlag = AppConstant.NoticeType.RESULT;
                                     }
                                 } else {
-                                    if (playerInfo.getScore() != null && playerInfo.getScore() > 0) {//只有评分大于0才能获得奖励
+                                    if (playerInfo.getRanking() != null && 1 == playerInfo.getRanking()) {//只有评分大于0才能获得奖励
 
-                                        if (i == 0) {//第一名
-                                            bonus = BigDecimal.valueOf((firstRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
+                                        if (winNum > 0) {//吃鸡人数大于0
+                                            bonus = BigDecimal.valueOf(((avgRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue()) / winNum);
 
 
                                         }
-                                        if (i == 1) {//第二名
-                                            bonus = BigDecimal.valueOf((secondRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
-                                        }
-                                        if (i == 2) {//第三名
-                                            bonus = BigDecimal.valueOf((thirdRatio.doubleValue() / 100) * houseInfo.getBonus().doubleValue());
-                                        }
 
                                         content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "（评分模式）获得了第" + playerInfo.getHouseRank()
+                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "（平分模式）获得了第" + playerInfo.getHouseRank()
                                                 + "名，获得" + bonus + "积分，赶快领取你的奖励吧。";
                                     } else {
                                         content = "很遗憾，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "（吃鸡模式）获得了第" + playerInfo.getHouseRank()
-                                                + "名，但没有评分,因此无法获得奖励。";
+                                                + "开始的游戏竞赛 " + houseInfo.getHouseName() + "（平分模式）获得了第" + playerInfo.getHouseRank()
+                                                + "名，但未吃鸡,因此无法获得奖励。";
                                         typeFlag = AppConstant.NoticeType.RESULT;
                                     }
                                 }

src/main/vue/src/pages/HouseLevel.vue

@@ -1,44 +1,49 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="levelName" label="名称">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="levelName" label="名称">
                 <el-input v-model="formData.levelName" :disabled="'levelName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="maxNumber" label="最大人数">
+            <el-form-item prop="maxNumber" label="最大人数">
                 <el-input type="number" v-model="formData.maxNumber" :disabled="'maxNumber'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="minNumber" label="最小人数">
+            <el-form-item prop="minNumber" label="最小人数">
                 <el-input type="number" v-model="formData.minNumber" :disabled="'minNumber'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                 <el-form-item prop="icon" label="图标">
-                 <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="rank" label="排序">
+            <el-form-item prop="icon" label="图标">
+                <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="rank" label="排序">
                 <el-input type="number" v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="entryCoin" label="加入要求">
+            <el-form-item prop="entryCoin" label="加入要求">
                 <el-input type="number" v-model="formData.entryCoin" :disabled="'entryCoin'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="remark" label="备注">
+            <el-form-item prop="remark" label="备注">
                 <el-input type="textarea" v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="firstRatio" label="第一名比率">
+            <el-form-item prop="firstRatio" label="第一名比率">
                 <el-input type="number" v-model="formData.firstRatio" :disabled="'firstRatio'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="secondRatio" label="第二名比率">
+            <el-form-item prop="secondRatio" label="第二名比率">
                 <el-input type="number" v-model="formData.secondRatio" :disabled="'secondRatio'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="thirdRatio" label="第三名比率">
+            <el-form-item prop="thirdRatio" label="第三名比率">
                 <el-input type="number" v-model="formData.thirdRatio" :disabled="'thirdRatio'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="feeRatio" label="手续费比率">
+
+            <el-form-item prop="avgRatio" label="平分比率">
+                <el-input type="number" v-model="formData.avgRatio"></el-input>
+            </el-form-item>
+
+            <el-form-item prop="feeRatio" label="手续费比率">
                 <el-input type="number" v-model="formData.feeRatio" :disabled="'feeRatio'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="poolRatio" label="奖金池比率">
+            <el-form-item prop="poolRatio" label="奖金池比率">
                 <el-input type="number" v-model="formData.poolRatio" :disabled="'poolRatio'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                <el-form-item>
+
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -47,104 +52,104 @@
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/houseLevel/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/houseLevel/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                        this.formData = res.data;
+
+                    this.formData = res.data;
 
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
+        }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                        levelName:
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                levelName:
                     [
-                                                {required: true, message: '请输入 名称', trigger: 'blur'},
-                                                                    ],
-                                                                maxNumber:
+                        { required: true, message: '请输入 名称', trigger: 'blur' },
+                    ],
+                maxNumber:
                     [
-                                                {required: true, message: '请输入 最大人数', trigger: 'blur'},
-                                                                    ],
-                                                                minNumber:
+                        { required: true, message: '请输入 最大人数', trigger: 'blur' },
+                    ],
+                minNumber:
                     [
-                                                {required: true, message: '请输入 最小人数', trigger: 'blur'},
-                                                                    ],
-                                                                                                                                                                                                                                                                                                },
-                                                                                                                                                            subColumn: '',
+                        { required: true, message: '请输入 最小人数', trigger: 'blur' },
+                    ],
+            },
+            subColumn: '',
             subValue: '',
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/houseLevel/update' : '/houseLevel/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/houseLevel/update' : '/houseLevel/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/houseLevel/del',
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
     }
+}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/HouseLevels.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/houseLevel',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/houseLevel',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,125 +24,60 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('id')" prop="id" label="ID" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('levelName')" prop="levelName" label="名称" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('maxNumber')" prop="maxNumber" label="最大人数" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('minNumber')" prop="minNumber" label="最小人数" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('icon')" prop="icon" label="图标" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('entryCoin')" prop="entryCoin" label="加入要求" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('firstRatio')" prop="firstRatio" label="第一名比率" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('secondRatio')" prop="secondRatio" label="第二名比率" min-width="100">
             </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label="ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                                                                                                                                                            
-                                            <el-table-column
-                                v-if="isColumnShow('levelName')"
-                                prop="levelName"
-                                label="名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('maxNumber')"
-                                prop="maxNumber"
-                                label="最大人数"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('minNumber')"
-                                prop="minNumber"
-                                label="最小人数"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('icon')"
-                                prop="icon"
-                                label="图标"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('rank')"
-                                prop="rank"
-                                label="排序"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('entryCoin')"
-                                prop="entryCoin"
-                                label="加入要求"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('firstRatio')"
-                                prop="firstRatio"
-                                label="第一名比率"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('secondRatio')"
-                                prop="secondRatio"
-                                label="第二名比率"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('thirdRatio')"
-                                prop="thirdRatio"
-                                label="第三名比率"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('feeRatio')"
-                                prop="feeRatio"
-                                label="手续费比率"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('poolRatio')"
-                                prop="poolRatio"
-                                label="奖金池比率"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('thirdRatio')" prop="thirdRatio" label="第三名比率" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('avgRatio')" prop="avgRatio" label="平分比率" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('feeRatio')" prop="feeRatio" label="手续费比率" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('poolRatio')" prop="poolRatio" label="奖金池比率" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -159,15 +91,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -188,16 +112,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -227,8 +149,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -262,342 +183,346 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: 'ID',
+                    value: 'id',
+                    show: true
+                },
+                {
+                    label: '名称',
+                    value: 'levelName',
+                    show: true
+                },
+                {
+                    label: '最大人数',
+                    value: 'maxNumber',
+                    show: true
+                },
+                {
+                    label: '最小人数',
+                    value: 'minNumber',
+                    show: true
+                },
+                {
+                    label: '图标',
+                    value: 'icon',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+                {
+                    label: '加入要求',
+                    value: 'entryCoin',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '第一名比率',
+                    value: 'firstRatio',
+                    show: true
+                },
+                {
+                    label: '第二名比率',
+                    value: 'secondRatio',
+                    show: true
+                },
+                {
+                    label: '第三名比率',
+                    value: 'thirdRatio',
+                    show: true
+                },
+                {
+                    label: '平分比率',
+                    value: 'avgRatio',
+                    show: true
+                },
+                {
+                    label: '手续费比率',
+                    value: 'feeRatio',
+                    show: true
+                },
+                {
+                    label: '奖金池比率',
+                    value: 'poolRatio',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'level_name'
+                },
+                {
+                    label: '最大人数',
+                    value: 'max_number'
+                },
+                {
+                    label: '最小人数',
+                    value: 'min_number'
+                },
+                {
+                    label: '图标',
+                    value: 'icon'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+                {
+                    label: '加入要求',
+                    value: 'entry_coin'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '第一名比率',
+                    value: 'first_ratio'
+                },
+                {
+                    label: '第二名比率',
+                    value: 'second_ratio'
+                },
+                {
+                    label: '第三名比率',
+                    value: 'third_ratio'
+                },
+                {
+                    label: '手续费比率',
+                    value: 'fee_ratio'
+                },
+                {
+                    label: '奖金池比率',
+                    value: 'pool_ratio'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '名称',
-                                value: 'levelName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '最大人数',
-                                value: 'maxNumber',
-                                show: true
-                            },
-                                                                                                {
-                                label: '最小人数',
-                                value: 'minNumber',
-                                show: true
-                            },
-                                                                                                {
-                                label: '图标',
-                                value: 'icon',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                                                                {
-                                label: '加入要求',
-                                value: 'entryCoin',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '第一名比率',
-                                value: 'firstRatio',
-                                show: true
-                            },
-                                                                                                {
-                                label: '第二名比率',
-                                value: 'secondRatio',
-                                show: true
-                            },
-                                                                                                {
-                                label: '第三名比率',
-                                value: 'thirdRatio',
-                                show: true
-                            },
-                                                                                                {
-                                label: '手续费比率',
-                                value: 'feeRatio',
-                                show: true
-                            },
-                                                                                                {
-                                label: '奖金池比率',
-                                value: 'poolRatio',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '名称',
-                                value: 'level_name'
-                            },
-                                                                                                {
-                                label: '最大人数',
-                                value: 'max_number'
-                            },
-                                                                                                {
-                                label: '最小人数',
-                                value: 'min_number'
-                            },
-                                                                                                {
-                                label: '图标',
-                                value: 'icon'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                                                                {
-                                label: '加入要求',
-                                value: 'entry_coin'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '第一名比率',
-                                value: 'first_ratio'
-                            },
-                                                                                                {
-                                label: '第二名比率',
-                                value: 'second_ratio'
-                            },
-                                                                                                {
-                                label: '第三名比率',
-                                value: 'third_ratio'
-                            },
-                                                                                                {
-                                label: '手续费比率',
-                                value: 'fee_ratio'
-                            },
-                                                                                                {
-                                label: '奖金池比率',
-                                value: 'pool_ratio'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/houseLevel/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/houseLevel/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/houseLevel',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/houseLevel',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/houseLevel/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/houseLevel/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/houseLevel/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/houseLevel/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>