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 | 214 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 130 insertions(+), 84 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 443382a..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="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,9 +141,7 @@
</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">
@@ -142,61 +161,76 @@
</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>
+ <label class="col-sm-3 control-label">*筛选范围：</label>
<div class="col-sm-9">
- <select style="width: 200px" class="form-control" id="yearOrMonth3" name="cCode" onchange="getStoreByCity1(this)">
+ <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;">
- <input style="width: 200px" class="form-control" id="con3" placeholder="请输入年份或者月份" type="text">
+ <input style="width: 300px" class="form-control" id="con3" placeholder="请输入年份或者月份" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">*筛选城市：</label>
<div class="col-sm-9">
- <select style="width: 200px" 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: 200px" value="${obj.cityCode}">${obj.city}</option>
+ <option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
@}
</select>
</div>
</div>
- <div class="form-group" >
- <label class="col-sm-3 control-label">*筛选场地：</label>
- <div class="col-sm-9">
- <select style="width: 200px" class="form-control" id="site3" name="site">
- <option value="">全球</option>
- @for(obj in sites){
- <option style="width: 200px" 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="TSite.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>
+ <label class="col-sm-3 control-label">*筛选范围：</label>
<div class="col-sm-9">
- <select style="width: 200px" class="form-control" id="yearOrMonth4" name="cCode" onchange="getStoreByCity1(this)">
+ <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;">
@@ -207,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>
@@ -216,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>
@@ -292,32 +329,19 @@
data2=[];
data1=[];
var d1 = resp.data1;
- var d2 = resp.data2;
years = resp.years;
- monthOrDays = resp.monthOrDays;
+ if (years.length == 0){
+ years=[2020,2021,2022,2023]
+ }
for (let i = 0; i <d1.length; i++) {
data1.push(d1[i].count);
}
- for (let i = 0; i <d2.length; i++) {
- data2.push(d2[i].count);
+ if (d1.length==0){
+ data1= [0,0,0,0]
}
- console.log("看看data1")
- console.log(data1)
- console.log("看看data2")
- console.log(data2)
option4 = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -357,6 +381,7 @@
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())
@@ -368,7 +393,6 @@
};
function BatterData() {
var ajax = new $ax(Feng.ctxPath + "/gameData/list", function(resp){
- var mDataList= resp.mDataList;
var yDataList= resp.yDataList;
// 场次
yD=[];
@@ -376,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;
@@ -397,16 +420,6 @@
option = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -451,16 +464,6 @@
tooltip: {
trigger: 'axis'
},
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
- },
grid: {
left: '3%',
right: '4%',
@@ -496,7 +499,12 @@
}
]
};
+ var myChart4 = echarts.init(document.getElementById('number'));
+ myChart4.setOption(option);
+ var myChart5 = echarts.init(document.getElementById('time'));
+ myChart5.setOption(option2);
});
+ ajax.set("range",$("#range").val());
ajax.set("storeId",$("#stores").val());
ajax.start();
}
@@ -546,7 +554,18 @@
BatterData();
SUTUData();
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'));
@@ -619,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>";
});
@@ -629,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