From 29bd4d946349eacd38442c07ebf15b470af92e82 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 14:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 141 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 38 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..491d757 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
@@ -66,7 +66,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;">
@@ -142,61 +142,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>
+ </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 +222,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 +231,23 @@
</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>
@@ -376,8 +395,8 @@
// 时长
yT = [];
mT = [];
+ yearX=[];
for (let i = 0; i <yDataList.length ; i++) {
-
yD.push(yDataList[i].total_num);
yT.push(yDataList[i].batter_time);
}
@@ -387,6 +406,9 @@
}
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;
@@ -496,7 +518,12 @@
}
]
};
+ var myChart4 = echarts.init(document.getElementById('number'));
+ myChart4.setOption(option);
+ var myChart5 = echarts.init(document.getElementById('time'));
+ myChart5.setOption(option2);
});
+
ajax.set("storeId",$("#stores").val());
ajax.start();
}
@@ -546,7 +573,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");
+ totalNumber4.innerText = "全球场次总数:"+data.totalNum;
+ });
+ ajax4.start();
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById('number'));
@@ -619,7 +657,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 +672,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