From f065f051e4b4791d1f1657ce46cbf2e4de469ef7 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 06 十月 2025 19:54:29 +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 | 90 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 22 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 78b06e7..2b7dca5 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 @@ -44,8 +44,46 @@ }); this.layerIndex = index; } +/** + * 新增赛事记录 + * @returns {boolean} + */ +WorldCupRecords.addWorldCupRecordsInfo = 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: '添加赛事记录', + area: ['100%', '100%'], //宽高 + fix: false, //不固定 + maxmin: true, + content: Feng.ctxPath + '/worldCupRecords/addWorldCupGameStatisticsInfo?id=' + seItem2.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.exportUserStatistics = function (){ + let phone = $("#phone").val(); + let name =$("#userName").val(); + let idcard =$("#idcard").val(); + window.location.href = Feng.ctxPath + '/worldCupRecords/exportUserStatistics?phone=' + phone + "&name=" + name + "&idcard=" + idcard +} /** @@ -60,12 +98,14 @@ var queryData = {}; queryData['province'] = $("#province").val(); queryData['city'] =$("#city").val(); + queryData['time'] =$("#time").val(); WorldCupRecords.table1.refresh({query: queryData}); }; WorldCupRecords.resetSearch1 = function () { $("#province").val(""); $("#city").val(""); + $("#time").val(""); WorldCupRecords.search1(); }; @@ -82,20 +122,22 @@ WorldCupRecords.search3 = function () { var queryData = {}; - queryData['province'] = $("#province").val(); - queryData['city'] =$("#city").val(); + queryData['phone'] = $("#phone").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',}, @@ -130,21 +172,25 @@ table2.setPaginationType("server"); WorldCupRecords.table2 = table2.init(); - // var defaultColunms3 = [ - // {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', - // formatter:function (data) { - // return data + '%'; - // } - // }, - // ]; - // var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/listAll", defaultColunms3); - // table3.setPaginationType("server"); - // WorldCupRecords.table3 = table3.init(); + var defaultColunms3 = [ + {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: '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/getUserGameRecordList", defaultColunms3); + table3.setPaginationType("server"); + WorldCupRecords.table3 = table3.init(); }); -- Gitblit v1.7.1