后台页面提示信息

src/main/vue/src/pages/HouseInfos.vue

@@ -45,9 +45,6 @@
             <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;" />
@@ -55,24 +52,23 @@
 
             </el-table-column> -->
 
-            <el-table-column v-if="isColumnShow('houseCode')" prop="houseCode" label="CODE" min-width="100">
+            <el-table-column v-if="isColumnShow('houseCode')" prop="houseCode" label="CODE" min-width="120">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="100">
+            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="80">
             </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="houseLevelInfo.levelName" label="等级" min-width="100">
-            </el-table-column>
+            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" min-width="150">
+                <template slot-scope="{row}">
 
-            <el-table-column v-if="isColumnShow('gameId')" prop="gameInfo.gameName" label="游戏" min-width="100">
-            </el-table-column>
+                    <el-tooltip class="item" effect="dark" :content="getStatus(row).tip" placement="top-start">
+
+                        <el-tag :type="getStatus(row).type" size="small">{{getStatus(row).label}}</el-tag>
+                    </el-tooltip>
 
-            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" min-width="100">
-                <template slot-scope="{row}">
-                    <el-tag :type="getStatus(row).type" size="small">{{getStatus(row).label}}</el-tag>
                 </template>
             </el-table-column>
 
@@ -88,6 +84,12 @@
             <el-table-column v-if="isColumnShow('endTime')" prop="endTime" label="结束时间" :formatter="DateTimeFormatter" min-width="100">
             </el-table-column>
 
+            <el-table-column v-if="isColumnShow('houseLevel')" prop="houseLevelInfo.levelName" label="等级" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('gameId')" prop="gameInfo.gameName" label="游戏" min-width="100">
+            </el-table-column>
+
             <el-table-column v-if="isColumnShow('recommendFlag')" prop="recommendFlag" label="推荐" min-width="100">
             </el-table-column>
 
@@ -97,6 +99,9 @@
             <el-table-column v-if="isColumnShow('useFlag')" prop="useFlag" 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('gameHouseId')" prop="gameHouseId" label="游戏房间号" min-width="100">
             </el-table-column>
 
@@ -693,41 +698,49 @@ export default {
         },
 
         getStatus(row) {
-            let type, label;
+            let type, label, tip;
             switch (row.statusFlag) {
                 case 0:
                     type = 'info';
                     label = '等待';
+                    tip = '房间创建完毕，正在等待参赛人员加入';
                     break;
                 case 1:
                     type = 'info';
                     label = '准备';
+                    tip = '房间处在准备状态，即将开始';
                     break;
                 case 2:
                     type = 'info';
                     label = '比赛开始';
+                    tip = '房间比赛已开始，正在激烈竞赛中';
                     break;
                 case 3:
                     type = 'info';
                     label = '比赛结束待解析';
+                    tip = '比赛已经结束，正在等待解析比赛结果。如需要提前解析完成可手动点击上方解析按钮检测解析结果。若任无法解析完成，点击参赛人员修改人员成绩后再来检测，完成比赛';
                     break;
                 case 4:
                     type = 'info';
                     label = '结算完成';
+                    tip = '比赛结果已经结算完成';
                     break;
                 case 5:
                     type = 'info';
                     label = '关闭';
+                    tip = '房间已经关闭';
                     break;
                 case 8:
                     type = 'info';
                     label = '解析完成';
+                    tip = '所有玩家比赛结果都已解析完成，等待最终结算,也可手动点击右侧结算按钮进行结算';
                     break;
                 default:
                     type = 'info';
                     label = '未知';
+                    tip = '房间状态未知';
             }
-            return { type, label }
+            return { type, label, tip }
         },
         updateToAnalysis() {
 

src/main/vue/src/pages/PlayerInfos.vue

@@ -39,7 +39,7 @@
             <el-table-column v-if="isColumnShow('houseId')" prop="houseId" label="房间ID" min-width="70">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('principal')" prop="principal" label="参赛积分" min-width="100">
+            <el-table-column v-if="isColumnShow('principal')" prop="principal" label="参赛门票" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('bonus')" prop="bonus" label="奖励" min-width="100">
@@ -50,7 +50,11 @@
 
             <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" label="状态" width="100" align="center">
                 <template slot-scope="{row}">
-                    <el-tag :type="getStatus(row).type" size="small">{{getStatus(row).label}}</el-tag>
+                    <el-tooltip class="item" effect="dark" :content="getStatus(row).tip" placement="top-start">
+
+                        <el-tag :type="getStatus(row).type" size="small">{{getStatus(row).label}}</el-tag>
+
+                    </el-tooltip>
                 </template>
             </el-table-column>
 
@@ -103,8 +107,9 @@
             <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
             </el-table-column>
 
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="240">
                 <template slot-scope="scope">
+                    <el-button @click="jieXi(scope.row)" v-if="scope.row.statusFlag==3" 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>
@@ -207,6 +212,31 @@
         <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
             <img width="100%" :src="imgSrc" alt="">
         </el-dialog>
+
+        <el-dialog title="手动结算" :visible.sync="jieXiShowDialog">
+            <el-form :model="jieXiRow" label-width="120px">
+                <el-form-item label="游戏排名">
+                    <el-input v-model="jieXiRow.ranking"></el-input>
+                </el-form-item>
+                <el-form-item label="存活时长">
+                    <el-input v-model="jieXiRow.liveTime"></el-input>
+                </el-form-item>
+                <el-form-item label="击败玩家">
+                    <el-input v-model="jieXiRow.killNumber"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input v-model="jieXiRow.remark"></el-input>
+                </el-form-item>
+                <el-form-item label="审核人">
+                    <el-input v-model="jieXiRow.examineUser"></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="jieXiShowDialog = false">取 消</el-button>
+                <el-button type="primary" @click="jieXiSubmit">解析完成</el-button>
+            </span>
+        </el-dialog>
+
     </div>
 </template>
 <script>
@@ -430,7 +460,10 @@ export default {
             advancedQuerySearchKey: '',
             orderByStr: '',
             imgSrc: '',
-            imageDialogVisible: false
+            imageDialogVisible: false,
+            jieXiRow: {},
+            jieXiShowDialog: false,
+
         }
     },
     computed: {
@@ -620,54 +653,104 @@ export default {
             window.open(url);
         },
         getStatus(row) {
-            let type, label;
+            let type, label, tip;
             switch (row.statusFlag) {
                 case 0:
                     type = 'info';
                     label = '加入';
+                    tip = '加入房间，等待开始比赛';
                     break;
                 case 1:
                     type = 'info';
                     label = '准备';
+                    tip = '准备状态，马上开始比赛';
                     break;
                 case 2:
                     type = 'info';
                     label = '开始';
+                    tip = '比赛已开始，正在进行比赛';
                     break;
                 case 3:
                     type = 'info';
                     label = '结束';
+                    tip = '比赛结束，等待解析。若长时间未解析完成或其他原因未能成功解析，可手动点击手动解析进行成绩录入';
                     break;
                 case 4:
                     type = 'info';
                     label = '结算';
+                    tip = '比赛结果已结算，奖励已发放';
                     break;
                 case 5:
                     type = 'info';
                     label = '领取奖励';
+                    tip = '奖励已经由参赛人员领取';
                     break;
                 case 6:
                     type = 'info';
                     label = '未比赛';
+                    tip = '加入房间后，未按指定要求参加比赛';
                     break;
                 case 7:
                     type = 'info';
                     label = '比赛超时';
+                    tip = '比赛开始后，未能在指定时间内完成比赛，比赛超时';
                     break;
                 case 8:
                     type = 'info';
                     label = '解析完成';
+                    tip = '比赛结果解析完成，等待结算';
                     break;
                 case 9:
                     type = 'info';
                     label = '解析无排名';
+                    tip = '比赛结果解析完成，但成绩未达到要求，记录无排名';
                     break;
                 default:
                     type = 'info';
                     label = '未知';
+                    tip = '状态未知';
             }
-            return { type, label }
-        }
+            return { type, label, tip }
+        },
+
+        jieXi(row) {
+            this.jieXiRow = row;
+            this.jieXiRow.remark = '后台管理手动解析';
+            this.jieXiRow.examineUser = '管理员';
+            this.jieXiShowDialog = true;
+        },
+        jieXiSubmit() {
+            if (!this.jieXiRow.ranking) {
+                this.$message.warning('请输入游戏内排名')
+
+            } else {
+                this.$http.post({
+                    url: '/playerInfo/update',
+                    data: {
+                        id: this.jieXiRow.id,
+                        ranking: this.jieXiRow.ranking,
+                        liveTime: this.jieXiRow.liveTime,
+                        killNumber: this.jieXiRow.killNumber,
+                        remark: this.jieXiRow.remark,
+                        examineUser: this.jieXiRow.examineUser,
+                        statusFlag: 8
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                        this.$message.success('保存成功');
+                        this.getData();
+
+                    } else {
+                        this.$message.error(res.error);
+                    }
+
+                    this.jieXiRow = {};
+                    this.jieXiShowDialog = false;
+                })
+            }
+        },
+
     }
 }
 </script>

src/main/vue/src/pages/UserTeam.vue

@@ -74,7 +74,7 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="showDialog = false">取 消</el-button>
+                <el-button @click="weirenShowDialog = false">取 消</el-button>
                 <el-button type="primary" @click="weirenSubmit">委任</el-button>
             </span>
         </el-dialog>
@@ -92,7 +92,7 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="showDialog = false">取 消</el-button>
+                <el-button @click="zhuanRangShowDialog = false">取 消</el-button>
                 <el-button type="primary" @click="zhuanRangSubmit">转让</el-button>
             </span>
         </el-dialog>