From 561e8590782ccea6037fcd50d24429ce8757cb64 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 09:23:58 +0800
Subject: [PATCH] 广告修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 189 +++++++++++++++++++++++++++++------------------
1 files changed, 117 insertions(+), 72 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..443382a 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="TCompetition.search()"/>
+ <#button name="搜索" icon="fa-search" clickFun="Search()"/>
</div>
<div class="col-sm-10">
<div class="row" id="t1" style="margin-left: 100px;">
@@ -127,17 +127,13 @@
<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;">
@@ -147,20 +143,29 @@
</div>
<div class="row" id="content3" style="margin-left: 100px;">
<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: 200px" class="form-control" id="yearOrMonth3" name="cCode" onchange="getStoreByCity1(this)">
+ <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: 300px" class="form-control" id="con3" placeholder="请输入年份或者月份" type="text">
+ <input style="width: 200px" 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: 300px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity1(this)">
+ <select style="width: 200px" class="form-control" id="cCode3" name="cCode" onchange="getStoreByCity1(this)">
<option value="">全球</option>
@for(obj in list){
- <option style="width: 300px" value="${obj.cityCode}">${obj.city}</option>
+ <option style="width: 200px" value="${obj.cityCode}">${obj.city}</option>
@}
</select>
</div>
@@ -169,20 +174,29 @@
<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">
+ <select style="width: 200px" class="form-control" id="site3" name="site">
<option value="">全球</option>
@for(obj in sites){
- <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ <option style="width: 200px" value="${obj.id}">${obj.name}</option>
@}
</select>
</div>
</div>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search3()"/>
+ <#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" style="display: flex">
+ <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="yearOrMonth4" name="cCode" onchange="getStoreByCity1(this)">
+ <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;">
@@ -269,6 +283,89 @@
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;
+ var d2 = resp.data2;
+ years = resp.years;
+ monthOrDays = resp.monthOrDays;
+ 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);
+ }
+ 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%',
+ 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("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;
@@ -400,11 +497,7 @@
]
};
});
- if ($("#stores").val() == ""){
- ajax.set("storeId",0)
- }else{
- ajax.set("storeId",$("#stores").val());
- }
+ ajax.set("storeId",$("#stores").val());
ajax.start();
}
function SUTUData() {
@@ -452,56 +545,8 @@
getContent(1);
BatterData();
SUTUData();
- option4 = {
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
+ Search1();
- }
- },
- 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]]
- }
- ]
- };
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById('number'));
@@ -535,16 +580,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);
--
Gitblit v1.7.1