Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
micro_app
gk
Commits
8eade8b1
Commit
8eade8b1
authored
Jul 03, 2020
by
yangshuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整成绩规则,默认排序
parent
afabb5ab
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
4 deletions
+8
-4
pom.xml
pom.xml
+1
-0
CmptSettingController.java
...dlbridge/jadp/plugins/cmpt/web/CmptSettingController.java
+3
-0
road.jsp
src/main/webapp/WEB-INF/views/cmpt/road.jsp
+1
-1
road-new.js
src/main/webapp/static/js/road-new.js
+2
-2
score_review.js
src/main/webapp/static/js/score_review.js
+1
-1
No files found.
pom.xml
View file @
8eade8b1
...
@@ -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>
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptSettingController.java
View file @
8eade8b1
...
@@ -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
();
}
}
...
...
src/main/webapp/WEB-INF/views/cmpt/road.jsp
View file @
8eade8b1
...
@@ -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>
...
...
src/main/webapp/static/js/road-new.js
View file @
8eade8b1
...
@@ -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
...
...
src/main/webapp/static/js/score_review.js
View file @
8eade8b1
...
@@ -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/g
k/score
/export/"
+
getCId
())
window
.
open
(
"http://testzs.geexek.com.cn/g
eexekscore/api/v1/cmpt-score-rank
/export/"
+
getCId
())
})
})
reviewPage
.
getRoads
();
reviewPage
.
getRoads
();
});
});
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment