Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
38e01f4d
Commit
38e01f4d
authored
Jul 16, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
3f5153e2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
199 additions
and
117 deletions
+199
-117
class.js
src/api/course/class.js
+14
-3
stopLessonForm.vue
src/components/teacher/stopLessonForm.vue
+0
-1
prepareclassDetails.vue
src/pages/course/prepareclassDetails.vue
+181
-112
teacherLesson.vue
src/pages/course/teacherLesson.vue
+4
-1
No files found.
src/api/course/class.js
View file @
38e01f4d
...
...
@@ -399,7 +399,7 @@ export function GetTeacherClassHours(data) {
* 班级月度课耗
* @param {JSON参数} data
*/
export
function
getClassMonthStatistics
(
data
)
{
export
function
getClassMonthStatistics
(
data
)
{
return
request
({
url
:
'/finance/GetClassMonthStatistics'
,
method
:
'post'
,
...
...
@@ -411,7 +411,7 @@ export function GetTeacherClassHours(data) {
* 教师奖励 获取课时费老师列表
* @param {JSON参数} data
*/
export
function
getTeachingRewardsSendEmployeeList
(
data
)
{
export
function
getTeachingRewardsSendEmployeeList
(
data
)
{
return
request
({
url
:
'/TeachingRewards/GetTeachingRewardsSendEmployeeList'
,
method
:
'post'
,
...
...
@@ -422,10 +422,21 @@ export function GetTeacherClassHours(data) {
* 教师奖励 设置 老师已发放
* @param {JSON参数} data
*/
export
function
setTeachingRewardsSendEmployee
(
data
)
{
export
function
setTeachingRewardsSendEmployee
(
data
)
{
return
request
({
url
:
'/TeachingRewards/SetTeachingRewardsSendEmployee'
,
method
:
'post'
,
data
})
}
/**
* 教师奖励 设置 老师已发放
* @param {JSON参数} data
*/
export
function
delLessonComment
(
data
)
{
return
request
({
url
:
'/class/DelLessonComment'
,
method
:
'post'
,
data
})
}
\ No newline at end of file
src/components/teacher/stopLessonForm.vue
View file @
38e01f4d
...
...
@@ -64,7 +64,6 @@
this
.
msg
.
OrderGuestId
=
this
.
setObj
.
Id
this
.
msg
.
OldStudentStatus
=
this
.
setObj
.
GuestState
}
console
.
log
(
57
,
this
.
msg
)
},
methods
:
{
closeSaveForm
()
{
...
...
src/pages/course/prepareclassDetails.vue
View file @
38e01f4d
...
...
@@ -209,20 +209,27 @@
margin
:
0
10px
10px
0
;
display
:
inline-block
;
}
.Pre-ComBg
{
.Pre-ComBg
{
background-color
:
#e8e8e8
;
}
</
style
>
<
template
>
<div
class=
"row prepareclassDetails"
>
<div
class=
"page-body col"
style=
"height: calc(100% - 30px) !important;"
v-if=
"data.Chapter"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width full-height"
>
<!--
<div
class=
"page-body col"
style=
"height: calc(100% - 30px) !important;"
v-if=
"data.Chapter"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width full-height"
>
</q-scroll-area>
</div>
-->
<div
class=
"page-body col"
style=
"height: calc(100% - 30px) !important;"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width full-height"
>
<q-expansion-item
expand-separator
:header-style=
"headStyle"
label=
"章节内容"
caption=
""
>
<q-card>
<q-card-section>
<div
class=
"row"
>
<div
class=
"prepareTopTitle q-table__title col"
>
<div
class=
"prePare_Line"
></div>
...
...
@@ -242,34 +249,31 @@
<div
class=
"prePare_Line"
style=
"background-color:#2961FE"
></div>
<div>
章节学习内容
</div>
</div>
<div
class=
"prePare_Content"
v-if=
"chapter.ChapterContent!=''"
v-html=
"decodeURIComponent(chapter.ChapterContent)"
></div>
<div
class=
"prePare_Content"
v-if=
"chapter.ChapterContent!=''"
v-html=
"decodeURIComponent(chapter.ChapterContent)"
></div>
<div
class=
"prePare_Content text-center q-pa-lg"
v-else
>
暂无内容
</div>
<div
class=
"prepareTopTitle q-table__title"
>
<div
class=
"prePare_Line"
style=
"background-color:#2961FE"
></div>
<div>
教学目标
</div>
</div>
<div
class=
"prePare_Content"
style=
"background:#F7F0FB"
v-if=
"chapter.Objectives!=''"
v-html=
"decodeURIComponent(chapter.Objectives)"
>
<div
class=
"prePare_Content"
style=
"background:#F7F0FB"
v-if=
"chapter.Objectives!=''"
v-html=
"decodeURIComponent(chapter.Objectives)"
>
</div>
<div
class=
"prePare_Content text-center q-pa-lg"
style=
"background:#F7F0FB"
v-else
>
暂无内容
</div>
<div
class=
"prepareTopTitle q-table__title"
>
<div
class=
"prePare_Line"
style=
"background:#2961FE"
></div>
<div>
学生学习要求
</div>
</div>
<div
class=
"prePare_Content"
style=
"background:#FBF6F0"
v-if=
"chapter.Requirement!=''"
v-html=
"decodeURIComponent(chapter.Requirement)"
>
<div
class=
"prePare_Content"
style=
"background:#FBF6F0"
v-if=
"chapter.Requirement!=''"
v-html=
"decodeURIComponent(chapter.Requirement)"
>
</div>
<div
class=
"prePare_Content text-center q-pa-lg"
style=
"background:#FBF6F0"
v-else
>
暂无内容
</div>
</div>
</div>
<div
v-else
class=
"q-pa-lg bg-grey-2 rounded-borders q-my-lg"
>
暂无章节信息
</div>
</q-scroll-area>
</div>
<div
class=
"page-body col"
style=
"height: calc(100% - 30px) !important;"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width full-height"
>
</q-card-section>
</q-card>
</q-expansion-item>
<div
class=
"q-table__title"
>
备课内容
</div>
<div
style=
"width: 100%;"
>
<div
class=
"row"
style=
"margin-top: 10px;align-items: center"
>
...
...
@@ -294,18 +298,19 @@
</div>
<div
class=
"marginl-15 margint-15 "
>
<div
class=
"text-title"
>
教学目标
</div>
<div
class=
"margint-15 row"
style=
"align-items: flex-start"
v-for=
"(item,index) in data.LessonPlanList"
:key=
"index"
v-if=
"index==0"
>
<div
class=
"margint-15 row"
style=
"align-items: flex-start"
v-for=
"(item,index) in data.LessonPlanList"
:key=
"index"
v-if=
"index==0"
>
<div
class=
"text14-o q-pa-md Pre-ComBg rounded-borders"
style=
"flex:1"
>
{{
item
.
CourseTitle
}}
</div>
</div>
</div>
<div
class=
"marginl-15 margint-15 "
>
<div
class=
"text-title"
>
教学难点
</div>
<div
class=
"margint-15"
style=
"align-items: flex-start"
v-for=
"(item,index) in data.LessonPlanList"
:key=
"index"
v-if=
"index==0"
>
<div
class=
"margint-15"
style=
"align-items: flex-start"
v-for=
"(item,index) in data.LessonPlanList"
:key=
"index"
v-if=
"index==0"
>
<!--
<div
class=
"text12-n width50"
>
{{
item
.
CourseName
}}
:
</div>
-->
<div
class=
"text14-o q-pa-md Pre-ComBg rounded-borders"
v-for=
"(x,y) in item.LessonPlanProjectsList"
:key=
"y"
v-if=
"x.ProjectContent!=''"
>
<div
class=
"text14-o q-pa-md Pre-ComBg rounded-borders"
v-for=
"(x,y) in item.LessonPlanProjectsList"
:key=
"y"
v-if=
"x.ProjectContent!=''"
>
<div
v-html=
"x.ProjectContent"
>
</div>
...
...
@@ -351,22 +356,22 @@
<div
class=
"beike-jan"
>
<div
class=
"jan-l"
></div>
</div>
<div
class=
"row flex"
style=
"font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont;justify-content:space-between;flex-grow:2"
>
<div
class=
"row flex"
style=
"font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont;justify-content:space-between;flex-grow:2"
>
<div>
课后总结
</div>
<q-btn
color=
"accent"
size=
"sm"
v-if=
"data.FanKuiStatus===1&&data.TotalScore===0&&isShowBtn"
@
click=
"modify"
>
修改
</q-btn>
<q-btn
color=
"accent"
size=
"sm"
v-if=
"data.FanKuiStatus===1&&data.TotalScore===0&&isShowBtn"
@
click=
"modify"
>
修改
</q-btn>
</div>
</div>
<!-- <template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0"> -->
<
template
v-if=
"(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify"
>
<q-input
type=
"textarea"
filled
label=
"课后总结"
v-model=
"conclusion"
:rows=
"3"
style=
"flex:1;margin-top:20px;"
/>
<q-input
type=
"textarea"
filled
label=
"课后总结"
v-model=
"conclusion"
:rows=
"3"
style=
"flex:1;margin-top:20px;"
/>
<div
style=
"display:flex;flex-wrap: wrap;margin-top:20px;"
>
<div
v-if=
"ImgList.length>0"
v-for=
"(item,index) in ImgList"
>
<div
class=
"pre-ImgDiv"
>
<el-image
style=
"height: 100%;height:100%"
:src=
"item"
fit=
"cover"
:preview-src-list=
"ImgList"
></el-image>
<el-image
style=
"height: 100%;height:100%"
:src=
"item"
fit=
"cover"
:preview-src-list=
"ImgList"
>
</el-image>
<q-btn
size=
"7px"
@
click=
"deleteItemImg(index)"
style=
"position:absolute;right:-5px;top:-5px;"
round
color=
"red"
icon=
"iconfont icon-guanbi1"
/>
</div>
...
...
@@ -378,38 +383,32 @@
</div>
</
template
>
<
template
v-else
>
<div
class=
"text14-o q-pa-md Pre-ComBg rounded-borders"
style=
"margin-top:10px;background-color:rgb(251, 246, 240)"
>
{{
conclusion
}}
</div>
<div
class=
"text14-o q-pa-md Pre-ComBg rounded-borders"
style=
"margin-top:10px;background-color:rgb(251, 246, 240)"
>
{{
conclusion
}}
</div>
<div
style=
"display:flex;flex-wrap: wrap;margin-top:20px;"
>
<div
v-if=
"ImgList.length>0"
v-for=
"(item,index) in ImgList"
>
<div
class=
"pre-ImgDiv"
>
<el-image
style=
"height: 100%;height:100%"
:src=
"item"
fit=
"cover"
:preview-src-list=
"ImgList"
></el-image>
<el-image
style=
"height: 100%;height:100%"
:src=
"item"
fit=
"cover"
:preview-src-list=
"ImgList"
>
</el-image>
</div>
</div>
</div>
</
template
>
</div>
<q-btn
color=
"accent"
size=
"sm"
v-if=
"(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify"
class=
"margint-15"
@
click=
"saveOrderInfo()"
style=
"margin:20px 0 0 15px;width:97%;height:40px;"
label=
"提交"
/>
<q-btn
color=
"accent"
size=
"sm"
v-if=
"(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify"
class=
"margint-15"
@
click=
"saveOrderInfo()"
style=
"margin:20px 0 0 15px;width:97%;height:40px;"
label=
"提交"
/>
<!-- <q-btn color="accent" size="sm" class="q-mr-md marginl-15 margint-15" label="提交" @click="saveOrderInfo()"
:loading="Dloading" v-if="(AccountType==false&&data.IsEditSummary<=0)&&isUpData" /> -->
</div>
</q-scroll-area>
</div>
<div
class=
"col-
3
"
<div
class=
"col-
5
"
style=
"position: relative;overflow: hidden;border-radius: 6px;background: #FFF;margin: 5px;height: calc(100% - 30px) !important;"
>
<div
class=
"q-table__title"
style=
"padding: 15px;"
>
评价
</div>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width"
style=
"height:calc(100% - 251px);"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:content-style=
"contentStyle"
:content-active-style=
"contentActiveStyle"
class=
"full-width"
style=
"height:calc(100% - 251px);"
>
<div
class=
"comment"
>
<div
class=
"row"
style=
"width: 100%;height: 50px;align-items: center;justify-content: center;font-size: 16px;color: #999999"
...
...
@@ -432,6 +431,23 @@
{{item.CreateTimeStr}}
</span>
</div>
<div
v-if=
"item.CreateBy===loginId"
>
<el-tooltip
placement=
"top"
content=
"删除"
v-if=
"item.Score==-1"
>
<q-btn
round
flat
dense
@
click=
"delComment(item.LessonCommentId)"
>
<
template
slot=
"default"
>
<i
class=
"iconfont icon-shanchu"
></i>
</
template
>
</q-btn>
</el-tooltip>
<el-tooltip
placement=
"top"
content=
"修改"
class=
"q-ml-xs"
>
<q-btn
round
flat
dense
@
click=
"modifyComment(item)"
>
<
template
slot=
"default"
>
<i
class=
"iconfont icon-xiugai1"
></i>
</
template
>
</q-btn>
</el-tooltip>
</div>
</div>
<div
class=
"c-i-Comment"
>
{{item.Comment}}
...
...
@@ -454,8 +470,8 @@
</div>
<div
class=
"row"
style=
"margin-top: 20px;align-items: center"
>
<q-input
filled
v-model=
"plmsg.Comment"
label=
"写下你想评价的内容"
type=
"textarea"
style=
"flex:1"
/>
<img
src=
"../../assets/images/course/fasong.png"
alt=
""
style=
"width: 35px;height: 35px;margin-left: 20px;cursor:pointer;"
@
click=
"btnpl()"
>
<img
src=
"../../assets/images/course/fasong.png"
alt=
""
style=
"width: 35px;height: 35px;margin-left: 20px;cursor:pointer;"
@
click=
"btnpl()"
>
</div>
</div>
...
...
@@ -471,7 +487,8 @@
getLessonCommentList
,
setLessonComment
,
updateClassLessPlan
,
GetNowUserLessonComment
GetNowUserLessonComment
,
delLessonComment
}
from
'../../api/course/class'
;
import
{
UploadSelfFile
,
...
...
@@ -480,6 +497,7 @@
name
:
"prepareclassDetails"
,
data
()
{
return
{
loginId
:
0
,
contentStyle
:
{},
contentActiveStyle
:
{},
thumbStyle
:
{
...
...
@@ -496,6 +514,7 @@
},
Dloading
:
false
,
plmsg
:
{
LessonCommentId
:
0
,
Comment
:
''
,
Score
:
5
,
LessonPlanId
:
0
,
...
...
@@ -516,20 +535,27 @@
isUpData
:
true
,
conclusion
:
''
,
//课后总结
ImgList
:
[],
//总结图片数组
LessonPlanNum
:
0
,
LessonPlanSummaryNum
:
0
,
TeacherId
:
0
,
isShowBtn
:
false
,
isModify
:
false
,
LessonPlanNum
:
0
,
LessonPlanSummaryNum
:
0
,
TeacherId
:
0
,
isShowBtn
:
false
,
isModify
:
false
,
headStyle
:
{
'font-size'
:
'16px'
,
'font-family'
:
'perfectFont'
,
'color'
:
'#000000'
,
'font-weight'
:
'bold'
,
'letter-spacing'
:
'.005em'
,
'padding-left'
:
'0'
}
}
},
created
()
{
let
data
=
JSON
.
parse
(
localStorage
.
getItem
(
"loginUserInfo"
))
this
.
loginId
=
data
.
data
.
Id
console
.
log
(
556
,
this
.
loginId
)
},
mounted
()
{
this
.
msg
.
ClassId
=
this
.
$route
.
query
.
ClassId
?
this
.
$route
.
query
.
ClassId
:
0
;
this
.
msg
.
ClassPlanId
=
this
.
$route
.
query
.
ClassPlanId
?
this
.
$route
.
query
.
ClassPlanId
:
0
;
this
.
plmsg
.
ClassId
=
this
.
$route
.
query
.
ClassId
?
this
.
$route
.
query
.
ClassId
:
0
;
...
...
@@ -545,10 +571,10 @@
let
userInfo
=
this
.
getLocalStorage
();
this
.
AccountType
=
userInfo
.
AccountType
==
2
?
false
:
true
;
//是否是教师
let
AccountId
=
userInfo
.
AccountId
;
if
(
AccountId
==
this
.
TeacherId
)
{
this
.
isShowBtn
=
true
;
}
else
{
this
.
isShowBtn
=
false
;
if
(
AccountId
==
this
.
TeacherId
)
{
this
.
isShowBtn
=
true
;
}
else
{
this
.
isShowBtn
=
false
;
}
this
.
getList
()
//备课内容
this
.
getCommentList
()
//评价
...
...
@@ -565,9 +591,9 @@
},
methods
:
{
//是否能修改总结
modify
(){
modify
()
{
// this.isModify=true
this
.
isModify
=
!
this
.
isModify
this
.
isModify
=
!
this
.
isModify
},
//获取评论显示分数
getUserComment
()
{
...
...
@@ -581,10 +607,10 @@
getList
()
{
getClassLessPlan
(
this
.
msg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
let
data
=
res
.
Data
;
if
(
data
.
Chapter
&&
data
.
Chapter
.
length
>
0
)
{
if
(
!
data
.
Chapter
[
0
].
ChildList
||
data
.
Chapter
[
0
].
ChildList
.
length
==
0
)
{
data
.
Chapter
[
0
].
ChildList
=
[]
let
data
=
res
.
Data
;
if
(
data
.
Chapter
&&
data
.
Chapter
.
length
>
0
)
{
if
(
!
data
.
Chapter
[
0
].
ChildList
||
data
.
Chapter
[
0
].
ChildList
.
length
==
0
)
{
data
.
Chapter
[
0
].
ChildList
=
[]
data
.
Chapter
[
0
].
ChildList
.
push
(
data
.
Chapter
[
0
])
}
this
.
chapters
=
data
.
Chapter
...
...
@@ -600,7 +626,7 @@
if
(
a
>
0
)
{
this
.
isUpData
=
false
;
}
if
(
this
.
data
.
LessonPlanList
&&
this
.
data
.
LessonPlanList
.
length
>
0
)
{
if
(
this
.
data
.
LessonPlanList
&&
this
.
data
.
LessonPlanList
.
length
>
0
)
{
this
.
conclusion
=
this
.
data
.
LessonPlanList
[
0
].
Summary
;
this
.
ImgList
=
this
.
data
.
LessonPlanList
[
0
].
ProjectPicList
;
// this.isShowBtn=false
...
...
@@ -649,16 +675,17 @@
})
this
.
plmsg
.
Score
=
5
;
this
.
plmsg
.
Comment
=
''
;
this
.
plmsg
.
LessonCommentId
=
0
;
this
.
getUserComment
()
this
.
getCommentList
()
if
(
this
.
data
.
TotalScore
===
0
)
{
if
(
this
.
data
.
TotalScore
===
0
)
{
this
.
getList
()
}
}
})
},
saveOrderInfo
()
{
if
(
this
.
data
.
LessonPlanList
&&
this
.
data
.
LessonPlanList
.
length
>
0
)
{
if
(
this
.
data
.
LessonPlanList
&&
this
.
data
.
LessonPlanList
.
length
>
0
)
{
this
.
data
.
LessonPlanList
[
0
].
Summary
=
this
.
conclusion
;
this
.
data
.
LessonPlanList
[
0
].
ProjectPicList
=
this
.
ImgList
;
}
...
...
@@ -689,6 +716,48 @@
//删除图片
deleteItemImg
(
index
)
{
this
.
ImgList
.
splice
(
index
,
1
);
},
//删除评论
delComment
(
id
)
{
let
that
=
this
this
.
$q
.
dialog
({
title
:
'提示信息'
,
message
:
"是否要删除该条评论"
,
cancel
:
true
,
persistent
:
true
,
ok
:
"确定"
,
cancel
:
"取消"
,
}).
onOk
(()
=>
{
delLessonComment
({
LessonCommentId
:
id
}).
then
(
res
=>
{
if
(
res
.
Code
===
1
)
{
that
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
res
.
Message
,
position
:
'top'
})
that
.
getCommentList
();
}
else
{
that
.
$q
.
notify
({
type
:
'negative'
,
position
:
"top"
,
message
:
res
.
Message
,
})
}
})
}).
onCancel
(()
=>
{
});
},
//修改评论
modifyComment
(
item
){
console
.
log
(
item
)
this
.
plmsg
.
LessonCommentId
=
item
.
LessonCommentId
this
.
plmsg
.
Comment
=
item
.
Comment
this
.
plmsg
.
Score
=
item
.
Score
this
.
Score
=
item
.
Score
}
}
}
...
...
src/pages/course/teacherLesson.vue
View file @
38e01f4d
...
...
@@ -333,6 +333,9 @@
<span
class=
"beikeBtn"
v-if=
"AccountType&&item1.LessonPlanNum===0"
@
click=
"goBeike(item1)"
>
备课
</span>
<span
style=
"color:#3FC4FF;font-size:12px;cursor:pointer"
v-if=
"item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0"
@
click=
"goyibeike(item1)"
>
已反馈
</span>
<span
style=
"color:#FFA800;font-size:12px;"
v-if=
"item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0"
>
未反馈
</span>
<span
style=
"color:#3FC4FF;font-size:12px;margin-left:20px;cursor:pointer"
v-if=
"item1.ParentFanKuiStatus>0&&item1.LessonPlanNum>0"
@
click=
"goyibeike(item1)"
>
主管已反馈
</span>
<span
style=
"color:#FFA800;font-size:12px;margin-left:20px;"
v-if=
"item1.ParentFanKuiStatus==0&&item1.LessonPlanNum>0"
>
主管未反馈
</span>
<span
class=
"fankuiBtn"
v-if=
"AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0"
@
click=
"goyibeike(item1)"
>
反馈
</span>
</div>
</div>
...
...
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