From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
index 092d1c6..0fdc6a7 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
@@ -59,7 +59,7 @@
WorldCupRecords.exportUserStatistics = function (){
let phone = $("#phone").val();
- let name =$("#name").val();
+ let name =$("#userName").val();
let idcard =$("#idcard").val();
window.location.href = Feng.ctxPath + '/worldCupRecords/exportUserStatistics?phone=' + phone + "&name=" + name + "&idcard=" + idcard
}
@@ -100,20 +100,21 @@
WorldCupRecords.search3 = function () {
var queryData = {};
queryData['phone'] = $("#phone").val();
- queryData['name'] =$("#name").val();
+ queryData['name'] =$("#userName").val();
queryData['idcard'] =$("#idcard").val();
WorldCupRecords.table3.refresh({query: queryData});
};
WorldCupRecords.resetSearch3 = function () {
- $("#province").val("");
- $("#city").val("");
+ $("#phone").val("");
+ $("#userName").val("");
+ $("#idcard").val("");
WorldCupRecords.search3();
};
$(function () {
var defaultColunms1 = [
- {field: 'selectItem', checkbox: true},
+ {field: 'selectItem', visible: false, checkbox: false},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '名次', field: 'row_num', visible: true, align: 'center', valign: 'middle',width:'20%',},
{title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle',},
@@ -166,7 +167,7 @@
}
},
];
- var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/worldCupGameStatisticsInfoList", defaultColunms3);
+ var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/getUserGameRecordList", defaultColunms3);
table3.setPaginationType("server");
WorldCupRecords.table3 = table3.init();
});
--
Gitblit v1.7.1