Skip to content

C
confucius
Commit 9c6b3d33 authored by 罗超's avatar 罗超
Browse files
Options

更新备课相关

parent 51aea3d8
Show whitespace changes
Inline Side-by-side
Showing with 346 additions and 249 deletions
src/App.vue
View file @ 9c6b3d33
...@@ -13,7 +13,9 @@ export default { ...@@ -13,7 +13,9 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_1f7iels6h8w.css'); @import url('//at.alicdn.com/t/font_2077629_1f7iels6h8w.css');
.q-scrollarea__thumb{
z-index: 999999!important;
}
html, html,
body, body,
#q-app { #q-app {
......
src/layouts/MainLayout.vue
View file @ 9c6b3d33
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<div class="col" style="background: #f2f4f7;"> <div class="col" style="background: #f2f4f7;">
<q-scroll-area class="fit" :thumb-style="thumbStyle" :bar-style="barStyle" visible style=""> <q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" visible class="fit content-scroll full-width full-height">
<router-view /> <router-view />
</q-scroll-area> </q-scroll-area>
</div> </div>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<style> <style>
@import url('~assets/css/common.css'); @import url('~assets/css/common.css');
.full-width { .content-scroll>.scroll>.full-width {
height: 100%; height: 100%;
} }
......
src/pages/course/lessonPreparation.vue
View file @ 9c6b3d33
...@@ -182,15 +182,28 @@ ...@@ -182,15 +182,28 @@
line-height: unset !important; line-height: unset !important;
letter-spacing: unset !important; letter-spacing: unset !important;
} }
</style> </style>
<template> <template>
<div class="row"> <div class="row full-height">
<div class="page-body lessonPreparation" style="width:40%" v-if="chapter"> <div class="page-body lessonPreparation" style="width:40%;height: calc(100% - 30px) !important;">
<div class="prepareTopTitle q-table__title"> <q-scroll-area
:thumb-style="thumbStyle"
:content-style="contentStyle"
:content-active-style="contentActiveStyle"
class="full-width full-height"
>
<div class="row">
<div class="prepareTopTitle q-table__title col">
<div class="prePare_Line"></div>
<div>{{courseName}}</div>
</div>
<div class="prepareTopTitle q-table__title" v-if="chapters && chapters.length>0">
<div class="prePare_Line"></div> <div class="prePare_Line"></div>
<div>{{chapter.CourseName}}</div> <div>{{chapters[0].ChapterName}}</div>
</div>
</div> </div>
<div v-if="chapters && chapters.length>0">
<div v-for="(chapter,i) in chapters[0].ChildList">
<div class="preSecond"> <div class="preSecond">
{{chapter.ChapterName}} {{chapter.ChapterName}}
</div> </div>
...@@ -215,8 +228,17 @@ ...@@ -215,8 +228,17 @@
</div> </div>
<div class="prePare_Content text-center q-pa-lg" style="background:#FBF6F0" v-else>暂无内容</div> <div class="prePare_Content text-center q-pa-lg" style="background:#FBF6F0" v-else>暂无内容</div>
</div> </div>
<div class="page-body lessonPreparation row col"> </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 lessonPreparation row 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"
>
<div> <div>
<div class="lessTop">备课编辑</div> <div class="lessTop">备课编辑</div>
<div style="margin:20px 0;"> <div style="margin:20px 0;">
...@@ -270,13 +292,14 @@ ...@@ -270,13 +292,14 @@
</div> </div>
</div> </div>
<div style="margin-top:30px;" v-if="isShowEdit"> <div style="margin-top:30px;">
<span class="beikeModule" @click="saveInfo(1)">存为模板</span> <span class="beikeModule" @click="saveInfo(1)">存为模板</span>
<q-btn label="提交" size="md" color="accent q-px-md" @click="saveInfo(0)" /> <q-btn label="提交" size="md" color="accent q-px-md" @click="saveInfo(0)" />
</div> </div>
<lessoncheck-form v-if="IsShowLessForm" @close="closeTeachSaveForm" @success="refreshPage"> <lessoncheck-form v-if="IsShowLessForm" @close="closeTeachSaveForm" @success="refreshPage">
</lessoncheck-form> </lessoncheck-form>
</div> </div>
</q-scroll-area>
</div> </div>
</div> </div>
</template> </template>
...@@ -299,6 +322,15 @@ export default { ...@@ -299,6 +322,15 @@ export default {
}, },
data() { data() {
return { return {
contentStyle: {},
contentActiveStyle: {},
thumbStyle: {
right: '2px',
borderRadius: '5px',
backgroundColor: '#027be3',
width: '5px',
opacity: 0.75
},
msg: { msg: {
ClassId: 0, ClassId: 0,
School_Id: 0, School_Id: 0,
...@@ -321,7 +353,8 @@ export default { ...@@ -321,7 +353,8 @@ export default {
}, },
IsShowLessForm: false, IsShowLessForm: false,
nowDate: '', nowDate: '',
chapter: null, chapters: null,
courseName:"",
isShowEdit: false, //是否显示提交按钮 isShowEdit: false, //是否显示提交按钮
} }
}, },
...@@ -350,9 +383,16 @@ export default { ...@@ -350,9 +383,16 @@ export default {
console.log(res.Data) console.log(res.Data)
if (res.Code == 1) { if (res.Code == 1) {
let data = res.Data; let data = res.Data;
if (data.Chapter) { if (data.Chapter && data.Chapter.length>0) {
this.chapter = data.Chapter if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){
console.log(data.Chapter[0].ChildList.length)
data.Chapter[0].ChildList=[]
data.Chapter[0].ChildList.push(data.Chapter[0])
}
this.chapters = data.Chapter
} }
this.courseName=data.CourseName
// this.addMsg.CourseNum = data.CourseNum; // this.addMsg.CourseNum = data.CourseNum;
this.addMsg.ClassId = data.ClassId; this.addMsg.ClassId = data.ClassId;
this.addMsg.School_Id = data.School_Id; this.addMsg.School_Id = data.School_Id;
......
src/pages/course/prepareclassDetails.vue
View file @ 9c6b3d33
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
} }
.prepareclassDetails .comment { .prepareclassDetails .comment {
height: 600px;
overflow: auto;
padding: 0 15px; padding: 0 15px;
} }
...@@ -218,39 +216,60 @@ ...@@ -218,39 +216,60 @@
<template> <template>
<div class="row prepareclassDetails"> <div class="row prepareclassDetails">
<div class="page-body col" v-if="data.Chapter"> <div class="page-body col" style="height: calc(100% - 30px) !important;" v-if="data.Chapter">
<div class="prepareTopTitle q-table__title"> <q-scroll-area
:thumb-style="thumbStyle"
:content-style="contentStyle"
:content-active-style="contentActiveStyle"
class="full-width full-height"
>
<div class="row">
<div class="prepareTopTitle q-table__title col">
<div class="prePare_Line"></div>
<div>{{data.CourseName}}</div>
</div>
<div class="prepareTopTitle q-table__title" v-if="data.Chapter && data.Chapter.length>0">
<div class="prePare_Line"></div> <div class="prePare_Line"></div>
<div>{{data.Chapter.CourseName}}</div> <div>{{data.Chapter[0].ChapterName}}</div>
</div>
</div> </div>
<div v-if="data.Chapter && data.Chapter.length>0">
<div v-for="(chapter,i) in data.Chapter[0].ChildList">
<div class="preSecond"> <div class="preSecond">
{{data.Chapter.ChapterName}} {{chapter.ChapterName}}
</div> </div>
<div class="prepareTopTitle q-table__title"> <div class="prepareTopTitle q-table__title">
<div class="prePare_Line" style="background-color:#2961FE"></div> <div class="prePare_Line" style="background-color:#2961FE"></div>
<div>章节学习内容</div> <div>章节学习内容</div>
</div> </div>
<div class="prePare_Content" v-if="data.Chapter.ChapterContent!=''" <div class="prePare_Content" v-if="chapter.ChapterContent!=''" v-html="decodeURIComponent(chapter.ChapterContent)"></div>
v-html="decodeURIComponent(data.Chapter.ChapterContent)"></div>
<div class="prePare_Content text-center q-pa-lg" v-else>暂无内容</div> <div class="prePare_Content text-center q-pa-lg" v-else>暂无内容</div>
<div class="prepareTopTitle q-table__title"> <div class="prepareTopTitle q-table__title">
<div class="prePare_Line" style="background-color:#2961FE"></div> <div class="prePare_Line" style="background-color:#2961FE"></div>
<div>教学目标</div> <div>教学目标</div>
</div> </div>
<div class="prePare_Content" style="background:#F7F0FB" v-if="data.Chapter.Objectives!=''" <div class="prePare_Content" style="background:#F7F0FB" v-if="chapter.Objectives!=''" v-html="decodeURIComponent(chapter.Objectives)">
v-html="decodeURIComponent(data.Chapter.Objectives)">
</div> </div>
<div class="prePare_Content text-center q-pa-lg" style="background:#F7F0FB" v-else>暂无内容</div> <div class="prePare_Content text-center q-pa-lg" style="background:#F7F0FB" v-else>暂无内容</div>
<div class="prepareTopTitle q-table__title"> <div class="prepareTopTitle q-table__title">
<div class="prePare_Line" style="background:#2961FE"></div> <div class="prePare_Line" style="background:#2961FE"></div>
<div>学生学习要求</div> <div>学生学习要求</div>
</div> </div>
<div class="prePare_Content" style="background:#FBF6F0" v-if="data.Chapter.Requirement!=''" <div class="prePare_Content" style="background:#FBF6F0" v-if="chapter.Requirement!=''" v-html="decodeURIComponent(chapter.Requirement)">
v-html="decodeURIComponent(data.Chapter.Requirement)">
</div> </div>
<div class="prePare_Content text-center q-pa-lg" style="background:#FBF6F0" v-else>暂无内容</div> <div class="prePare_Content text-center q-pa-lg" style="background:#FBF6F0" v-else>暂无内容</div>
</div> </div>
<div class="page-body col"> </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"
>
<div class="q-table__title">备课内容</div> <div class="q-table__title">备课内容</div>
<div style="width: 100%;"> <div style="width: 100%;">
<div class="row" style="margin-top: 10px;align-items: center"> <div class="row" style="margin-top: 10px;align-items: center">
...@@ -336,12 +355,16 @@ ...@@ -336,12 +355,16 @@
课后总结 课后总结
</div> </div>
</div> </div>
<template v-if="LessonPlanNum>0&&LessonPlanSummaryNum>0"> <template v-if="(LessonPlanNum>0&&LessonPlanSummaryNum>0) || this.data.LessonPlanList[0].Summary!=''">
<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 style="display:flex;flex-wrap: wrap;margin-top:20px;">
<div v-if="ImgList.length>0" v-for="(item,index) in ImgList"> <div v-if="ImgList.length>0" v-for="(item,index) in ImgList">
<div class="pre-ImgDiv"> <div class="pre-ImgDiv">
<q-img :src="item" spinner-color="white" style="height: 100%;height:100%" /> <el-image
style="height: 100%;height:100%"
:src="item"
fit="cover"
:preview-src-list="ImgList"></el-image>
</div> </div>
</div> </div>
</div> </div>
...@@ -351,7 +374,12 @@ ...@@ -351,7 +374,12 @@
<div style="display:flex;flex-wrap: wrap;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 v-if="ImgList.length>0" v-for="(item,index) in ImgList">
<div class="pre-ImgDiv"> <div class="pre-ImgDiv">
<q-img :src="item" spinner-color="white" style="height: 100%;height:100%" />
<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 <q-btn size="7px" @click="deleteItemImg(index)" style="position:absolute;right:-5px;top:-5px;" round
color="red" icon="iconfont icon-guanbi1" /> color="red" icon="iconfont icon-guanbi1" />
</div> </div>
...@@ -369,11 +397,19 @@ ...@@ -369,11 +397,19 @@
<!-- <q-btn color="accent" size="sm" class="q-mr-md marginl-15 margint-15" label="提交" @click="saveOrderInfo()" <!-- <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" /> --> :loading="Dloading" v-if="(AccountType==false&&data.IsEditSummary<=0)&&isUpData" /> -->
</div> </div>
</q-scroll-area>
</div> </div>
<div class="col-3" <div class="col-3"
style="position: relative;overflow: hidden;border-radius: 6px;background: #FFF;margin: 5px;height: 800px"> 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> <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% - 161px);"
>
<div class="comment"> <div class="comment">
<div class="row" <div class="row"
style="width: 100%;height: 50px;align-items: center;justify-content: center;font-size: 16px;color: #999999" style="width: 100%;height: 50px;align-items: center;justify-content: center;font-size: 16px;color: #999999"
...@@ -402,6 +438,7 @@ ...@@ -402,6 +438,7 @@
</div> </div>
</div> </div>
</div> </div>
</q-scroll-area>
<!-- 评论区域--> <!-- 评论区域-->
<div class="pl column"> <div class="pl column">
<div class="row" style="align-items: center"> <div class="row" style="align-items: center">
...@@ -443,6 +480,15 @@ ...@@ -443,6 +480,15 @@
name: "prepareclassDetails", name: "prepareclassDetails",
data() { data() {
return { return {
contentStyle: {},
contentActiveStyle: {},
thumbStyle: {
right: '2px',
borderRadius: '5px',
backgroundColor: '#027be3',
width: '5px',
opacity: 0.75
},
msg: { msg: {
ClassId: 0, ClassId: 0,
School_Id: 0, School_Id: 0,
...@@ -529,8 +575,16 @@ ...@@ -529,8 +575,16 @@
getList() { getList() {
getClassLessPlan(this.msg).then(res => { getClassLessPlan(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.data = res.Data; let data=res.Data;
console.log(this.data, 'data'); if (data.Chapter && data.Chapter.length>0) {
if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){
console.log(data.Chapter[0].ChildList.length)
data.Chapter[0].ChildList=[]
data.Chapter[0].ChildList.push(data.Chapter[0])
}
this.chapters = data.Chapter
}
this.data = data;
this.plmsg.TeacherId = res.Data.UpdateBy; this.plmsg.TeacherId = res.Data.UpdateBy;
var beginTimes = this.nowDate.replace(/-/g, "/"); //当前 var beginTimes = this.nowDate.replace(/-/g, "/"); //当前
var endTimes = this.data.ClassEndTime.replace(/-/g, "/"); //结束 var endTimes = this.data.ClassEndTime.replace(/-/g, "/"); //结束
...@@ -545,6 +599,7 @@ ...@@ -545,6 +599,7 @@
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.conclusion = this.data.LessonPlanList[0].Summary;
this.ImgList = this.data.LessonPlanList[0].ProjectPicList; this.ImgList = this.data.LessonPlanList[0].ProjectPicList;
this.isShowBtn=false
} }
} }
}) })
......
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