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 | 81 +++++++++++++++-------------------------
1 files changed, 31 insertions(+), 50 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 491d757..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>
@@ -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">
@@ -198,7 +217,7 @@
<div class="row" id="content4" style="margin-left: 100px;">
<div class="col-sm-11">
<div class="form-group">
- <span id="totalNumber4">全球场次总数：</span>
+ <span id="totalNumber4">全球场次总数：<span id="num" style="color:red"></span>场
</div>
</div>
<div class="col-sm-11" style="display: flex">
@@ -247,7 +266,6 @@
</div>
<#button name="搜索" icon="fa-search" clickFun="TSite1.search4()"/>
</div>
-
<#table id="TSiteTable1"/>
</div>
</div>
@@ -311,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%',
@@ -376,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())
@@ -387,7 +393,6 @@
};
function BatterData() {
var ajax = new $ax(Feng.ctxPath + "/gameData/list", function(resp){
- var mDataList= resp.mDataList;
var yDataList= resp.yDataList;
// 场次
yD=[];
@@ -399,10 +404,6 @@
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])
@@ -419,16 +420,6 @@
option = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -473,16 +464,6 @@
tooltip: {
trigger: 'axis'
},
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
- },
grid: {
left: '3%',
right: '4%',
@@ -523,7 +504,7 @@
var myChart5 = echarts.init(document.getElementById('time'));
myChart5.setOption(option2);
});
-
+ ajax.set("range",$("#range").val());
ajax.set("storeId",$("#stores").val());
ajax.start();
}
@@ -582,7 +563,7 @@
// 获取90°准度赛全球场次总数
var ajax4 = new $ax(Feng.ctxPath + "/gameData/cityGameOne", function(data){
var totalNumber4= document.getElementById("totalNumber4");
- totalNumber4.innerText = "全球场次总数:"+data.totalNum;
+ $("#num").text(data.totalNum)
});
ajax4.start();
// 基于准备好的dom，初始化echarts实例
--
Gitblit v1.7.1