Commit 8eade8b1 authored by yangshuxing's avatar yangshuxing

调整成绩规则,默认排序

parent afabb5ab
...@@ -377,6 +377,7 @@ ...@@ -377,6 +377,7 @@
</pluginRepositories> </pluginRepositories>
<build> <build>
<finalName>gksite</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/java</directory> <directory>src/main/java</directory>
......
...@@ -176,6 +176,9 @@ public class CmptSettingController { ...@@ -176,6 +176,9 @@ public class CmptSettingController {
count = remoteService.getCmptEnrollCount(cmptId); count = remoteService.getCmptEnrollCount(cmptId);
}else if (type == 15 || type == 16) { // 自动打卡,扫描打卡 }else if (type == 15 || type == 16) { // 自动打卡,扫描打卡
count = geexekScoreService.hasCheckPoint(cmptId); count = geexekScoreService.hasCheckPoint(cmptId);
if(count < 3){
return Result.fail().setContent(count);
}
} else { } else {
return Result.success(); return Result.success();
} }
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div class="markers-edit"> <div class="markers-edit">
<div style="display: flex"> <div style="display: flex">
<span class="edit-tip-distance">里程<br/>居起点</span> <span class="edit-tip-distance">里程<br/>距起点</span>
<span class="edit-tip-cp">用作<br/>计时点</span> <span class="edit-tip-cp">用作<br/>计时点</span>
</div> </div>
</div> </div>
......
...@@ -309,8 +309,8 @@ function getPlaceMakers(roadId) { ...@@ -309,8 +309,8 @@ function getPlaceMakers(roadId) {
url : '/gk/road//getCheckPoints/'+roadId, url : '/gk/road//getCheckPoints/'+roadId,
success:function (data) { success:function (data) {
if(data.code == 200){ if(data.code == 200){
$('.markers .marker').empty(); $('.markers .marker').remove();
$('.markers-edit .marker').empty(); $('.markers-edit .marker').remove();
if(data.content.length == 0){ if(data.content.length == 0){
layer.msg("没有标记点,请导入有标记点的路线,以免影响您的后续使用!"); layer.msg("没有标记点,请导入有标记点的路线,以免影响您的后续使用!");
return return
......
...@@ -309,7 +309,7 @@ $(document).ready(function () { ...@@ -309,7 +309,7 @@ $(document).ready(function () {
}); });
}) })
$('.export-btn').click(function () { $('.export-btn').click(function () {
window.open("http://testzs.geexek.com.cn/gk/score/export/"+getCId()) window.open("http://testzs.geexek.com.cn/geexekscore/api/v1/cmpt-score-rank/export/"+getCId())
}) })
reviewPage.getRoads(); reviewPage.getRoads();
}); });
\ No newline at end of file
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