未验证 提交 17e8e3bf 编辑于 作者: yuudi's avatar yuudi 提交者: GitHub
浏览文件

Merge pull request #99 from Diving-Fish/develop

......@@ -37,7 +37,6 @@
<!--以后有用-->
<el-date-picker
v-model="range"
v-if="false"
type="daterange"
unlink-panels
range-separator="至"
......@@ -46,17 +45,17 @@
:picker-options="pickerOptions"
>
</el-date-picker>
<el-tabs v-model="selecting_tab">
<el-tabs v-model="selectingTab">
<el-tab-pane label="整体数据" name="total">
<div>
<p>
<a>共[[ members.length ]]人,[[ challenge_count(total_damage, true) ]]刀</a>
<el-checkbox style="margin-left: 20px;" v-model="contain_tail_and_continue"></el-checkbox>
<a>共[[ members.length ]]人,[[ challengeCount(totalDamage, true) ]]刀</a>
<el-checkbox style="margin-left: 20px;" v-model="containTailAndContinue"></el-checkbox>
<a>刀均伤害中计入尾刀和剩余刀</a>
<a style="margin-left: 20px">&nbsp;</a>
<a class="digit6">十万</a> <a class="digit7">百万</a> <a class="digit8">千万</a> <a class="digit9">亿</a>
</p>
<el-table v-loading="is_loading" :data="global_table_data" style="width: 100%" stripe border :default-sort = "{prop: 'sum_dmg', order: 'descending'}">
<el-table v-loading="isLoading" :data="globalTableData" style="width: 100%" stripe border :default-sort = "{prop: 'sumDmg', order: 'descending'}">
<el-table-column prop="qqid" label="QQ号" width="125" sortable ></el-table-column>
<el-table-column prop="nickname" label="昵称" width="200" sortable ></el-table-column>
<el-table-column prop="count" width="120" sortable >
......@@ -65,24 +64,24 @@
<el-popover placement="top" effect="light" trigger="hover">刀数=正常刀+(补偿刀+尾刀)/2<i class="el-icon-question" slot="reference"></i></el-popover>
</template>
</el-table-column>
<el-table-column prop="count_tail" label="尾刀" width="120" sortable ></el-table-column>
<el-table-column prop="count_continue" label="补偿刀" width="120" sortable ></el-table-column>
<el-table-column prop="avg_dmg" width="270" sortable sort-by="avg_dmg" >
<el-table-column prop="countTail" label="尾刀" width="120" sortable ></el-table-column>
<el-table-column prop="countContinue" label="补偿刀" width="120" sortable ></el-table-column>
<el-table-column prop="avgDmg" width="270" sortable sort-by="avgDmg" >
<template slot="header" slot-scope="scope">
<a>刀均伤害</a>
<el-popover v-if="!contain_tail_and_continue" placement="top" effect="light" trigger="hover">当前刀均伤害未计入尾刀和补偿刀<i class="el-icon-question" slot="reference"></i></el-popover>
<el-popover v-if="contain_tail_and_continue" placement="top" effect="light" trigger="hover">当前刀均伤害已计入尾刀和补偿刀<i class="el-icon-question" slot="reference"></i></el-popover>
<el-popover v-if="!containTailAndContinue" placement="top" effect="light" trigger="hover">当前刀均伤害未计入尾刀和补偿刀<i class="el-icon-question" slot="reference"></i></el-popover>
<el-popover v-if="containTailAndContinue" placement="top" effect="light" trigger="hover">当前刀均伤害已计入尾刀和补偿刀<i class="el-icon-question" slot="reference"></i></el-popover>
</template>
<template slot-scope="scope">
<a :class='"digit" + scope.row.avg_dmg.toString().length'>[[scope.row.avg_dmg]]</a>
<a :class='"digit" + scope.row.avgDmg.toString().length'>[[scope.row.avgDmg]]</a>
</template>
</el-table-column>
<el-table-column prop="sum_dmg" label="总伤害" width="270" sortable sort-by="sum_dmg" >
<el-table-column prop="sumDmg" label="总伤害" width="270" sortable sort-by="sumDmg" >
<template slot-scope="scope">
<a :class='"digit" + scope.row.sum_dmg.toString().length'>[[scope.row.sum_dmg]]</a>
<a :class='"digit" + scope.row.sumDmg.toString().length'>[[scope.row.sumDmg]]</a>
</template>
</el-table-column>
<el-table-column prop="sum_dmg_rate" label="总伤害占比" min-width="150" sortable ></el-table-column>
<el-table-column prop="sumDmgRate" label="总伤害占比" min-width="150" sortable ></el-table-column>
</el-table>
</div>
</el-tab-pane>
......@@ -90,30 +89,30 @@
<div>
<div style="display: flex; height: 450px">
<div style="width: 100%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="miss_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="missChart"></div>
</div>
</div>
<div style="display: flex; height: 450px">
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="last_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="lastChart"></div>
</div>
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="total_time_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="totalTimeChart"></div>
</div>
</div>
<div style="display: flex; height: 450px">
<div style="width: 100%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="boss_blood_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="bossBloodChart"></div>
</div>
</div>
<div style="display: flex; height: 450px">
<div style="width: 100%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="boss_hit_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="bossHitChart"></div>
</div>
</div>
<div style="display: flex; height: 450px">
<div style="width: 100%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="total_damage_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="totalDamageChart"></div>
</div>
</div>
</div>
......@@ -124,7 +123,7 @@
<div style="width: 50%;">
<p>
<a>选择玩家:</a>
<el-select v-model="selecting_qqid" placeholder="请选择">
<el-select v-model="selectingQQid" placeholder="请选择">
<el-option
v-for="member in members"
:key="member.qqid"
......@@ -132,26 +131,26 @@
:value="member.qqid">
</el-option>
</el-select>
<el-checkbox style="margin-left: 20px;" v-model="contain_tail_and_continue"></el-checkbox>
<el-checkbox style="margin-left: 20px;" v-model="containTailAndContinue"></el-checkbox>
<a>刀均伤害中计入尾刀和剩余刀</a>
</p>
<div style="width: 80%;">
<el-table :data="player_data.damage" :show-header="false">
<el-table :data="playerData.damage" :show-header="false">
<el-table-column prop="label" label=""></el-table-column>
<el-table-column prop="value" label=""></el-table-column>
</el-table>
</div>
</div>
<div v-show="selecting_tab != 'total'" style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="sum_dmg_chart"></div>
<div v-show="selectingTab != 'total'" style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="sumDmgChart"></div>
</div>
</div>
<div style="display: flex; height: 450px">
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="personal_progress_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="personalProgressChart"></div>
</div>
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="personal_time_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 400px;" id="personalTimeChart"></div>
</div>
</div>
</div>
......@@ -159,10 +158,10 @@
</el-tabs>
<div style="display: flex; height: 400px">
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 100%;" id="boss_dmg_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 100%;" id="bossDmgChart"></div>
</div>
<div style="width: 50%">
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 100%;" id="challenge_chart"></div>
<div style="margin: 10px; padding: 20px; border: 1px solid #EBEEF5; height: 100%;" id="challengeChart"></div>
</div>
</div>
</div>
......@@ -170,7 +169,7 @@
</body>
<script>var csrf_token = "{{ session['csrf_token'] }}"; var qqid = "{{ session['yobot_user'] }}"</script>
<script>var csrfToken = "{{ session['csrf_token'] }}"; var qqid = "{{ session['yobot_user'] }}"</script>
<script src="https://cdn.bootcdn.net/ajax/libs/echarts/4.7.0/echarts.min.js"></script>
<script src="{{ url_for('yobot_static', filename='clan/statistics/statistics2.js') }}"></script>
......
支持 Markdown
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册