liujie
2023-07-26 bbb24e3522797a1e4285958ee41b7d0ee82854fc
后台代码
2 文件已重命名
4个文件已修改
2个文件已删除
299 ■■■■■ 已修改文件
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/resources/mapper/MenuMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/log/log.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/carInsurance.js 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/carInsuranceInfo.js 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -82,17 +82,7 @@
        Integer language = UserExt.getLanguage();
        List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
        List<MenuNode> titles = MenuNode.buildTitle(menus);
        if(language==1 || language==null){
        }else if(language==2){
            for (MenuNode menu : menus) {
                menu.setName(menu.getEname());
            }
        }else if(language==3){
            for (MenuNode menu : menus) {
                menu.setName(menu.getBname());
            }
        }
cloud-server-management/src/main/resources/mapper/MenuMapper.xml
@@ -150,9 +150,7 @@
        m1.url as url,
        m1.levels as levels,
        m1.ismenu as ismenu,
        m1.num as num,
        m1.ename ename,
        m1.bname bname
        m1.num as num
        FROM
        sys_menu m1
        LEFT join sys_menu m2 ON m1.pcode = m2. CODE
cloud-server-management/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -25,9 +25,7 @@
                        </div>
                        <div class="hidden-xs" id="OptLogTableToolbar" role="group">
                            <#button name="查看详情" icon="fa-plus" clickFun="OptLog.detail()"/>
                            @if(shiro.hasPermission("/log/delLog")){
                                <#button name="清空日志" icon="fa-plus" clickFun="OptLog.delLog()" space="true"/>
                            @}
                        </div>
                        <#table id="OptLogTable"/>
                    </div>
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
@@ -4,52 +4,54 @@
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>车辆管理</h5>
                <h5>赛事管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#TimeCon id="createTime" name="添加时间" isTime="false"/>
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="id" name="车辆ID" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="brandName" name="车辆品牌" />
                                <#NameCon id="shopName" name="门店名称" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="modelName" name="车辆类型" />
                                <#NameCon id="eventName" name="赛事名称" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="carColor" name="车辆颜色" />
                                <#TimeCon id="createTime" name="时间" isTime="false"/>
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="serverStr" name="服务模式" />
                                <#SelectCon id="state" name="状态" >
                                    <option value="">全部</option>
                                    <option value="1">未开始</option>
                                    <option value="2">已开始</option>
                                    <option value="3">已结束</option>
                                    <option value="4">已取消</option>
                                 </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="carLicensePlate" name="车牌号" />
                            </div>
                            <div class="col-sm-3">
                                <#NameCon id="driverName" name="关联司机" />
                                <#SelectCon id="registerCondition" name="报名条件" >
                                    <option value="">全部</option>
                                    <option value="1">全部用户</option>
                                    <option value="2">仅限年度会员参与</option>
                                    <option value="3">仅限学员参与</option>
                                 </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
                            </div>
                            <div class="col-sm-3">
                                <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TCar.exportCar()">
                            </div>
                        </div>
                        <div class="hidden-xs" id="TCarTableToolbar" role="group">
                            <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/>
                            <#button name="修改" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
                            <#button name="删除" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
                            <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TCar.uploadCarModel()" space="true"/>
                            <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
                            <#button name="导出" icon="fa-remove" clickFun="TCar.outCar()" space="true"/>
                            <#button name="编辑" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
                            <#button name="取消" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
                            <#button name="查看详情" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
                            <#button name="已报名人员" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
                        </div>
                        <#table id="TCarTable"/>
@@ -59,7 +61,7 @@
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/tCar/tCar.js"></script>
<script src="${ctxPath}/modular/system/tCompetition/tCompetition.js"></script>
<script>
    laydate.render({
        elem: '#createTime'
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/carInsurance.js
File was deleted
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/carInsuranceInfo.js
File was deleted
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js