修改bug

puzhibing

2024-03-12 05dfcfefc108e631e2c0e8ee87de2b913b7777d9

修改bug

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java

@@ -136,7 +136,7 @@
    public void exportUserStatistics(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList, HttpServletResponse response){
        worldCupGameStatisticsInfoList.setOffset(0);
        worldCupGameStatisticsInfoList.setLimit(100000);
        Map<String, Object> map = worldCupClient.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList);
        Map<String, Object> map = worldCupClient.getUserGameRecordList(worldCupGameStatisticsInfoList);
        List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("rows");

        try {
@@ -151,7 +151,7 @@
                values[i] = new String[title.length];
                values[i][0] = d.get("name").toString();
                values[i][1] = d.get("phone").toString();
                values[i][2] = d.get("idcard").toString();
                values[i][2] = null == d.get("idcard") ? "" : d.get("idcard").toString();
                values[i][3] = d.get("totalSession").toString();
                values[i][4] = d.get("win").toString() + "-" + d.get("lose").toString();
                values[i][5] = d.get("winRate").toString() + "%";

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html

@@ -222,8 +222,8 @@
    </div>
  </div>
</div>
<script src="${ctxPath}/modular/system/worldCup/worldCup_info.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<script src="${ctxPath}/modular/system/worldCup/worldCup_info.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html

@@ -224,8 +224,8 @@
    </div>
  </div>
</div>
<script src="${ctxPath}/modular/system/worldCup/worldCup_info.js"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<script src="${ctxPath}/modular/system/worldCup/worldCup_info.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupGameStatisticsListInfo.html

@@ -19,9 +19,6 @@
                <#button name="重置" icon="fa-trash" clickFun="WorldCupGameStatisticsListInfo.resetSearch()" space="true"/>
              </div>
            </div>
            <div class="hidden-xs" id="WorldCupGameStatisticsListInfoTableToolbar" role="group">
              <#button name="比赛详情" icon="fa-plus" clickFun="WorldCupGameStatisticsListInfo.openWorldCupGameStatisticsListInfo()"/>
            </div>
            <#table id="WorldCupGameStatisticsListInfoTable"/>
          </div>
        </div>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html

@@ -53,7 +53,7 @@
                  <div class="panel-body">
                    <div class="row">
                      <div class="col-sm-3">
                        <#NameCon id="name" name="用户姓名：" />
                        <#NameCon id="userName" name="用户姓名：" />
                      </div>
                      <div class="col-sm-3">
                        <#NameCon id="phone" name="联系电话：" />

 cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js

@@ -60,7 +60,7 @@
        '            <div class="form-group" >\n' +
        '                <label class="col-sm-3 control-label">*手机号：</label>\n' +
        '                <div class="col-sm-9">\n' +
        '                    <input class="form-control" id="addPhone" placeholder="请输入">' +
        '                    <input class="form-control" id="addPhone" type="text" placeholder="请输入" maxlength="11">' +
        '                </div>\n' +
        '            </div>\n' +
        '            <div class="form-group" >\n' +
@@ -95,6 +95,15 @@
            }
            if(null == addPhone || '' == addPhone){
                Feng.info("手机号不能为空");
                return
            }
            //定义正则表达式
            var reg='^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-9])|(18[0-9])|166|198|199|191|(147))\\d{8}$';
            //创建正则表达式对象
            var regExp=new RegExp(reg);
            //使用test()函数验证数据是否匹配正则表达式，匹配返回true,否则返回false
            if (!regExp.test(addPhone)) {
                Feng.info("手机号格式不正确");
                return
            }
            if(null == addProvince || '' == addProvince){
@@ -154,7 +163,7 @@
            '            <div class="form-group" >\n' +
            '                <label class="col-sm-3 control-label">*手机号：</label>\n' +
            '                <div class="col-sm-9">\n' +
            '                    <input class="form-control" id="addPhone" placeholder="请输入">' +
            '                    <input class="form-control" id="addPhone" type="text" placeholder="请输入" maxlength="11"/>' +
            '                </div>\n' +
            '            </div>\n' +
            '            <div class="form-group" >\n' +
@@ -192,6 +201,15 @@
                    Feng.info("手机号不能为空");
                    return
                }
                //定义正则表达式
                var reg='^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-9])|(18[0-9])|166|198|199|191|(147))\\d{8}$';
                //创建正则表达式对象
                var regExp=new RegExp(reg);
                //使用test()函数验证数据是否匹配正则表达式，匹配返回true,否则返回false
                if (!regExp.test(addPhone)) {
                    Feng.info("手机号格式不正确");
                    return
                }
                if (null == addProvince || '' == addProvince) {
                    Feng.info("请选择所在省");
                    return

 cloud-server-management/src/main/webapp/static/modular/system/worldCup/registeredPersonnel.js

@@ -21,7 +21,7 @@
        {title: '身份证号', field: 'idcard', visible: true, align: 'center', valign: 'middle'},
        {title: '二维码', field: '', visible: true, align: 'center', valign: 'middle',
            formatter:function (data, item) {
                return '<a href="#" onclick="RegisteredPersonnel.openQRCode(' + item.id + ', ' + item.isStudent + ',\'' + item.name + '\')">查看</a>'
                return '<a href="#" onclick="RegisteredPersonnel.openQRCode(' + item.id + ', ' + item.isStudent + ',\'' + item.name + '\')" style="color:blue;">查看</a>'
            }
        },
        {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',

 cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js

@@ -13,7 +13,7 @@
WorldCup.initColumn = function () {
    return [
        {field: 'selectItem', checkbox: true},
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: 'id', field: 'id', visible: true, 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'},

 cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsInfo.js

@@ -16,7 +16,7 @@
        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {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: '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) {

 cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js

@@ -20,7 +20,7 @@
        {title: '结果', field: 'matchResult', visible: true, align: 'center', valign: 'middle'},
        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',
            formatter:function (data) {
                return '<a href="#" onclick="WorldCupGameStatisticsListInfo.changeScore(\'' + data + '\')">修改比分</a>';
                return '<a href="#" onclick="WorldCupGameStatisticsListInfo.changeScore(\'' + data + '\')" style="color:blue;">修改比分</a>';
            }
        },
    ];
@@ -45,27 +45,28 @@
WorldCupGameStatisticsListInfo.changeScore = function (id) {
    const str = '<div class="row">\n' +
        '                <div class="form-group" style="height: 50px;">\n' +
        '                   <label class="col-sm-3 control-label">蓝方得分：</label>' +
        '                   <label class="col-sm-3 control-label" style="text-align: right;">蓝方得分：</label>' +
        '                    <div class="col-sm-8">\n' +
        '                        <input id="blue" type="number" min="0"/>\n' +
        '                        <input id="blue" class="form-control" type="number" min="0"/>\n' +
        '                    </div>\n' +
        '                </div>\n' +
        '                <div class="form-group" style="height: 50px;">\n' +
        '                   <label class="col-sm-3 control-label">红方得分：</label>' +
        '                   <label class="col-sm-3 control-label" style="text-align: right;">红方得分：</label>' +
        '                    <div class="col-sm-8">\n' +
        '                        <input id="red" type="number" min="0"/>\n' +
        '                        <input id="red" class="form-control" type="number" min="0"/>\n' +
        '                    </div>\n' +
        '                </div>\n' +
        '       </div>'
    layer.open({
        type: 1
        ,title: '修改比分'
        ,area: ['500px', '400px']
        ,area: ['500px', '300px']
        ,offset: 'auto' //具体配置参考：http://www.layui.com/doc/modules/layer.html#offset
        ,id: 'layerDemo' //防止重复弹出
        ,content: '<div style="padding: 20px">' + str + '</div>'
        ,btnAlign: 'c' //按钮居中
        ,shade: 0.5 //不显示遮罩
        ,btn: ['确认', '关闭']
        ,yes: function (){
            let blue = $('#blue').val();
            let red = $('#red').val();

 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,14 +100,15 @@
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();
};