liujie
12 小时以前 8830fb9e58e7e345947b06f6862cdd5b2ae6f0bf
赛事模块
4个文件已修改
1个文件已添加
195 ■■■■■ 已修改文件
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/TUserList1.html 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/addWorldCupGameStatisticsListInfo.html 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/TStoreInfo.js 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
@@ -60,6 +60,12 @@
        model.addAttribute("item", worldCupById);
        return PREFIX + "TUserList.html";
    }
    @RequestMapping("/userList1")
    public String userList1(Integer id,Model model){
        WorldCup worldCupById = worldCupClient.getWorldCupById(id);
        model.addAttribute("item", worldCupById);
        return PREFIX + "TUserList1.html";
    }
    @RequestMapping("/openWorldCupGameStatisticsListInfo")
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/TUserList1.html
New file
@@ -0,0 +1,50 @@
@layout("/common/_container.html"){
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>参赛人员</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <input type="hidden" id="id" value="${item.id}"></input>
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="userName" name="姓名:" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="phone" name="联系电话:" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="idCard" name="身份证号:" />
                            </div>
                <div class="col-sm-3">
                    <#button name="搜索" icon="fa-search" clickFun="TStoreProvince.search()"/>
                </div>
            </div>
            <div class="hidden-xs" id="TStoreProvinceTableToolbar" role="group">
            </div>
            <#table id="TStoreProvinceTable"/>
            <div style="margin-left: 30%">
                <button type="button" class="btn btn-info button-margin" onclick="TStoreProvince.storeOfClosePage()"
                        id="closePage" style="width: 30%;height: 40px;background: #0d8ddb;color: white;border: none;">
                    <i class="fa fa-check"></i>&nbsp;关闭
                </button>
                <button type="button" class="btn btn-info button-margin" onclick="TStoreProvince.saveSelectStores1()"
                        id="submit" style="margin-left: 5%;width: 30%;height: 40px;background: #0d8ddb;color: white;border: none;">
                    <i class="fa fa-check"></i>&nbsp;保存
                </button>
            </div>
        </div>
    </div>
</div>
</div>
</div>
</div>
<script src="${ctxPath}/modular/system/worldCupRecords/TStoreInfo.js"></script>
<script src="${ctxPath}/modular/system/worldCupRecords/TCouponInfo.js"></script>
@}
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/addWorldCupGameStatisticsListInfo.html
@@ -13,9 +13,11 @@
              <div class="form-group">
                <label class="col-sm-3 control-label">*比赛名称:${item.name}</label>
              </div>
              <div class="form-group">
                <label class="col-sm-3 control-label">*参赛人:</label>
                            </div>
                            <div class="form-group">
                <div class="col-sm-12">
                  <label class="col-sm-3 control-label">红方: </label>
                  <button onclick="userList()"
@@ -24,7 +26,8 @@
                  </button>
                </div>
                <div class="col-sm-12" style="margin-left: -57px;margin-top: 20px">
                  <table class="table table-bordered" style="width: 70%;margin-left: 228px;" id="userTableOne">
                                    <table class="table table-bordered" style="width: 70%;margin-left: 228px;"
                                           id="userTableOne">
                    <thead>
                    <tr>
                      <td>id</td>
@@ -39,12 +42,64 @@
                  </table>
                </div>
              </div>
                            <div class="form-group">
                                <div class="col-sm-12">
                                    <label class="col-sm-3 control-label">蓝方: </label>
                                    <button onclick="userList1()"
                                            style="height: 22px;width: 82px;background-color: #4a8ff1;color: white;z-index: 15;position:relative;border: none;margin-top: 1%">
                                        选择人员
                                    </button>
                                </div>
                                <div class="col-sm-12" style="margin-left: -57px;margin-top: 20px">
                                    <table class="table table-bordered" style="width: 70%;margin-left: 228px;"
                                           id="userTableTwo">
                                        <thead>
                                        <tr>
                                            <td>id</td>
                                            <td>人员</td>
                                            <td>联系电话</td>
                                            <td>性别</td>
                                            <td>年龄</td>
                                            <td>操作</td>
                                        </tr>
                                        </thead>
                                        <tbody id="coun1"></tbody>
                                    </table>
                                </div>
                            </div>
                            <div class="form-group">
                                <div class="col-sm-12" >
                                    <label class="col-sm-1 control-label">*比赛时间:</label>
                                    <div class="col-sm-4">
                                        <input type="text" class="form-control" id="time" name="time"
                                               placeholder="请选择时间">
                                    </div>
                                </div>
            </div>
<!--                        蓝方得分-->
                        <div class="form-group">
                            <div class="col-sm-12" style="margin-top: 10px">
                                <label class="col-sm-1 control-label">*蓝方得分:</label>
                                <div class="col-sm-2">
                                    <input type="text" class="form-control" id="blueScore" name="blueScore"
                                           placeholder="请输入蓝方得分">
                                </div>
                            </div>
                        </div>
                        <div class="form-group">
                            <div class="col-sm-12" style="margin-top: 10px">
                                <label class="col-sm-1 control-label">*红方得分:</label>
                                <div class="col-sm-2">
                                    <input type="text" class="form-control" id="redScore" name="redScore"
                                           placeholder="请输入红方得分">
                                </div>
                            </div>
                        </div>
                        </div>
          </div>
        </div>
@@ -60,6 +115,11 @@
  laydate.render({
    elem: '#endTime'
  });
    laydate.render({
        elem: '#time'
        ,type: 'datetime'
        ,range: true
    });
  function userList() {
@@ -73,5 +133,16 @@
    });
    this.layerIndex = index;
  }
    function userList1() {
        var index = layer.open({
            type: 2,
            title: '人员列表',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/worldCupRecords/userList1?id=' + $("#id").val()
        });
        this.layerIndex = index;
    }
</script>
@}
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/TStoreInfo.js
@@ -68,6 +68,30 @@
    window.parent.WorldCupGameStatisticsListInfo.selecUserOpt(arr);
    TStoreProvince.storeOfClosePage();
}
TStoreProvince.saveSelectStores1 = function (){
    var selected = $('#' + this.id).bootstrapTable('getSelections');
    if (selected.length == 0) {
        Feng.info("请先选中表格中的某一记录!");
        return false;
    }
    var arr = [];
    var name ='';
    for(var i in selected){
        if(typeof selected[i].id != "undefined"){
            console.log( selected[i].id,55555)
            name =  selected[0].accountName
            arr.push({
                id: selected[i].id,
                name: typeof selected[i].name != "undefined" ? selected[i].name : "",
                phone: typeof selected[i].phone != "undefined" ? selected[i].phone : "",
                sex: typeof selected[i].sex != "undefined" ? selected[i].sex : "",
                age:typeof selected[i].age != "undefined" ? selected[i].age : "",
            })
        }
    }
    window.parent.WorldCupGameStatisticsListInfo.selecUserOpt1(arr);
    TStoreProvince.storeOfClosePage();
}
TStoreProvince.storeOfClosePage = function (){
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupGameStatisticsListInfo.js
@@ -7,6 +7,7 @@
    table: null,
    layerIndex: -1,
    storeIds: [],
    storeIds1: [],
};
/**
@@ -103,12 +104,15 @@
};
WorldCupGameStatisticsListInfo.selecUserOpt = function (arrays){
    console.log(3333)
    //获取所有的值
    var subArr= this.storeIds;
    $(".timeClass").each(function () {
        subArr.push($(this).find("input[name*='id']").val());
    });
    let size = subArr.length
    console.log(size)
    var str = '';
    for(var i in arrays){
        var b = true;
@@ -134,6 +138,38 @@
    console.log(this.siteIds)
    $("#coun").append(str);
}
WorldCupGameStatisticsListInfo.selecUserOpt1 = function (arrays){
    console.log(3333)
    //获取所有的值
    var subArr= this.storeIds1;
    $(".timeClass").each(function () {
        subArr.push($(this).find("input[name*='id']").val());
    });
    var str = '';
    for(var i in arrays){
        var b = true;
        for(var j in subArr){
            if(arrays[i].id === Number(subArr[j])){
                b = false;
                break
            }
        }
        if(b){
            this.storeIds1.push(arrays[i].id)
            str += '<tr class="timeClass">' +
                '<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="id" name="id" value="'+arrays[i].id+'">' + arrays[i].id + '</td>' +
                '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name + '</td>' +
                '<td><input type="hidden" id="phone" name="phone" value="'+arrays[i].phone+'">' + arrays[i].phone +
                '<td><input type="hidden" id="sex" name="sex" value="'+arrays[i].sex+'">' + arrays[i].sex +
                '<td><input type="hidden" id="age" name="age" value="'+arrays[i].age+'">' + arrays[i].age +
                '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
        }
    }
    console.log("添加门店后的场地数组和门店数组")
    console.log(this.storeIds1)
    console.log(this.siteIds)
    $("#coun1").append(str);
}
function deleteSub(e) {
    console.log(e);
    var row = $(e).closest('tr');