Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
Project
Project
Details
Activity
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
1f128bc6
Commit
1f128bc6
authored
Mar 24, 2023
by
耿迪迪
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage
parents
76972593
dda68bd7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
14 deletions
+26
-14
TTrainCourseServiceImpl.java
...m/zehong/system/service/impl/TTrainCourseServiceImpl.java
+1
-1
Lesson.vue
...ws/educationPlanExam/lessonsProgram/components/Lesson.vue
+1
-1
index.vue
...c/views/educationPlanExam/myLessons/CheckLesson/index.vue
+21
-9
LearnItem.vue
...iews/educationPlanExam/myLessons/components/LearnItem.vue
+3
-3
No files found.
danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java
View file @
1f128bc6
...
...
@@ -207,7 +207,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
public
List
<
UserCourseVo
>
userCourseList
(
Long
userId
,
Integer
type
){
List
<
UserCourseVo
>
list
=
tTrainCourseMapper
.
userCourseList
(
userId
,
type
,
1
);
for
(
UserCourseVo
v
:
list
){
if
(
v
.
getTestEndTime
()!=
null
&&
v
.
getTestEndTime
().
getTime
()<
new
Date
().
getTime
()){
if
(
v
.
getTestEndTime
()!=
null
&&
v
.
getTestEndTime
().
getTime
()<
new
Date
().
getTime
()
&&
v
.
getState
()!=
2
){
v
.
setState
(
3
);
}
if
(
v
.
getTestStartTime
()!=
null
&&
v
.
getTestStartTime
().
getTime
()>
new
Date
().
getTime
()){
...
...
danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/Lesson.vue
View file @
1f128bc6
...
...
@@ -172,7 +172,7 @@ export default {
enclosure
:
""
,
isVeriftyFace
:
"2"
},
fileType
:
[
"
doc"
,
"docx"
,
"xls"
,
"xlsx"
,
"ppt"
,
"txt"
,
"
pdf"
],
fileType
:
[
"pdf"
],
fileListVideo
:
[],
fileListFile
:
[],
readOnly
:
false
,
...
...
danger-manage-web/src/views/educationPlanExam/myLessons/CheckLesson/index.vue
View file @
1f128bc6
...
...
@@ -84,7 +84,7 @@
</div>
</div>
<div
v-if=
"state == 2"
class=
"bt flex fz14"
>
<div
v-if=
"state == 2
&&lessonData.topicNum!=0
"
class=
"bt flex fz14"
>
<div
class=
"a"
>
考试结果
</div>
<div
style=
"color: #1d84ff"
class=
"b flex"
>
已完成学习,课后测试得分
{{
fenshu
}}
,成绩合格!
...
...
@@ -108,6 +108,7 @@
@
jj=
"jj"
/>
<el-dialog
:visible
.
sync=
"iframeVisible"
width=
"80%"
>
<!--
<div
v-if=
"userlessonData.state!=3"
class=
"gotime2"
>
{{
minute
}}
:
{{
calculation
(
second
)
}}
/
{{
parseInt
(
lessonData
.
duration
/
60
)
}}
:
{{
calculation
(
lessonData
.
duration
%
60
)
}}
</div>
-->
<iframe
style=
"width: 100%; height: 600px"
:src=
"ky"
></iframe>
</el-dialog>
</div>
...
...
@@ -367,12 +368,23 @@ export default {
justify-content
:flex-start
;
}
.gotime
{
background
:
#1c84c6
;
width
:
80px
;
text-align
:
center
;
line-height
:
22px
;
color
:
white
;
margin-left
:
40px
;
border-radius
:
10px
;
}
background
:
#1c84c6
;
width
:
80px
;
text-align
:
center
;
line-height
:
22px
;
color
:
white
;
margin-left
:
40px
;
border-radius
:
10px
;
}
.gotime2
{
background
:
#1c84c6
;
width
:
80px
;
text-align
:
center
;
line-height
:
22px
;
color
:
white
;
margin-left
:
20px
;
border-radius
:
10px
;
position
:
absolute
;
top
:
20px
;
}
</
style
>
danger-manage-web/src/views/educationPlanExam/myLessons/components/LearnItem.vue
View file @
1f128bc6
...
...
@@ -18,7 +18,7 @@
</div>
<div
class=
"time"
>
发布时间:
{{
itemData
.
createTime
}}
</div>
<div
class=
"bottom flex"
>
<div
v-if=
"
!itemData.state===4 ||
!(itemData.state===3 && itemData.dataKind==='1')"
@
click=
"click"
class=
"btn"
:class=
"
{ again: yesOrNo }">
<div
v-if=
"
itemData.state!=4 &&
!(itemData.state===3 && itemData.dataKind==='1')"
@
click=
"click"
class=
"btn"
:class=
"
{ again: yesOrNo }">
{{
yesOrNo
}}
</div>
</div>
...
...
@@ -71,9 +71,9 @@ export default {
if
(
this
.
itemData
.
state
===
0
){
return
'开始学习'
}
else
if
(
this
.
itemData
.
state
===
1
){
return
'
重新考试
'
return
'
查看课程
'
}
else
if
(
this
.
itemData
.
state
===
2
){
return
'
重新考试
'
return
'
查看课程
'
}
else
if
(
this
.
itemData
.
state
===
3
){
return
'开始学习'
}
else
if
(
this
.
itemData
.
state
===
4
){
...
...
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