Skip to content

G
gk
Commit a881ed79 authored by yangshuxing's avatar yangshuxing
Browse files
Options

bug修改

parent 8c2053ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 523 additions and 348 deletions
src/main/java/com/dlbridge/jadp/plugins/score/bean/CheckPoint.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.bean;
import lombok.Data;
@Data
public class CheckPoint {
private int id;
private String markNo;
private int cmptId;
private int duration;
private String createTime;
private int cpid;
//提交成绩，扫描打卡，自动打卡
private int type;
private int isDelete;
private String updateTime;
}
src/main/java/com/dlbridge/jadp/plugins/score/bean/RankVo.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.bean;
public class RankVo {
}
src/main/java/com/dlbridge/jadp/plugins/score/service/AbstractScoreRank.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service;
import com.dlbridge.jadp.plugins.score.bean.RankVo;
import java.util.List;
public class AbstractScoreRank implements IScoreRank{
IScoreService scoreService;
@Override
public List<RankVo> buildScoreRank(int cmptId) {
// 获取当前赛事的成绩规则
IScoreRule rule = null;
//rule.buildScore();
return null;
}
}
src/main/java/com/dlbridge/jadp/plugins/score/service/IScoreRank.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service;
import com.dlbridge.jadp.plugins.score.bean.RankVo;
import java.util.List;
public interface IScoreRank {
List<RankVo> buildScoreRank(int cmptId);
}
src/main/java/com/dlbridge/jadp/plugins/score/service/IScoreRule.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service;
import com.dlbridge.jadp.plugins.score.bean.ScoreRule;
public interface IScoreRule {
ScoreRule getScoreRuleByCmptId(int cmpId);
}
src/main/java/com/dlbridge/jadp/plugins/score/service/IScoreService.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service;
public interface IScoreService {
}
src/main/java/com/dlbridge/jadp/plugins/score/service/impl/BestOfMultiScoreRule.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service.impl;
public class BestOfMultiScoreRule {
}
src/main/java/com/dlbridge/jadp/plugins/score/service/impl/SingleScoreRule.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service.impl;
import com.dlbridge.jadp.plugins.score.bean.ScoreRule;
import com.dlbridge.jadp.plugins.score.service.IScoreRule;
import org.springframework.stereotype.Service;
/**
* 取第一条成绩
*
*/
@Service
public class SingleScoreRule implements IScoreRule {
@Override
public ScoreRule getScoreRuleByCmptId(int cmpId) {
return null;
}
}
src/main/java/com/dlbridge/jadp/plugins/score/service/impl/SumOfMultiScoreRule.java 0 → 100644
View file @ a881ed79
package com.dlbridge.jadp.plugins.score.service.impl;
public class SumOfMultiScoreRule {
}
src/main/webapp/WEB-INF/views/cmpt/road.jsp
View file @ a881ed79
...@@ -101,6 +101,25 @@ ...@@ -101,6 +101,25 @@
</div> </div>
<div id="map" class="map"></div> <div id="map" class="map"></div>
<div class="map-data">
<div class="flex" style="justify-content: space-between">
<label class="marker-label">标准列表</label>
<div class="flex" style="align-items: center">
<span class="cancel">取消</span>
<span class="save">保存</span>
<span class="edit">编辑</span>
</div>
</div>
<div class="markers">
<label for="" class="marker-name"></label>
<span class="marker-tip">用作计时点</span>
</div>
<div class="markers-edit">
<span style="font-size: 12px;color: rgba(153,153,153,1);display: inline-block; width: 100%; text-align: right;">用作<br/>计时点</span>
</div>
</div>
</div> </div>
...@@ -108,6 +127,5 @@ ...@@ -108,6 +127,5 @@
</div> </div>
</body> </body>
<script type="text/javascript" src="${ctxStatic}/js/road.js"></script>
<script type="text/javascript" src="${ctxStatic}/js/road-new.js"></script> <script type="text/javascript" src="${ctxStatic}/js/road-new.js"></script>
</html> </html>
src/main/webapp/WEB-INF/views/cmpt/scan.jsp
View file @ a881ed79
...@@ -34,122 +34,55 @@ ...@@ -34,122 +34,55 @@
<link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css"> <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
<link rel="stylesheet" href="/static/cmpt/score.css?<%=System.currentTimeMillis()%>"> <link rel="stylesheet" href="/static/cmpt/score.css?<%=System.currentTimeMillis()%>">
<style> <style>
.data{ .title{
width: 100%; width: 192px;
margin: 20px 0px; height: 33px;
background: #FFFFFF; font-size: 24px;
position: relative; font-family: PingFangSC-Medium,PingFang SC;
} font-weight: 500;
color: rgba(51,51,51,1);
line-height: 33px;
}
.road-name{ .road-name{
font-size: 20px; width: 860px;
color: #999999;
line-height: 65px;
padding: 0px 27px;
cursor: pointer;
height: 65px;
border-radius: 0px 4px 0px 0px;
border: 1px solid rgba(229,229,229,1);
position: relative;
min-width: 170px;
text-align: center;
}
.road-name.active{
color: #ce3939;
border-bottom: 1px solid white;
}
table{
width: 96%;
padding: 0px 2%;
}
table thead th{
padding-left: 26px;
}
table thead th td{
font-size: 12px;
color: #f3f3f3;
}
table tbody tr{
background: rgba(250,250,250,1);
height: 70px; height: 70px;
border-bottom: 5px solid white;
border-radius: 5px;
}
table tbody tr td{
padding-left: 26px;
}
.road{
display: flex;
border-bottom: 1px solid #f4f4f4;
}
.select-group{
position: relative;
width: 200px;
}
.select{
text-transform: none;
width: 200px;
height: 40px;
padding: 0px 5px;
border-radius: 4px;
background: rgba(250,250,250,1); background: rgba(250,250,250,1);
border: none;
outline: none;
appearance:none;
-moz-appearance:none;
-webkit-appearance:none;
cursor: pointer;
}
.load{
width: 146px;
height: 40px;
background: rgba(206,57,57,1);
border-radius: 4px; border-radius: 4px;
color: white; line-height: 70px;
display: inline-block; padding: 0px 40px 0px 20px;
line-height: 40px; margin-bottom: 10px;
position: absolute; display: flex;
right: 35px; align-items: center;
top: 72px; justify-content: space-between;
text-align: center;
font-size: 18px;
cursor: pointer;
} }
.QRCodeDown{ .road-text{
width:146px; width:93px;
height:40px; height:28px;
border-radius:4px; font-size:20px;
border:1px solid rgba(206,57,57,1); font-family:PingFangSC-Medium,PingFang SC;
font-size:16px; font-weight:500;
font-family:PingFangSC-Regular,PingFang SC; color:rgba(51,51,51,1);
font-weight:400; line-height:28px;
}
.down{
width:105px;
height:21px;
font-size:15px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(206,57,57,1); color:rgba(206,57,57,1);
line-height:22px;
position: absolute;
cursor: pointer; cursor: pointer;
text-align: center; line-height:21px;
padding-top: 8px;
right: 200px;
top: 72px;
}
.no-route-icon{
width: 16px;
height: 16px;
background: url("/static/images/warning.png");
background-size: contain;
background-position: center;
background-repeat: no-repeat;
} }
.data label{
.noroute{ height: 22px;
display: none;
position: absolute;
width: 140px;
font-size: 16px; font-size: 16px;
bottom: -32px; font-family: PingFangSC-Medium,PingFang SC;
height: 65px; font-weight: 500;
left: 50%; color: rgba(153,153,153,1);
margin-left: -69px; line-height: 22px;
margin: 10px 0px;
padding: 0px 20px;
} }
</style> </style>
</head> </head>
...@@ -158,59 +91,17 @@ ...@@ -158,59 +91,17 @@
<div class="page-content d-flex align-items-stretch main-body"> <div class="page-content d-flex align-items-stretch main-body">
<jsp:include page="../common/menu.jsp"></jsp:include> <jsp:include page="../common/menu.jsp"></jsp:include>
<div class="rght"> <div class="rght">
<div class="title-new">
<span class="title">扫码打卡</span>
<div style="line-height: 22px">
<span class="road-notice"></span>
<span class="road-notice-txt">此功能仅适用于线下自助赛</span>
</div>
</div>
<div class="section"> <div class="section">
<h3 class="title">设置打卡点</h3> <h3 class="title">打卡点二维码下载</h3>
<div style="line-height: 22px">
<span class="road-notice"></span>
<span class="road-notice-txt">仅比赛日之前可修改；所有项目和打卡点设置源自计时设置</span>
</div>
<div class="data"> <div class="data">
<div class="road"> <label for="">项目</label>
<c:forEach var="item" items="${roads}" varStatus="idx"> <c:forEach var="item" items="${roads}" varStatus="idx">
<div class="road-name ${idx.index==0?'active':''}" road-id="${item.roadId}"> <div class="road-name ${idx.index==0?'active':''}" road-id="${item.roadId}">
<input type="hidden" id="roadId" name="roadId" value="${item.roadId}"> <input type="hidden" id="roadId" name="roadId" value="${item.roadId}">
<span>${item.name}</span> <span class="road-text">${item.name}</span>
</div> <span class="down QRCodeDown">下载全部二维码</span>
</c:forEach> </div>
</div> </c:forEach>
<span class="QRCodeDown">下载全部二维码</span>
<span class="load">导入路线</span>
<div class="noroute">
<span class="no-route-icon"></span>
<span class="no-route">未检索到标记点</span>
</div>
<table>
<thead>
<tr>
<th style="width: 120px">打卡点</th><th style="width: 120px">路线标注</th><th>经纬度</th>
</tr>
</thead>
<tbody>
<%--
<tr>
<td>终点</td>
<td>
<div class="select-group">
<select name="" class="select">
<option value="">-- --</option>
<option value="">1</option>
</select>
<span class="down-arrow"></span>
</div>
</td>
<td>121.12193,39.1929182</td>
</tr>--%>
</tbody>
</table>
</div> </div>
</div> </div>
<div style="display: flex;justify-content: center; margin: 60px;"> <div style="display: flex;justify-content: center; margin: 60px;">
......
src/main/webapp/static/cmpt/road-new.css
View file @ a881ed79
...@@ -163,7 +163,7 @@ nav.side-navbar .sidebar-header ...@@ -163,7 +163,7 @@ nav.side-navbar .sidebar-header
} }
.edit-new { .edit-new {
cursor: pointer;
} }
.back { .back {
......
src/main/webapp/static/cmpt/road.css
View file @ a881ed79
...@@ -66,16 +66,146 @@ ...@@ -66,16 +66,146 @@
.map-container { .map-container {
border-radius: 4px; border-radius: 4px;
/*height: 450px;*/
position: relative; position: relative;
transition: all 0.5s; transition: all 0.5s;
} }
.map { .map {
height: 450px; width: 710px;
height:450px;
margin-top: 110px; margin-top: 110px;
float: left;
}
.marker{
height: 40px;
line-height: 40px;
display: flex;
justify-content: space-between;
position: relative;
}
.marker input[type=checkbox] {
position: relative;
top: 16px;
right: 4px;
left: auto;
}
.marker input[type=text]{
width: 220px;
height: 50px;
background: rgba(247,247,247,1);
border-radius: 4px;
border: 1px solid rgba(238,238,238,1);
padding: 0px 10px 0px;
}
.marker input[type=checkbox]:checked::before {
background-color: #ce3939;
content: '';
background-image: url(/static/images/white.png);
top: -4px;
right: -3px;
width: 18px;
height: 18px;
position: absolute;
background-size: 90%;
background-repeat: no-repeat;
background-position: center;
}
.markers-edit .marker{
margin: 10px 0px 20px;
}
.marker input[type=checkbox]::before {
content: '';
position: absolute;
top: -4px;
right: -3px;
width: 18px;
height: 18px;
line-height: 22px;
text-align: center;
color: white;
font-size: 16px;
background-color: #ffffff;
border-radius: 4px;
cursor: pointer;
border: 1px solid #ce3939;
}
.marker-name{
font-size: 20px;
color: #333;
width: 195px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.marker-tip{
font-size:12px;
font-weight:500;
color:rgba(153,153,153,1);
}
.marker-label{
width: 80px;
height: 28px;
font-size: 20px;
font-family: PingFangSC-Medium,PingFang SC;
font-weight: 500;
color: rgba(51,51,51,1);
line-height: 28px;
margin: 0px;
}
.map-data{
width:300px;
height:450px;
background:rgba(255,255,255,1);
float: right;
margin-top: 110px;
overflow: scroll;
box-sizing: border-box;
padding: 15px 10px 30px 15px;
-ms-overflow-style: none; //IE 10+
overflow: -moz-scrollbars-none; //Firefox
}
.map-data .edit{
width: 70px;
height: 22px;
border-radius: 4px;
border: 1px solid rgba(206,57,57,1);
font-size: 16px;
color: rgba(206,57,57,1);
cursor: pointer;
line-height: 22px;
text-align: center;
}
.map-data .save{
display: none;
width: 70px;
height: 22px;
border-radius: 4px;
border: 1px solid rgba(206,57,57,1);
font-size: 16px;
color: rgba(206,57,57,1);
cursor: pointer;
line-height: 22px;
text-align: center;
}
.markers-edit{
display: none;
}
.map-data .cancel{
display: none;
width: 70px;
height: 22px;
border-radius: 4px;
border:1px solid rgba(102,102,102,1);
font-size: 16px;
color:rgba(102,102,102,1);
cursor: pointer;
line-height: 22px;
text-align: center;
margin-right: 10px;
}
.map-data::-webkit-scrollbar {
display: none; //Safari and Chrome
} }
.map-title { .map-title {
z-index: 9999999; z-index: 9999999;
position: absolute; position: absolute;
......
src/main/webapp/static/cmpt/setting.css
View file @ a881ed79
...@@ -9,7 +9,7 @@ body { ...@@ -9,7 +9,7 @@ body {
.rght { .rght {
width: 80%; width: 80%;
margin: 44px 0px 0px 40px; margin: 0px 0px 0px 40px;
} }
.wzm-content { .wzm-content {
......
src/main/webapp/static/js/road-new.js
View file @ a881ed79
...@@ -100,6 +100,32 @@ $(document).ready(function () { ...@@ -100,6 +100,32 @@ $(document).ready(function () {
}) })
}); });
$('body').on('click','.map-data .edit',function () {
$(this).hide();
$('.save').fadeIn();
$('.cancel').fadeIn();
$('.markers').fadeOut();
$('.markers-edit').fadeIn();
});
$('body').on('click','.map-data .cancel',function () {
$('.save').hide();
$('.cancel').hide();
$('.markers').fadeIn();
$('.markers-edit').fadeOut();
$('.edit').show();
})
$('body').on('click','.map-data .save',function () {
$('.save').hide();
$('.cancel').hide();
$('.markers').fadeIn();
$('.markers-edit').fadeOut();
$('.edit').show();
// 更新数据
/*$.ajax({
})*/
})
}) })
//文件上传处理 //文件上传处理
...@@ -265,6 +291,16 @@ function getPath(roadId) { ...@@ -265,6 +291,16 @@ function getPath(roadId) {
map.initMap(); map.initMap();
if (data.status && data.content) { if (data.status && data.content) {
createPath(data.content); createPath(data.content);
if(data.content){
var points = JSON.parse(data.content.points);
console.log(JSON.stringify(points))
$.each(points.placeMark,function (i,e) {
$('.markers').append('<div class="marker"><label for="" class="marker-name">'+e.name+'</label>\n' +
' <span class="marker-tip">用作计时点</span></div>');
$('.markers-edit').append('<div class="marker"><input data-before="'+e.name+'" type="text" value="'+e.name+'"> <input type="checkbox"></div>');
})
}
} }
} }
}) })
......
src/main/webapp/static/newdermon/css/custom.css
View file @ a881ed79
/* your styles go here */ /* your styles go here */
.main-body { .main-body {
margin: 20px auto 0px; margin: 20px auto 0px;
width: 1200px; width: 1300px;
} }
.maincolor { .maincolor {
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
left: 365px; left: 365px;
height: 91px; height: 91px;
border-left: 1px solid #e8e8e8; border-left: 1px solid #e8e8e8;
top:0px;
} }
.line-first { .line-first {
......
src/main/webapp/static/newdermon/css/style.default.css
View file @ a881ed79
...@@ -392,15 +392,11 @@ input { ...@@ -392,15 +392,11 @@ input {
* ========================================================== * ==========================================================
*/ */
nav.side-navbar { nav.side-navbar {
margin-top: 84px;
background: #fff0; background: #fff0;
min-width: 250px; min-width: 250px;
max-width: 280px; max-width: 280px;
color: #686a76; color: #686a76;
z-index: 9; z-index: 9;
/*==== Sidebar Header ====*/
/*==== Sidebar Menu ====*/
/*==== Shrinked Sidebar ====*/
} }
nav.side-navbar a { nav.side-navbar a {
...@@ -473,20 +469,23 @@ nav.side-navbar ul { ...@@ -473,20 +469,23 @@ nav.side-navbar ul {
} }
nav.side-navbar ul li { nav.side-navbar ul li {
/* submenu item active */ height: 49px;
list-style: none;
} }
nav.side-navbar ul li a { nav.side-navbar ul li a {
padding: 13px 46px; align-items: center;
text-decoration: none; text-decoration: none;
display: block; display: flex;
font-weight: 300; justify-content: center;
border-left: 4px solid transparent; border-left: 4px solid transparent;
font-size: 20px; font-size: 17px;
font-family: PingFangSC; font-family: PingFangSC;
font-weight: 500; font-weight: 500;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
line-height: 28px; line-height: 49px;
height: 49px;
position: relative;
} }
nav.side-navbar ul li a:hover { nav.side-navbar ul li a:hover {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment