From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 341 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 216 insertions(+), 125 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
index 16b72db..d710ed1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
@@ -57,7 +57,13 @@
</div>
</br>
<div class="col-sm-11">
+
<div class="form-group" style="display: flex;margin-left: -150px">
+ <label class="col-sm-3 control-label">*所属范围：</label>
+ <select style="width: 300px" class="form-control" id="range" name="range">
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ </select>
<label class="col-sm-3 control-label">*所属门店：</label>
<select style="width: 300px" class="form-control" id="stores" name="stores">
<option value="">全球</option>
@@ -66,7 +72,7 @@
@}
</select>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
+ <#button name="搜索" icon="fa-search" clickFun="BatterData()"/>
</div>
<div class="col-sm-10">
<div class="row" id="t1" style="margin-left: 100px;">
@@ -90,6 +96,17 @@
</div>
</div>
<div class="col-sm-11" style="display: flex">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*筛选范围：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="range1" name="range1" onchange="getStoreByCity(this)">
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ <option value="d">日度</option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选内容：</label>
<div class="col-sm-9" style="display: flex;">
@@ -109,6 +126,10 @@
</div>
</div>
+
+ </div>
+
+ <div class="col-sm-11" style="display: flex">
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选场地：</label>
<div class="col-sm-9">
@@ -120,24 +141,18 @@
</select>
</div>
</div>
- </div>
-
- <div class="col-sm-11" style="display: flex">
+
<div class="form-group" >
<label class="col-sm-3 control-label">*游戏类型：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="games" name="site">
- <option value="">全部</option>
- <option style="width: 300px" value="1">方块球王</option>
- <option style="width: 300px" value="2">社区小球王</option>
- <option style="width: 300px" value="3">玩湃熊之力</option>
- <option style="width: 300px" value="4">绿茵密码</option>
- <option style="width: 300px" value="5">镜像阵容</option>
- <option style="width: 300px" value="6">涨姿势</option>
+ @for(obj in games){
+ <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ @}
</select>
</div>
</div>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
+ <#button name="搜索" icon="fa-search" clickFun="Search1()"/>
</div>
<div class="col-sm-10">
<div class="row" id="t2" style="margin-left: 100px;">
@@ -146,7 +161,23 @@
</div>
</div>
<div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <span id="totalNumber3">全球场次总数：</span>
+ </div>
+ </div>
+ </br>
<div class="col-sm-11" style="display: flex">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*筛选范围：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="yearOrMonth3" name="cCode" >
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选内容：</label>
<div class="col-sm-9" style="display: flex;">
@@ -157,7 +188,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">*筛选城市：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity1(this)">
+ <select style="width: 300px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity3(this)">
<option value="">全球</option>
@for(obj in list){
<option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
@@ -166,23 +197,40 @@
</div>
</div>
- <div class="form-group" >
- <label class="col-sm-3 control-label">*筛选场地：</label>
- <div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="site3" name="site">
- <option value="">全球</option>
- @for(obj in sites){
- <option style="width: 300px" value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
+ </div>
+ <div class="col-sm-11" style="display: flex">
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*筛选场地：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="site3" name="site">
+ <option value="">全球</option>
+ @for(obj in sites){
+ <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
</div>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search3()"/>
+ </div>
+ <#button name="搜索" icon="fa-search" clickFun="TSite.search3()"/>
</div>
<#table id="TSiteTable"/>
</div>
<div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <span id="totalNumber4">全球场次总数：<span id="num" style="color:red"></span>场
+ </div>
+ </div>
<div class="col-sm-11" style="display: flex">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*筛选范围：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="yearOrMonth4" name="cCode">
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选内容：</label>
<div class="col-sm-9" style="display: flex;">
@@ -193,7 +241,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">*筛选城市：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="cCode4" name="cCode" onchange="getStoreByCity1(this)">
+ <select style="width: 300px" class="form-control" id="cCode4" name="cCode" onchange="getStoreByCity4(this)">
<option value="">全球</option>
@for(obj in list){
<option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
@@ -202,19 +250,22 @@
</div>
</div>
- <div class="form-group" >
- <label class="col-sm-3 control-label">*筛选场地：</label>
- <div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="site4" name="site">
- <option value="">全球</option>
- @for(obj in sites){
- <option style="width: 300px" value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search4()"/>
</div>
+
+ <div class="col-sm-11" style="display: flex">
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*筛选场地：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="site4" name="site">
+ <option value="">全球</option>
+ @for(obj in sites){
+ <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <#button name="搜索" icon="fa-search" clickFun="TSite1.search4()"/>
+ </div>
<#table id="TSiteTable1"/>
</div>
</div>
@@ -269,9 +320,79 @@
var SUTU=[];
// SUTU智慧球场数据
var SUTUData1=[];
+ var years=[];
+ var data1=[];
+ var data2=[];
+ var monthOrDays=[];
+ function Search1() {
+ var ajax = new $ax(Feng.ctxPath + "/gameData/listSUTU1", function(resp){
+ data2=[];
+ data1=[];
+ var d1 = resp.data1;
+ years = resp.years;
+ if (years.length == 0){
+ years=[2020,2021,2022,2023]
+ }
+ for (let i = 0; i <d1.length; i++) {
+ data1.push(d1[i].count);
+ }
+ if (d1.length==0){
+ data1= [0,0,0,0]
+ }
+ option4 = {
+ tooltip: {
+ trigger: 'axis'
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: years
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: '年度',
+ type: 'line',
+ stack: 'Total',
+ data: data1
+ },
+ {
+ name: '月度',
+ type: 'line',
+ stack: 'Total',
+ data:data2
+ }
+ ]
+ };
+ var myChart4 = echarts.init(document.getElementById('number1'));
+ myChart4.setOption(option4);
+ })
+ ajax.set("gameId",$("#games").val())
+ ajax.set("range",$("#range1").val())
+ ajax.set("time",$("#con1").val())
+ ajax.set("spaceId",$("#site").val())
+ ajax.set("cityCode",$("#cCode").val())
+ ajax.start();
+ var myChart4 = echarts.init(document.getElementById('number1'));
+ var options = myChart4.getOption()
+ options.series[0].data = data1
+ options.series[1].data = data2
+ };
function BatterData() {
var ajax = new $ax(Feng.ctxPath + "/gameData/list", function(resp){
- var mDataList= resp.mDataList;
var yDataList= resp.yDataList;
// 场次
yD=[];
@@ -279,17 +400,16 @@
// 时长
yT = [];
mT = [];
+ yearX=[];
for (let i = 0; i <yDataList.length ; i++) {
-
yD.push(yDataList[i].total_num);
yT.push(yDataList[i].batter_time);
}
- for (let i = 0; i <mDataList.length ; i++) {
- mD.push(mDataList[i].total_num);
- mT.push(mDataList[i].batter_time);
- }
for (let i = 0; i <resp.yearList.length ; i++) {
yearX.push(resp.yearList[i])
+ }
+ if(resp.yearList.length==0){
+ yearX=[2019,2020,2021,2023]
}
var totalNumber= resp.totalNumber;
var totalTime= resp.totalTime;
@@ -300,16 +420,6 @@
option = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -354,16 +464,6 @@
tooltip: {
trigger: 'axis'
},
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
- },
grid: {
left: '3%',
right: '4%',
@@ -399,12 +499,13 @@
}
]
};
+ var myChart4 = echarts.init(document.getElementById('number'));
+ myChart4.setOption(option);
+ var myChart5 = echarts.init(document.getElementById('time'));
+ myChart5.setOption(option2);
});
- if ($("#stores").val() == ""){
- ajax.set("storeId",0)
- }else{
- ajax.set("storeId",$("#stores").val());
- }
+ ajax.set("range",$("#range").val());
+ ajax.set("storeId",$("#stores").val());
ajax.start();
}
function SUTUData() {
@@ -452,56 +553,19 @@
getContent(1);
BatterData();
SUTUData();
- option4 = {
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: yearX
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- name: '年度',
- type: 'line',
- stack: 'Total',
- data: [1,3,6,8,9,5]
- },
- {
- name: '月度',
- type: 'line',
- stack: 'Total',
- data:[1,2,3,4,5,6,6,5,4,3,2,1]
- // data: [month[0][0],month[0][1], month[0][2], month[0][3], month[0][4],
- // month[0][5], month[0][6], month[0][7], month[0][8], month[0][9], month[0][10], month[0][11]]
- }
- ]
- };
+ Search1();
+ // 跨城赛获取全球场次总数
+ var ajax = new $ax(Feng.ctxPath + "/gameData/cityGame", function(data){
+ var totalNumber3= document.getElementById("totalNumber3");
+ totalNumber3.innerText = "全球场次总数:"+data.totalNum;
+ });
+ ajax.start();
+ // 获取90°准度赛全球场次总数
+ var ajax4 = new $ax(Feng.ctxPath + "/gameData/cityGameOne", function(data){
+ var totalNumber4= document.getElementById("totalNumber4");
+ $("#num").text(data.totalNum)
+ });
+ ajax4.start();
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById('number'));
@@ -535,16 +599,16 @@
var options = myChart4.getOption()
//这里是选择切换什么样的x轴，那么他会进行对Y值的切换
if (obj.name == '年度') {
- options.xAxis[0].data = yearX
+ options.xAxis[0].data = years
} else if (obj.name == '月度') {
- options.xAxis[0].data = monthX
+ options.xAxis[0].data = monthOrDays
}
myChart4.setOption(options, true)
});
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option);
myChart2.setOption(option2);
- myChart4.setOption(option4);
+
var myChart3 = echarts.init(document.getElementById('gameTotal'));
myChart3.setOption(option3);
@@ -574,7 +638,12 @@
var cityCode=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
if(data!=null){
- var content='<option value="">全球</option>';
+ if (cityCode==""){
+ var content='<option value="">全球</option>';
+ }else{
+ var content='<option value="">全部</option>';
+ }
+
$.each(data, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
});
@@ -584,15 +653,37 @@
ajax.set("oneId",cityCode);
ajax.start();
}
- function getStoreByCity1(e) {
+ function getStoreByCity3(e) {
var cityCode=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
if(data!=null){
- var content='<option value="">全球</option>';
+ if (cityCode==""){
+ var content='<option value="">全球</option>';
+ }else{
+ var content='<option value="">全部</option>';
+ }
$.each(data, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
});
- $("#site1").empty().append(content);
+ $("#site3").empty().append(content);
+ }
+ });
+ ajax.set("oneId",cityCode);
+ ajax.start();
+ }
+ function getStoreByCity4(e) {
+ var cityCode=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tSite/getSiteByCity", function(data){
+ if(data!=null){
+ if (cityCode==""){
+ var content='<option value="">全球</option>';
+ }else{
+ var content='<option value="">全部</option>';
+ }
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.id+"'>"+v.name+"</option>";
+ });
+ $("#site4").empty().append(content);
}
});
ajax.set("oneId",cityCode);
--
Gitblit v1.7.1