From a550e674f03c486e9d7f13e3eaf7fe76acea9ffc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 18:15:20 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js | 143 +++++++++++++++++++----------------------------
1 files changed, 58 insertions(+), 85 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 2c13cf1..092d1c6 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
@@ -25,78 +25,44 @@
return true;
}
};
-/**
- * 商户号认证
- */
-WorldCupRecords.openAddWorldCupRecords = function () {
+
+
+WorldCupRecords.openWorldCupRecordsInfo = function (){
+ var selected = $('#WorldCupRecordsTable2').bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }
+ let seItem2 = selected[0];
var index = layer.open({
type: 2,
- title: '添加比赛',
+ title: '查看详情',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/WorldCupRecords/openAddWorldCupRecords'
+ content: Feng.ctxPath + '/worldCupRecords/openWorldCupGameStatisticsInfo?id=' + seItem2.id
});
this.layerIndex = index;
-};
-/**
- * 编辑
- */
-WorldCupRecords.openEditWorldCupRecords = function () {
- if(this.check()){
- var index = layer.open({
- type: 2,
- title: '编辑比赛',
- area: ['100%', '100%'], //宽高
- fix: false, //不固定
- maxmin: true,
- content: Feng.ctxPath + '/WorldCupRecords/openEditWorldCupRecords?id=' + WorldCupRecords.seItem.id
- });
- this.layerIndex = index;
- }
-};
+}
+WorldCupRecords.openUserGameRecord = function (){
+ var index = layer.open({
+ type: 2,
+ title: '比赛记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/worldCupRecords/openUserGameRecord'
+ });
+ this.layerIndex = index;
+}
-WorldCupRecords.openWorldCupRecordsInfo = function () {
- if(this.check()){
- var index = layer.open({
- type: 2,
- title: '比赛详情',
- area: ['100%', '100%'], //宽高
- fix: false, //不固定
- maxmin: true,
- content: Feng.ctxPath + '/WorldCupRecords/openInfoWorldCupRecords?id=' + WorldCupRecords.seItem.id
- });
- this.layerIndex = index;
- }
-};
-
-
-
-
-
-
-
-/**
- * 下架
- */
-WorldCupRecords.registeredPersonnel = function () {
- if(this.check()){
- var index = layer.open({
- type: 2,
- title: '已报名人员',
- area: ['100%', '100%'], //宽高
- fix: false, //不固定
- maxmin: true,
- content: Feng.ctxPath + '/WorldCupRecords/openRegisteredPersonnel?id=' + WorldCupRecords.seItem.id
- });
- this.layerIndex = index;
- }
-};
-
-
-
-
+WorldCupRecords.exportUserStatistics = function (){
+ let phone = $("#phone").val();
+ let name =$("#name").val();
+ let idcard =$("#idcard").val();
+ window.location.href = Feng.ctxPath + '/worldCupRecords/exportUserStatistics?phone=' + phone + "&name=" + name + "&idcard=" + idcard
+}
/**
@@ -122,21 +88,20 @@
WorldCupRecords.search2 = function () {
var queryData = {};
- queryData['province'] = $("#province").val();
- queryData['city'] =$("#city").val();
+ queryData['name'] = $("#name").val();
WorldCupRecords.table2.refresh({query: queryData});
};
WorldCupRecords.resetSearch2 = function () {
- $("#province").val("");
- $("#city").val("");
+ $("#name").val("");
WorldCupRecords.search2();
};
WorldCupRecords.search3 = function () {
var queryData = {};
- queryData['province'] = $("#province").val();
- queryData['city'] =$("#city").val();
+ queryData['phone'] = $("#phone").val();
+ queryData['name'] =$("#name").val();
+ queryData['idcard'] =$("#idcard").val();
WorldCupRecords.table3.refresh({query: queryData});
};
@@ -150,13 +115,17 @@
var defaultColunms1 = [
{field: 'selectItem', checkbox: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '名次', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
- {title: '用户姓名', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
- {title: '联系电话', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
- {title: '所在城市', field: 'age', visible: true, align: 'center', valign: 'middle'},
- {title: '已比赛场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- {title: '胜-负场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- {title: '胜率', field: 'status', visible: true, 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',},
+ {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+ {title: '所在城市', field: 'province', visible: true, align: 'center', valign: 'middle'},
+ {title: '已比赛场次', field: 'totalSession', visible: true, align: 'center', valign: 'middle'},
+ {title: '胜-负场次', field: 'win', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data, item) {
+ return item.win + '-' + item.lose;
+ }
+ },
+ {title: '胜率', field: 'winRate', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
return data + '%';
}
@@ -172,10 +141,10 @@
{title: '比赛名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
{title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
{title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
- {title: '已报名人数', field: 'age', visible: true, align: 'center', valign: 'middle'},
- {title: '已比赛场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
+ {title: '已报名人数', field: 'applicants', visible: true, align: 'center', valign: 'middle'},
+ {title: '已比赛场次', field: 'matchTime', visible: true, align: 'center', valign: 'middle'},
];
- var table2 = new BSTable("WorldCupRecordsTable2", "/worldCupRecords/listAll", defaultColunms2);
+ var table2 = new BSTable("WorldCupRecordsTable2", "/worldCupRecords/worldCupGameStatistics", defaultColunms2);
table2.setPaginationType("server");
WorldCupRecords.table2 = table2.init();
@@ -183,17 +152,21 @@
{field: 'selectItem', checkbox: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
- {title: '联系电话', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
- {title: '身份证号', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
- {title: '已比赛场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- {title: '胜-负场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- {title: '胜率', field: 'status', visible: true, align: 'center', valign: 'middle',
+ {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle',},
+ {title: '身份证号', field: 'idcard', visible: true, align: 'center', valign: 'middle'},
+ {title: '已比赛场次', field: 'totalSession', visible: true, align: 'center', valign: 'middle'},
+ {title: '胜-负场次', field: 'win', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data, item) {
+ return item.win + '-' + item.lose;
+ }
+ },
+ {title: '胜率', field: 'winRate', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
return data + '%';
}
},
];
- var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/listAll", defaultColunms3);
+ var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/worldCupGameStatisticsInfoList", defaultColunms3);
table3.setPaginationType("server");
WorldCupRecords.table3 = table3.init();
});
--
Gitblit v1.7.1