20190227

src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -418,4 +418,29 @@ public interface AppConstant {
         Integer RECEIVE = 2;
 
     }
+
+    /**
+     * 赛季状态
+     */
+    public interface SeasonStatus {
+        /**
+         * 准备中
+         */
+        Integer READY = 0;
+
+        /**
+         * 进行中
+         */
+        Integer START = 1;
+
+        /**
+         * 结算中
+         */
+        Integer SETTLEMENT = 2;
+        /**
+         * 结束
+         */
+        Integer END = 3;
+
+    }
 }

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

@@ -271,6 +271,9 @@
             <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
                 and status_flag = #{record.statusFlag}
             </if>
+            <if test="record.gameId != null and !&quot;&quot;.equals(record.gameId)">
+                and game_id = #{record.gameId}
+            </if>
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR season LIKE concat('%',#{record.searchKey},'%')
@@ -388,6 +391,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="gameId != null and !&quot;&quot;.equals(gameId)">
+                and game_id = #{gameId}
+            </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR season LIKE concat('%',#{searchKey},'%')
@@ -502,6 +508,11 @@
                 and status_flag = #{statusFlag}
             </if>
 
+            <if test="gameId != null and !&quot;&quot;.equals(gameId)">
+                and game_id = #{gameId}
+            </if>
+
+
         </where>
         LIMIT 1
     </select>

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

@@ -446,6 +446,9 @@
             <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
                 and status_flag = #{record.statusFlag}
             </if>
+            <if test="record.statusStr != null and !&quot;&quot;.equals(record.statusStr)">
+                and status_flag in (${record.statusFlag})
+            </if>
             <if test="record.recommendFlag != null and !&quot;&quot;.equals(record.recommendFlag)">
                 and recommend_flag = #{record.recommendFlag}
             </if>
@@ -614,6 +617,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="statusStr != null and !&quot;&quot;.equals(statusStr)">
+                and status_flag in (${statusFlag})
+            </if>
             <if test="recommendFlag != null and !&quot;&quot;.equals(recommendFlag)">
                 and recommend_flag = #{recommendFlag}
             </if>
@@ -650,6 +656,7 @@
             <if test="video != null and !&quot;&quot;.equals(video)">
                 and video = #{video}
             </if>
+
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR house_name LIKE concat('%',#{searchKey},'%')
@@ -778,6 +785,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="statusStr != null and !&quot;&quot;.equals(statusStr)">
+                and status_flag in (${statusFlag})
+            </if>
             <if test="recommendFlag != null and !&quot;&quot;.equals(recommendFlag)">
                 and recommend_flag = #{recommendFlag}
             </if>

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

@@ -362,6 +362,11 @@
             id in (${idStr})
         </if>
 
+        <if test="userId != null and !&quot;&quot;.equals(userId)">
+            user_id = #{userId,jdbcType=INTEGER}
+            and house_id = #{houseId}
+        </if>
+
     </update>
     <select id="queryPlayerInfoByPage" parameterType="java.util.Map"
             resultType="com.izouma.awesomeadmin.model.PlayerInfo">

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

@@ -40,6 +40,8 @@ public class HouseInfo {
 
     private String idStr;
 
+    private String statusStr;
+
     private String searchKey;
 
     private Integer maxNumber;
@@ -329,5 +331,13 @@ public class HouseInfo {
     public void setMaxNumber(Integer maxNumber) {
         this.maxNumber = maxNumber;
     }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/HouseInfoService.java

@@ -33,6 +33,8 @@ public interface HouseInfoService {
 
     Result autoBegin(HouseInfo record);
 
+    Result handBegin(HouseInfo record);
+
     Result autoEnd(HouseInfo record);
 
     Result handEnd(HouseInfo record);

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

@@ -3,6 +3,7 @@ package com.izouma.awesomeadmin.service.impl;
 import java.math.BigDecimal;
 import java.util.*;
 
+import com.izouma.awesomeadmin.dao.CompetitionSeasonMapper;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.*;
 import com.izouma.awesomeadmin.service.*;
@@ -27,6 +28,9 @@ public class HouseInfoServiceImpl implements HouseInfoService {
     @Autowired
     private HouseInfoMapper houseInfoMapper;
 
+    @Autowired
+    private CompetitionSeasonMapper competitionSeasonMapper;
+
     @Autowired
     private UserInfoService userInfoService;
 
@@ -120,6 +124,14 @@ public class HouseInfoServiceImpl implements HouseInfoService {
         try {
             record.setHouseCode(MbappUtil.getCodeByUUId());
 
+            CompetitionSeason competitionSeason = new CompetitionSeason();
+            competitionSeason.setGameId(record.getGameId());
+            competitionSeason.setStatusFlag(AppConstant.SeasonStatus.START);
+            competitionSeason = competitionSeasonMapper.queryCompetitionSeason(competitionSeason);
+            if (competitionSeason != null) {
+                record.setSeasonId(competitionSeason.getId());
+            }
+
             int updates = houseInfoMapper.insertSelective(record);
 
             if (updates > 0) {
@@ -407,6 +419,32 @@ public class HouseInfoServiceImpl implements HouseInfoService {
         return new Result(false, "开始失败");
     }
 
+    @Override
+    public Result handBegin(HouseInfo record) {
+
+        logger.info("handBegin");
+        try {
+
+            HouseInfo houseInfo = houseInfoMapper.queryHouseInfo(record);
+            if (houseInfo != null) {
+                if (AppConstant.HouseStatus.START > houseInfo.getStatusFlag()) {//房间为未开始状态
+
+
+                    houseInfo.setStatusFlag(AppConstant.HouseStatus.START);
+                    houseInfo.setBeginTime(new Date());
+                    houseInfoMapper.updateByPrimaryKeySelective(houseInfo);
+
+                    return new Result(true, "开始成功");
+                }
+            }
+
+        } catch (Exception e) {
+            logger.error("handBegin", e);
+        }
+
+        return new Result(false, "开始失败");
+    }
+
     @Override
     public Result autoEnd(HouseInfo record) {
 

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

@@ -4,6 +4,7 @@ import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dao.*;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.AlipayTemp;
+import com.izouma.awesomeadmin.model.MemberCoin;
 import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.OSSFileService;
 import com.izouma.awesomeadmin.service.UserInfoService;
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import javax.crypto.SecretKey;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
@@ -55,6 +57,9 @@ public class UserInfoServiceImpl implements UserInfoService {
     @Autowired
     private AlipayTempMapper alipayTempMapper;
 
+    @Autowired
+    private MemberCoinMapper memberCoinMapper;
+
     @Override
     public List<UserInfo> getUserInfoList(UserInfo record) {
 
@@ -139,6 +144,10 @@ public class UserInfoServiceImpl implements UserInfoService {
             }
             int updates = userInfoMapper.insertSelective(record);
 
+            if (updates > 0) {
+                songMoney(record);//赠送余额
+            }
+
             if (updateUserRolesAndDeparts(record, updates)) return true;
         } catch (Exception e) {
             logger.error("createUserInfo", e);
@@ -147,6 +156,45 @@ public class UserInfoServiceImpl implements UserInfoService {
         return false;
     }
 
+    /**
+     * 用户注册赠送余额
+     *
+     * @param record
+     */
+    private void songMoney(UserInfo record) {
+
+        try {
+            MemberCoin memberCoin = new MemberCoin();
+            memberCoin.setMoney(BigDecimal.valueOf(1000));
+            memberCoin.setUserId(record.getId());
+            double money = memberCoin.getMoney().doubleValue();
+
+
+            int userId = Integer.valueOf(memberCoin.getUserId());
+            UserInfo userInfo = userInfoMapper.selectByPrimaryKey(record.getId());
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+
+
+            double balance = userInfo.getMoneyCoin();
+            double moneyCoin = balance + money;
+
+            memberCoin.setCreateUser("管理员");
+            memberCoin.setBalance(BigDecimal.valueOf(moneyCoin));
+            memberCoin.setTypeFlag(AppConstant.CoinType.SONG);
+            memberCoin.setRemark("新用户注册，后台赠送：" + money + "余额");
+            memberCoinMapper.insertSelective(memberCoin);
+
+            updateUser.setMoneyCoin(moneyCoin);
+            this.updateUserInfo(updateUser);
+        } catch (Exception e) {
+            logger.error("新用户注册赠送余额异常", e);
+        }
+
+
+    }
+
     private boolean updateUserRolesAndDeparts(UserInfo record, int updates) {
         if (updates > 0) {
             if (record.getDepartId() != null) {

src/main/java/com/izouma/awesomeadmin/web/HouseInfoController.java

@@ -231,6 +231,17 @@ public class HouseInfoController {
         return houseInfoService.autoEnd(null);
     }
 
+    /**
+     * 手动开始比赛
+     *
+     * @return
+     */
+    @RequestMapping(value = "/handBegin", method = RequestMethod.POST)
+    @ResponseBody
+    public Result handBegin(HouseInfo record) {
+        return houseInfoService.handBegin(record);
+    }
+
     /**
      * 手动结束
      *

src/main/vue/src/pages/CompetitionSeason.vue

@@ -54,6 +54,18 @@
                         </el-option>
                     </el-select>
                 </template>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="gameId" label="游戏">
+                <template>
+                    <el-select v-model="formData.gameId" clearable  placeholder="请选择" :disabled="'gameId'==subColumn">
+                        <el-option
+                                v-for="item in gameIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
                                                                                                                                                                                     <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -82,7 +94,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -96,13 +108,28 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
+
+                        this.$http.get({
+                        url:'/gameInfo/all'
+                        }).then(res => {
+                        if (res.success) {
+
+                        if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                        this.gameIdOptions.push({label: item.gameName, value:item.id});
+                        })
+                        }
+                        }
+                        });
+                                                        },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
                                                                                                                                 statusFlagOptions:[{
           value: 0,
           label: '准备'
@@ -116,6 +143,7 @@
           value:3,
           label: '结束'
         }],
+                                            gameIdOptions:[],
                                 subColumn: '',
             subValue: '',
         }

src/main/vue/src/pages/CompetitionSeasons.vue

@@ -108,6 +108,13 @@
                                 label="状态"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('gameId')"
+                                prop="gameId"
+                                label="游戏"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -294,6 +301,11 @@
                                 label: '状态',
                                 value: 'statusFlag',
                                 show: true
+                            },
+                                                                                                {
+                                label: '游戏',
+                                value: 'gameId',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -338,6 +350,10 @@
                                                                                                 {
                                 label: '状态',
                                 value: 'status_flag'
+                            },
+                                                                                                {
+                                label: '游戏',
+                                value: 'game_id'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/HouseInfo.vue

@@ -243,13 +243,13 @@ export default {
                 value: 2,
                 label: '开始'
             }, {
-                value: 4,
+                value: 3,
                 label: '结束'
             }, {
-                value: 5,
+                value: 4,
                 label: '结算'
             }, {
-                value: 6,
+                value: 5,
                 label: '关闭'
             }],
             seasonIdOptions: [],

src/main/vue/src/pages/HouseInfos.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:'/houseInfo',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/houseInfo',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,190 +24,87 @@
                 </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('houseName')" prop="houseName" label="名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('houseAbstract')" prop="houseAbstract" 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('houseCode')" prop="houseCode" label="CODE" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('houseType')" prop="houseType" label="类型" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('houseLevel')" prop="houseLevel" label="等级" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameId')" prop="gameId" label="游戏" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('recommendFlag')" prop="recommendFlag" label="推荐" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('useFlag')" prop="useFlag" label="可用" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameHouseId')" prop="gameHouseId" label="游戏房间号" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameHousePassword')" prop="gameHousePassword" label="游戏密码" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('beginTime')" prop="beginTime" label="开始时间" :formatter="DateTimeFormatter" 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('houseName')"
-                                prop="houseName"
-                                label="名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('houseAbstract')"
-                                prop="houseAbstract"
-                                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('houseCode')"
-                                prop="houseCode"
-                                label="CODE"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('userId')"
-                                prop="userId"
-                                label="用户"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('houseType')"
-                                prop="houseType"
-                                label="类型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('houseLevel')"
-                                prop="houseLevel"
-                                label="等级"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('gameId')"
-                                prop="gameId"
-                                label="游戏"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('statusFlag')"
-                                prop="statusFlag"
-                                label="状态"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('recommendFlag')"
-                                prop="recommendFlag"
-                                label="推荐"
-                                min-width="100">
-                        </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('useFlag')"
-                                prop="useFlag"
-                                label="可用"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('gameHouseId')"
-                                prop="gameHouseId"
-                                label="游戏房间号"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('gameHousePassword')"
-                                prop="gameHousePassword"
-                                label="游戏密码"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('beginTime')"
-                                prop="beginTime"
-                                label="开始时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('endTime')"
-                                prop="endTime"
-                                label="结束时间"
-                                :formatter="DateTimeFormatter"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('matchName')"
-                                prop="matchName"
-                                label="比赛名称"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('playerNumber')"
-                                prop="playerNumber"
-                                label="参数人数"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('bonus')"
-                                prop="bonus"
-                                label="奖金"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('seasonId')"
-                                prop="seasonId"
-                                label="赛季ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('video')"
-                                prop="video"
-                                label="视频"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('endTime')" prop="endTime" label="结束时间" :formatter="DateTimeFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('matchName')" prop="matchName" label="比赛名称" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('playerNumber')" prop="playerNumber" label="参数人数" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('bonus')" prop="bonus" label="奖金" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('seasonId')" prop="seasonId" label="赛季ID" min-width="100">
+            </el-table-column>
+
+            <!-- <el-table-column v-if="isColumnShow('video')" prop="video" 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 v-if="scope.row.statusFlag < 2" @click="handBegin(scope.row)" type="primary" size="mini" plain>开始</el-button>
+                    <el-button v-if="scope.row.statusFlag == 2" @click="handEnd(scope.row)" type="primary" size="mini" plain>结束</el-button>
+                    <el-button v-if="scope.row.statusFlag == 3" @click="handSettlementHouse(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>
@@ -224,15 +118,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">
@@ -253,16 +139,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>
@@ -292,8 +176,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>
@@ -327,423 +210,473 @@
     </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: 'houseName',
+                    show: true
+                },
+                {
+                    label: '描述',
+                    value: 'houseAbstract',
+                    show: true
+                },
+                // {
+                //     label: '头像',
+                //     value: 'icon',
+                //     show: true
+                // },
+                {
+                    label: 'CODE',
+                    value: 'houseCode',
+                    show: true
+                },
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true
+                },
+                {
+                    label: '类型',
+                    value: 'houseType',
+                    show: true
+                },
+                {
+                    label: '等级',
+                    value: 'houseLevel',
+                    show: true
+                },
+                {
+                    label: '游戏',
+                    value: 'gameId',
+                    show: true
+                },
+                {
+                    label: '状态',
+                    value: 'statusFlag',
+                    show: true
+                },
+                {
+                    label: '推荐',
+                    value: 'recommendFlag',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+                {
+                    label: '可用',
+                    value: 'useFlag',
+                    show: true
+                },
+                {
+                    label: '游戏房间号',
+                    value: 'gameHouseId',
+                    show: true
+                },
+                {
+                    label: '游戏密码',
+                    value: 'gameHousePassword',
+                    show: true
+                },
+                {
+                    label: '开始时间',
+                    value: 'beginTime',
+                    show: true
+                },
+                {
+                    label: '结束时间',
+                    value: 'endTime',
+                    show: true
+                },
+                {
+                    label: '比赛名称',
+                    value: 'matchName',
+                    show: true
+                },
+                {
+                    label: '参数人数',
+                    value: 'playerNumber',
+                    show: true
+                },
+                {
+                    label: '奖金',
+                    value: 'bonus',
+                    show: true
+                },
+                {
+                    label: '赛季ID',
+                    value: 'seasonId',
+                    show: true
+                },
+                // {
+                //     label: '视频',
+                //     value: 'video',
+                //     show: true
+                // },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: 'ID',
+                    value: 'id'
+                },
+                {
+                    label: '名称',
+                    value: 'house_name'
+                },
+                {
+                    label: '描述',
+                    value: 'house_abstract'
+                },
+                // {
+                //     label: '头像',
+                //     value: 'icon'
+                // },
+                {
+                    label: 'CODE',
+                    value: 'house_code'
+                },
+                {
+                    label: '用户',
+                    value: 'user_id'
+                },
+                {
+                    label: '类型',
+                    value: 'house_type'
+                },
+                {
+                    label: '等级',
+                    value: 'house_level'
+                },
+                {
+                    label: '游戏',
+                    value: 'game_id'
+                },
+                {
+                    label: '状态',
+                    value: 'status_flag'
+                },
+                {
+                    label: '推荐',
+                    value: 'recommend_flag'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+                {
+                    label: '可用',
+                    value: 'use_flag'
+                },
+                {
+                    label: '游戏房间号',
+                    value: 'game_house_id'
+                },
+                {
+                    label: '游戏密码',
+                    value: 'game_house_password'
+                },
+                {
+                    label: '开始时间',
+                    value: 'begin_time'
+                },
+                {
+                    label: '结束时间',
+                    value: 'end_time'
+                },
+                {
+                    label: '比赛名称',
+                    value: 'match_name'
+                },
+                {
+                    label: '参数人数',
+                    value: 'player_number'
+                },
+                {
+                    label: '奖金',
+                    value: 'bonus'
+                },
+                {
+                    label: '赛季ID',
+                    value: 'season_id'
+                },
+                // {
+                //     label: '视频',
+                //     value: 'video'
+                // },
+            ],
+            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: 'houseName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '描述',
-                                value: 'houseAbstract',
-                                show: true
-                            },
-                                                                                                {
-                                label: '头像',
-                                value: 'icon',
-                                show: true
-                            },
-                                                                                                {
-                                label: 'CODE',
-                                value: 'houseCode',
-                                show: true
-                            },
-                                                                                                {
-                                label: '用户',
-                                value: 'userId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'houseType',
-                                show: true
-                            },
-                                                                                                {
-                                label: '等级',
-                                value: 'houseLevel',
-                                show: true
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'gameId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'statusFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '推荐',
-                                value: 'recommendFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                                                                {
-                                label: '可用',
-                                value: 'useFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '游戏房间号',
-                                value: 'gameHouseId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '游戏密码',
-                                value: 'gameHousePassword',
-                                show: true
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'beginTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'endTime',
-                                show: true
-                            },
-                                                                                                {
-                                label: '比赛名称',
-                                value: 'matchName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '参数人数',
-                                value: 'playerNumber',
-                                show: true
-                            },
-                                                                                                {
-                                label: '奖金',
-                                value: 'bonus',
-                                show: true
-                            },
-                                                                                                {
-                                label: '赛季ID',
-                                value: 'seasonId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '视频',
-                                value: 'video',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id'
-                            },
-                                                                                                                                                                                                                                                                                                                            {
-                                label: '名称',
-                                value: 'house_name'
-                            },
-                                                                                                {
-                                label: '描述',
-                                value: 'house_abstract'
-                            },
-                                                                                                {
-                                label: '头像',
-                                value: 'icon'
-                            },
-                                                                                                {
-                                label: 'CODE',
-                                value: 'house_code'
-                            },
-                                                                                                {
-                                label: '用户',
-                                value: 'user_id'
-                            },
-                                                                                                {
-                                label: '类型',
-                                value: 'house_type'
-                            },
-                                                                                                {
-                                label: '等级',
-                                value: 'house_level'
-                            },
-                                                                                                {
-                                label: '游戏',
-                                value: 'game_id'
-                            },
-                                                                                                {
-                                label: '状态',
-                                value: 'status_flag'
-                            },
-                                                                                                {
-                                label: '推荐',
-                                value: 'recommend_flag'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                                                                {
-                                label: '可用',
-                                value: 'use_flag'
-                            },
-                                                                                                {
-                                label: '游戏房间号',
-                                value: 'game_house_id'
-                            },
-                                                                                                {
-                                label: '游戏密码',
-                                value: 'game_house_password'
-                            },
-                                                                                                {
-                                label: '开始时间',
-                                value: 'begin_time'
-                            },
-                                                                                                {
-                                label: '结束时间',
-                                value: 'end_time'
-                            },
-                                                                                                {
-                                label: '比赛名称',
-                                value: 'match_name'
-                            },
-                                                                                                {
-                                label: '参数人数',
-                                value: 'player_number'
-                            },
-                                                                                                {
-                                label: '奖金',
-                                value: 'bonus'
-                            },
-                                                                                                {
-                                label: '赛季ID',
-                                value: 'season_id'
-                            },
-                                                                                                {
-                                label: '视频',
-                                value: 'video'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
+        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];
             }
+
+            this.$http.get({
+                url: '/houseInfo/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
+                }
+            })
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        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();
             }
         },
-        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,
+        editRow(row) {
+            this.$router.push({
+                path: '/houseInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            })
+        },
+        handBegin(row) {
+            this.$alert('开始比赛将无法恢复，确认要开始么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/houseInfo/handBegin',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('开始成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('开始取消');
+                } else {
+                    this.$message.error('开始失败');
                 }
-
-                this.$http.get({
-                    url: '/houseInfo/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
+            })
+        },
+        handEnd(row) {
+            this.$alert('结束比赛将无法恢复，确认要结束么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/houseInfo/handEnd',
+                    data: { id: row.id }
                 })
-            },
-            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();
+            }).then(() => {
+                this.$message.success('结束成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('结束取消');
+                } else {
+                    this.$message.error('结束失败');
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/houseInfo',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
+            })
+        },
+        handSettlementHouse(row) {
+            this.$alert('结算比赛将无法恢复，确认要结算么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/houseInfo/handSettlementHouse',
+                    data: { id: row.id }
                 })
-            },
-            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);
+            }).then(() => {
+                this.$message.success('结算成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('结算取消');
+                } else {
+                    this.$message.error('结算失败');
                 }
-            },
-            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 + "/houseInfo/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: '/houseInfo/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 + "/houseInfo/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: '/houseInfo/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>