From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js b/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
index cba4875..53a0e2a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/gameData/gameData.js
@@ -34,8 +34,8 @@
return [
{field: 'selectItem', checkbox: true},
{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '序号', field: 'number', visible:true, align: 'center', valign: 'middle'},
- {title: '昵称', field: 'name', visible: true, align: 'center', valign: 'middle',},
+ {title: '序号', field: 'account_id', visible:true, align: 'center', valign: 'middle'},
+ {title: '昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle',},
{title: '成绩', field: 'score', visible: true, align: 'center', valign: 'middle'},
];
};
@@ -46,7 +46,7 @@
return [
{field: 'selectItem', checkbox: true},
{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '序号', field: 'number', visible:true, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'account_id', visible:true, align: 'center', valign: 'middle'},
{title: '昵称', field: 'name', visible: true, align: 'center', valign: 'middle',},
{title: '成绩', field: 'score', visible: true, align: 'center', valign: 'middle'},
];
@@ -61,17 +61,19 @@
TSite.search3 = function () {
var queryData = {};
- queryData['province'] = $("#con3").val();
- queryData['city'] = $("#cCode3").val();
- queryData['siteTypeId'] = $("#site3").val();
+ queryData['type'] = $("#yearOrMonth3").val();
+ queryData['date'] = $("#con3").val();
+ queryData['cityCode'] = $("#cCode3").val();
+ queryData['spaceId'] = $("#site3").val();
TSite.table.refresh({query: queryData});
};
TSite1.search4 = function () {
var queryData = {};
- queryData['province'] = $("#con4").val();
- queryData['city'] = $("#cCode4").val();
- queryData['siteTypeId'] = $("#site4").val();
- TSite.table.refresh({query: queryData});
+ queryData['type'] = $("#yearOrMonth4").val();
+ queryData['date'] = $("#con4").val();
+ queryData['cityCode'] = $("#cCode4").val();
+ queryData['spaceId'] = $("#site4").val();
+ TSite1.table.refresh({query: queryData});
};
TSite.resetSearch = function () {
@@ -88,12 +90,12 @@
$(function () {
var defaultColunms = TSite.initColumn();
- var table = new BSTable(TSite.id, "/tSite/listAll", defaultColunms);
+ var table = new BSTable(TSite.id, "/gameData/listAll", defaultColunms);
table.setPaginationType("client");
TSite.table = table.init();
var defaultColunms1 = TSite1.initColumn();
- var table1 = new BSTable(TSite1.id, "/tSite/listAll", defaultColunms1);
+ var table1 = new BSTable(TSite1.id, "/gameData/listAll1", defaultColunms1);
table1.setPaginationType("client");
TSite1.table = table1.init();
});
--
Gitblit v1.7.1