Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents f7f93691 51aea3d8
Hide whitespace changes
Inline Side-by-side
Showing with 734 additions and 390 deletions
src/api/course/class.js
View file @ f97efb7c
...@@ -151,7 +151,7 @@ export function queryClassLogPageList(data) { ...@@ -151,7 +151,7 @@ export function queryClassLogPageList(data) {
*/ */
export function GetTeacherPlan(data) { export function GetTeacherPlan(data) {
return request({ return request({
url: "/Class/GetTeacherPlan", url: "/Class/GetNewTeacherPlan",
method: 'post', method: 'post',
data data
}) })
...@@ -191,7 +191,7 @@ export function setLessonComment(data) { ...@@ -191,7 +191,7 @@ export function setLessonComment(data) {
*/ */
export function updateClassLessPlan(data) { export function updateClassLessPlan(data) {
return request({ return request({
url: "/Class/UpdateClassLessPlan", url: "/Class/GetUpdateClassLessPlanSummary",
method: 'post', method: 'post',
data data
}) })
......
src/components/course/class-form.vue
View file @ f97efb7c
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
 </q-field>  </q-field>
</div> </div>
</div> </div>
<div class="EmpLine_title" style="margin:10px 0;"> <div class="EmpLine_title" style="margin-top:20px">
<div class="Emp_Line"></div> <div class="Emp_Line"></div>
<div>上课设置</div> <div>上课设置</div>
</div> </div>
...@@ -287,12 +287,38 @@ ...@@ -287,12 +287,38 @@
<a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;position:absolute;">删除</a> <a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;position:absolute;">删除</a>
</td> </td>
<td> <td>
<q-input filled stack-label maxlength="20" v-model="sItem.StartTime" placeholder="08:30" <q-input filled v-model="sItem.StartTime" class="col-6 q-pl-lg" placeholder="开始时间" mask="time">
:dense="false" class="col-6 q-pr-lg" label="开始时间" /> <template v-slot:append>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="sItem.StartTime">
<div class="row items-center justify-end">
<q-btn v-close-popup label="确定" color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.StartTime" placeholder="08:30"
:dense="false" class="col-6 q-pr-lg" label="开始时间" /> -->
</td> </td>
<td> <td>
<q-input filled stack-label maxlength="20" v-model="sItem.EndTime" placeholder="09:30" :dense="false" <q-input filled v-model="sItem.EndTime" class="col-6 q-pr-lg" placeholder="结束时间" mask="time">
class="col-6 q-pr-lg" label="结束时间" /> <template v-slot:append>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="sItem.EndTime">
<div class="row items-center justify-end">
<q-btn v-close-popup label="确定" color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.EndTime" placeholder="09:30" :dense="false"
class="col-6 q-pr-lg" label="结束时间" /> -->
</td> </td>
<td> <td>
<q-input filled stack-label maxlength="20" v-model="sItem.TimeHour" <q-input filled stack-label maxlength="20" v-model="sItem.TimeHour"
...@@ -321,9 +347,9 @@ ...@@ -321,9 +347,9 @@
</q-select> </q-select>
</div> </div>
</div> </div>
<div class="row wrap" style="margin-top:30px;"> <div class="row wrap">
<div class="col-12"> <div class="col-12">
<q-input filled stack-label maxlength="2000" v-model="objOption.InnerRemark" :dense="false" <q-input filled type="textarea" :rows="3" stack-label maxlength="2000" v-model="objOption.InnerRemark" :dense="false"
class="col-12 q-pr-lg q-pb-lg" label="对内备注" /> class="col-12 q-pr-lg q-pb-lg" label="对内备注" />
</div> </div>
</div> </div>
......
src/components/global/user-right-box.vue
View file @ f97efb7c
...@@ -144,9 +144,9 @@ export default { ...@@ -144,9 +144,9 @@ export default {
this.$emit('close') this.$emit('close')
}, },
goUrlgeren(){//个人资料 goUrlgeren(){//个人资料
// this.$router.push({ this.$router.push({
// path: '/user/personalData', path: '/user/personalData',
// }) })
}, },
undefinedGongneng() { undefinedGongneng() {
this.$q.dialog({ this.$q.dialog({
......
src/components/user/summaryInfo.vue
View file @ f97efb7c
...@@ -54,6 +54,50 @@ ...@@ -54,6 +54,50 @@
border-radius: 6px; border-radius: 6px;
padding: 20px; padding: 20px;
} }
.summaryInfo .textbox{
width: 100%;
height: 130px;
border-radius: 20px;
font-size: 16px;
padding-left: 29px;
padding-top: 29px;
}
.summaryInfo .lanstyle{
color: #3699FF;
background: #ECF6FF;
}
.summaryInfo .redstyle{
color: #F44E60;
background: #FFEEF0;
}
.summaryInfo .justyle{
color: #FFA800;
background: #FFF8EB;
}
.summaryInfo .lvstyle{
color: #1BC5C2;
background: #EEFEFD;
}
.summaryInfo .scrollbox::-webkit-scrollbar {
width: 3px;
height: 3px;
background-color: #F5F5F5;
}
/*!*定义滚动条轨道 内阴影+圆角*!*/
.summaryInfo .scrollbox::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*!*定义滑块 内阴影+圆角*!*/
.summaryInfo .scrollbox::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae;
}
</style> </style>
<template> <template>
<div class="summaryInfo"> <div class="summaryInfo">
...@@ -68,7 +112,7 @@ ...@@ -68,7 +112,7 @@
<span class="box_t_itext">公告</span> <span class="box_t_itext">公告</span>
</div> </div>
</div> </div>
<div <div class="scrollbox"
style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"> style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;">
<div v-for="(item,index) in noticeList" :key='index' class="noticeitem" <div v-for="(item,index) in noticeList" :key='index' class="noticeitem"
@click="goNoticeDetail(item)"> @click="goNoticeDetail(item)">
...@@ -107,7 +151,7 @@ ...@@ -107,7 +151,7 @@
<span class="box_t_itext">消息</span> <span class="box_t_itext">消息</span>
</div> </div>
</div> </div>
<div <div class="scrollbox"
style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;"> style="margin-top: 10px;background: #fff;height: 368px; width: 100%;overflow-y: auto;cursor: pointer;padding: 2px;">
<q-list v-if="socektArr.length>0"> <q-list v-if="socektArr.length>0">
<q-item class="q-my-sm q-pa-xs items-start" v-for="(x,i) in socektArr" :key="i" <q-item class="q-my-sm q-pa-xs items-start" v-for="(x,i) in socektArr" :key="i"
...@@ -146,6 +190,39 @@ ...@@ -146,6 +190,39 @@
</div> </div>
</div> </div>
<div id="main" style="width: 100%;height:300px;"> </div> <div id="main" style="width: 100%;height:300px;"> </div>
<div style="width: 100%;margin-top: 30px;">
<el-row :gutter="30">
<el-col :span="12">
<div class="lanstyle textbox">
<div>未完款订单</div>
<div style="font-size: 38px;font-weight: 800;">2</div>
</div>
</el-col>
<el-col :span="12">
<div class="redstyle textbox">
<div>课程进度未达标</div>
<div style="font-size: 38px;font-weight: 800;">1</div>
</div>
</el-col>
</el-row>
</div>
<div style="width: 100%;margin-top: 30px;">
<el-row :gutter="30">
<el-col :span="12">
<div class="justyle textbox">
<div>本月预计</div>
<div style="font-size: 26px;font-weight: 800;margin-top: 20px;">￥865</div>
</div>
</el-col>
<el-col :span="12">
<div class="lvstyle textbox">
<div>账单情况</div>
<div style="font-size: 20px;font-weight: 800;margin-top: 20px">已出单</div>
</div>
</el-col>
</el-row>
</div>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
......
src/pages/course/lessonPreparation.vue
View file @ f97efb7c
...@@ -165,13 +165,24 @@ ...@@ -165,13 +165,24 @@
} }
.prePare_Content { .prePare_Content {
width: 430px; /* width: 430px; */
min-height: 100px; min-height: 100px;
height: auto; height: auto;
background-color: #F0F5FB; background-color: #F0F5FB;
padding: 20px; padding: 20px;
margin: 20px auto; margin: 20px auto;
} }
.prePare_Content h6,
.prePare_Content h5,
.prePare_Content h4,
.prePare_Content h3,
.prePare_Content h2,
.prePare_Content h1{
font-size: unset !important;
line-height: unset !important;
letter-spacing: unset !important;
}
</style> </style>
<template> <template>
<div class="row"> <div class="row">
...@@ -213,7 +224,7 @@ ...@@ -213,7 +224,7 @@
教案名称：<el-input v-model="addMsg.LessonPlan" placeholder="教案名称" class="w260"></el-input> 教案名称：<el-input v-model="addMsg.LessonPlan" placeholder="教案名称" class="w260"></el-input>
<span style="margin-left:30px;">第 <span style="margin-left:30px;">第
<el-input v-model="addMsg.CourseNum" style="margin:0 5px;" placeholder="第几课" @keyup.native="checkInteger(addMsg,'CourseNum')" class="w60"></el-input>课</span> <el-input v-model="addMsg.CourseNum" style="margin:0 5px;" placeholder="第几课" @keyup.native="checkInteger(addMsg,'CourseNum')" class="w60"></el-input>课</span>
<span style="float:right;display:inline-block;"> <span style="float:right;display:inline-block;margin-left:20px;">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="选择模板" @click="getModule()" /> <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="选择模板" @click="getModule()" />
</span> </span>
</div> </div>
...@@ -228,21 +239,21 @@ ...@@ -228,21 +239,21 @@
</div> </div>
</div> </div>
<div class="teach_Content"> <div class="teach_Content">
指導内容 教学目标
</div> </div>
<div style="" v-for="(item,index) in addMsg.LessonPlanList"> <div style="" v-for="(item,index) in addMsg.LessonPlanList" v-if="index==0">
<q-input filled stack-label maxlength="50" v-model="item.CourseTitle" :dense="false" class="col-12 q-pb-lg" :label="item.CourseName+'項目'" /> <q-input filled stack-label maxlength="50" v-model="item.CourseTitle" :dense="false" class="col-12 q-pb-lg" label="教学目标" />
</div> </div>
<div class="teach_Content"> <div class="teach_Content">
指導項目 教学难点
</div> </div>
<div style="" v-for="(item,index) in addMsg.LessonPlanList"> <div style="" v-for="(item,index) in addMsg.LessonPlanList" v-if="index==0">
<div style="margin-top: 10px">{{item.CourseName}}</div> <!-- <div style="margin-top: 10px">{{item.CourseName}}</div> -->
<UeEditor class="col-8" v-model="item.LessonPlanProjectsList[0].ProjectContent" :config="config"></UeEditor> <UeEditor class="col-8" v-model="item.LessonPlanProjectsList[0].ProjectContent" :config="config"></UeEditor>
</div> </div>
<div style="" v-for="(item,index) in addMsg.LessonPlanList"> <div style="" v-for="(item,index) in addMsg.LessonPlanList" v-if="index==0">
<div class="teach_Content"> <div class="teach_Content">
{{item.CourseName}}上课内容 教学流程
</div> </div>
<div class="row q-gutter-xs cont" v-for="(subItem,subIndex) in item.LessonPlanDetailsList" style="margin-top:20px;align-items: self-end;width:100%;"> <div class="row q-gutter-xs cont" v-for="(subItem,subIndex) in item.LessonPlanDetailsList" style="margin-top:20px;align-items: self-end;width:100%;">
...@@ -320,6 +331,7 @@ export default { ...@@ -320,6 +331,7 @@ export default {
this.msg.ClassId = this.$route.query.ClassId; this.msg.ClassId = this.$route.query.ClassId;
this.msg.School_Id = this.$route.query.School_Id; this.msg.School_Id = this.$route.query.School_Id;
this.msg.ClassPlanId = this.$route.query.ClassPlanId; this.msg.ClassPlanId = this.$route.query.ClassPlanId;
this.addMsg.CourseNum = this.$route.query.Ranks;
} }
this.getList(); this.getList();
...@@ -341,7 +353,7 @@ export default { ...@@ -341,7 +353,7 @@ export default {
if (data.Chapter) { if (data.Chapter) {
this.chapter = data.Chapter this.chapter = data.Chapter
} }
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;
this.addMsg.ClassPlanId = data.ClassPlanId; this.addMsg.ClassPlanId = data.ClassPlanId;
......
src/pages/course/prepareclassDetails.vue
View file @ f97efb7c
<style> <style>
.prepareclassDetails{ .prepareclassDetails {
height: 100%; height: 100%;
margin: 0; margin: 0;
} }
.prepareclassDetails .page-body{
margin: 5px!important; .prepareclassDetails .page-body {
margin: 5px !important;
} }
.prepareclassDetails .q-table__title{
.prepareclassDetails .q-table__title {
font-size: 16px; font-size: 16px;
font-family: perfectFont; font-family: perfectFont;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
.prepareclassDetails .comment{
.prepareclassDetails .comment {
height: 600px; height: 600px;
overflow: auto; overflow: auto;
padding:0 15px; padding: 0 15px;
} }
.prepareclassDetails .comment-item{
.prepareclassDetails .comment-item {
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
padding: 20px 0; padding: 20px 0;
} }
.prepareclassDetails .c-i-t-l{
.prepareclassDetails .c-i-t-l {
width: 47px; width: 47px;
height: 47px; height: 47px;
border-radius: 50%; border-radius: 50%;
...@@ -35,20 +39,23 @@ ...@@ -35,20 +39,23 @@
font-weight: bold; font-weight: bold;
font-family: perfectFont; font-family: perfectFont;
} }
.prepareclassDetails .c-i-t-r{
flex:1; .prepareclassDetails .c-i-t-r {
flex: 1;
height: 40px; height: 40px;
justify-content: space-between; justify-content: space-between;
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2D2D2D;
margin-left: 10px; margin-left: 10px;
} }
.prepareclassDetails .c-i-Comment{
.prepareclassDetails .c-i-Comment {
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2D2D2D;
margin-top: 18px; margin-top: 18px;
} }
.prepareclassDetails .pl{
.prepareclassDetails .pl {
background: #ffffff; background: #ffffff;
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -58,70 +65,87 @@ ...@@ -58,70 +65,87 @@
padding: 15px; padding: 15px;
font-size: 13px; font-size: 13px;
} }
.prepareclassDetails .ratestyle{
.prepareclassDetails .ratestyle {
margin-left: 10px; margin-left: 10px;
} }
.prepareclassDetails .beike-jan{
.prepareclassDetails .beike-jan {
width: 15px; width: 15px;
} }
.prepareclassDetails .marginl-15{
.prepareclassDetails .marginl-15 {
margin-left: 15px; margin-left: 15px;
} }
.prepareclassDetails .margint-15{
.prepareclassDetails .margint-15 {
margin-top: 15px; margin-top: 15px;
} }
.prepareclassDetails .jan-l{
.prepareclassDetails .jan-l {
width: 3px; width: 3px;
height: 12px; height: 12px;
background: #3FC4FF; background: #3FC4FF;
} }
.prepareclassDetails .text12-o{
.prepareclassDetails .text12-o {
font-size: 12px; font-size: 12px;
color: #111111; color: #111111;
} }
.prepareclassDetails .text12-o p{
margin:0; .prepareclassDetails .text12-o p {
margin: 0;
} }
.prepareclassDetails .text12-n{
.prepareclassDetails .text12-n {
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
} }
.prepareclassDetails .text14-o{
.prepareclassDetails .text14-o {
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2D2D2D;
} }
.prepareclassDetails .text-title{
.prepareclassDetails .text-title {
font-size: 14px; font-size: 14px;
color: #111111; color: #111111;
} }
.prepareclassDetails .text14-l{
.prepareclassDetails .text14-l {
font-size: 12px; font-size: 12px;
color: #2961FE; color: #2961FE;
} }
.comment::-webkit-scrollbar { .comment::-webkit-scrollbar {
display: none; display: none;
} }
.prepareclassDetails .width50{
.prepareclassDetails .width50 {
width: 50px; width: 50px;
} }
.prepareTopTitle{
.prepareTopTitle {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 12px; font-size: 12px;
} }
.prePare_Line { .prePare_Line {
width: 3px; width: 3px;
height: 14px; height: 14px;
background-color: #3FC4FF; background-color: #3FC4FF;
margin-right: 10px; margin-right: 10px;
} }
.preSecond{
font-size:36px; .preSecond {
color:#000000; font-size: 36px;
color: #000000;
position: relative; position: relative;
margin:20px 0; margin: 20px 0;
} }
.preSecond:after{
.preSecond:after {
position: absolute; position: absolute;
content: ''; content: '';
display: inline-block; display: inline-block;
...@@ -129,29 +153,67 @@ ...@@ -129,29 +153,67 @@
height: 14px; height: 14px;
background: #3FC4FF; background: #3FC4FF;
position: absolute; position: absolute;
left:0; left: 0;
top:34px; top: 34px;
opacity: 0.8; opacity: 0.8;
} }
.prePare_Content{
.prePare_Content {
/* width:430px; */ /* width:430px; */
min-height:100px; min-height: 100px;
height:auto; height: auto;
background-color: #F0F5FB; background-color: #F0F5FB;
padding:20px; padding: 20px;
margin:20px auto; margin: 20px auto;
font-family: '微软雅黑' !important; font-family: '微软雅黑' !important;
} }
.prePare_Content h6, .prePare_Content h6,
.prePare_Content h5, .prePare_Content h5,
.prePare_Content h4, .prePare_Content h4,
.prePare_Content h3, .prePare_Content h3,
.prePare_Content h2, .prePare_Content h2,
.prePare_Content h1{ .prePare_Content h1 {
font-size: unset !important; font-size: unset !important;
line-height: unset !important; line-height: unset !important;
letter-spacing: unset !important; letter-spacing: unset !important;
} }
.prepareclassDetails .el-upload--picture-card {
width: 120px;
height: 120px;
line-height: 130px;
}
.prepareDuty {
display: inline-block;
width: 100px;
height: 100px;
font-size: 50px;
border: 1px dashed #d9d9d9;
line-height: 100px;
}
.avatar-uploader .el-upload {
border-radius: 6px;
cursor: pointer;
width: 100%;
height: 100%;
color: #8c939d;
position: relative;
overflow: hidden;
}
.pre-ImgDiv {
width: 100px;
height: 100px;
position: relative;
margin: 0 10px 10px 0;
display: inline-block;
}
.Pre-ComBg{
background-color: #e8e8e8;
}
</style> </style>
<template> <template>
...@@ -168,20 +230,23 @@ ...@@ -168,20 +230,23 @@
<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!=''" v-html="decodeURIComponent(data.Chapter.ChapterContent)"></div> <div class="prePare_Content" v-if="data.Chapter.ChapterContent!=''"
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!=''" v-html="decodeURIComponent(data.Chapter.Objectives)"> <div class="prePare_Content" style="background:#F7F0FB" v-if="data.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!=''" v-html="decodeURIComponent(data.Chapter.Requirement)"> <div class="prePare_Content" style="background:#FBF6F0" v-if="data.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>
...@@ -194,7 +259,8 @@ ...@@ -194,7 +259,8 @@
</div> </div>
<div class="row" style="font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont"> <div class="row" style="font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont">
教案·{{data.ClassId}}班 教案·{{data.ClassId}}班
<span class="text12-o marginl-15" style="line-height: 21px;font-weight: inherit">{{data.LessonPlan}}·第{{data.CourseNum}}课</span> <span class="text12-o marginl-15"
style="line-height: 21px;font-weight: inherit">{{data.LessonPlan}}·第{{data.CourseNum}}课</span>
</div> </div>
</div> </div>
<div class="row marginl-15 margint-15"> <div class="row marginl-15 margint-15">
...@@ -208,18 +274,19 @@ ...@@ -208,18 +274,19 @@
</div> </div>
</div> </div>
<div class="marginl-15 margint-15 "> <div class="marginl-15 margint-15 ">
<div class="text-title">指導内容</div> <div class="text-title">教学目标</div>
<div class="marginl-15 margint-15 row" style="align-items: flex-start" v-for="(item,index) in data.LessonPlanList" :key="index"> <div class="margint-15 row" style="align-items: flex-start"
<div class="text12-n width50">{{item.CourseName}}：</div> v-for="(item,index) in data.LessonPlanList" :key="index" v-if="index==0">
<div class="text14-o " style="flex:1">{{item.CourseTitle}}</div> <div class="text14-o q-pa-md Pre-ComBg rounded-borders" style="flex:1">{{item.CourseTitle}}</div>
</div> </div>
</div> </div>
<div class="marginl-15 margint-15 "> <div class="marginl-15 margint-15 ">
<div class="text-title">指導項目</div> <div class="text-title">教学难点</div>
<div class="marginl-15 margint-15 row" style="align-items: flex-start" v-for="(item,index) in data.LessonPlanList" :key="index"> <div class="margint-15" style="align-items: flex-start"
<div class="text12-n width50">{{item.CourseName}}：</div> v-for="(item,index) in data.LessonPlanList" :key="index" v-if="index==0">
<div class="text14-o" style="flex:1" v-for="(x,y) in item.LessonPlanProjectsList" :key="y" > <!-- <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 v-html="x.ProjectContent"> <div v-html="x.ProjectContent">
</div> </div>
...@@ -227,16 +294,16 @@ ...@@ -227,16 +294,16 @@
</div> </div>
</div> </div>
<div class="marginl-15 margint-15 "> <div class="marginl-15 margint-15 ">
<div class="text-title">上课内容</div> <div class="text-title">教学流程</div>
<div class="marginl-15 margint-15 row" style="align-items: flex-start;flex-wrap: nowrap" v-for="(item,index) in data.LessonPlanList" :key="index"> <div class="margint-15 row" style="align-items: flex-start;flex-wrap: nowrap"
<div class="text12-n width50">{{item.CourseName}}：</div> 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" style="flex:1"> <div class="text14-o" style="flex:1">
<div class="column" v-for="(x,y) in item.LessonPlanDetailsList" :key="y"> <div class="column" v-for="(x,y) in item.LessonPlanDetailsList" :key="y">
<div class="text14-l">{{x.Duration}}分钟-{{x.DurationEndTime}}</div> <div class="text14-l" style="margin-bottom:10px;">{{x.Duration}}分钟-{{x.DurationEndTime}}</div>
<div class="text14-o" v-html="x.ProjectContent"></div> <div class="text14-o q-pa-md Pre-ComBg rounded-borders" v-html="x.ProjectContent"></div>
<template v-if="data.IsEditSummary>0"> <!-- <template v-if="data.IsEditSummary>0">
<div v-if="x.Summary" style="width: 100%;background: #F0F5FB;border-radius: 5px;padding:10px;margin-bottom:20px;"> <div v-if="x.Summary" style="width: 100%;background: #F0F5FB;border-radius: 5px;padding:10px;margin-bottom:20px;">
单项总结：{{x.Summary}} 单项总结：{{x.Summary}}
</div> </div>
...@@ -254,63 +321,93 @@ ...@@ -254,63 +321,93 @@
:disable="AccountType||!isCanEdit" :disable="AccountType||!isCanEdit"
/> />
</div> </div>
</template> </template> -->
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md marginl-15 margint-15" label="提交" @click="saveOrderInfo()" :loading="Dloading" <div class="marginl-15">
v-if="(AccountType==false&&data.IsEditSummary<=0)&&isUpData"/> <div class="row" style="margin: 20px 0;align-items: center">
<div class="beike-jan">
<div class="jan-l"></div>
</div>
<div class="row" style="font-size: 14px;color: #000000;font-weight: bold;font-family: perfectFont">
课后总结
</div>
</div>
<template v-if="LessonPlanNum>0&&LessonPlanSummaryNum>0">
<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">
<q-img :src="item" spinner-color="white" style="height: 100%;height:100%" />
</div>
</div>
</div>
</template>
<template v-else>
<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">
<q-img :src="item" spinner-color="white" style="height: 100%;height:100%" />
<q-btn size="7px" @click="deleteItemImg(index)" style="position:absolute;right:-5px;top:-5px;" round
color="red" icon="iconfont icon-guanbi1" />
</div>
</div>
<el-upload action="" class="avatar-uploader prepareDuty" :before-upload="uploadFile"
:show-file-list="false">
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
</template>
</div>
<q-btn color="accent" size="sm" v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0&&isShowBtn" 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> </div>
</div> </div>
<div class="col-3" style="position: relative;overflow: hidden;border-radius: 6px;background: #FFF;margin: 5px;height: 800px"> <div class="col-3"
style="position: relative;overflow: hidden;border-radius: 6px;background: #FFF;margin: 5px;height: 800px">
<div class="q-table__title" style="padding: 15px;">评价</div> <div class="q-table__title" style="padding: 15px;">评价</div>
<div class="comment" > <div class="comment">
<div class="row" style="width: 100%;height: 50px;align-items: center;justify-content: center;font-size: 16px;color: #999999" v-if="CommentList.length==0"> <div class="row"
style="width: 100%;height: 50px;align-items: center;justify-content: center;font-size: 16px;color: #999999"
v-if="CommentList.length==0">
暂无评论 暂无评论
</div> </div>
<div class="comment-item" v-for="(item,index) in CommentList" :key="index" v-if="CommentList.length>0"> <div class="comment-item" v-for="(item,index) in CommentList" :key="index" v-if="CommentList.length>0">
<div class="row"> <div class="row">
<!-- <div class="c-i-t-l row">{{item.CreateByName.substr(0, 1)}}</div>--> <!-- <div class="c-i-t-l row">{{item.CreateByName.substr(0, 1)}}</div>-->
<q-avatar size="35px" rounded color="primary" text-color="white"> <q-avatar size="35px" rounded color="primary" text-color="white">
<img :src="userInfo.UserIcon" v-if="item.UserIcon"> <img :src="userInfo.UserIcon" v-if="item.UserIcon">
<span v-else>{{item.CreateByName.substring(0,1)}}</span> <span v-else>{{item.CreateByName.substring(0,1)}}</span>
</q-avatar> </q-avatar>
<div class="c-i-t-r column"> <div class="c-i-t-r column">
<div class="row" style="align-items: center"> <div class="row" style="align-items: center">
<span style="margin-right: 10px">{{item.CreateByName}}</span> <span style="margin-right: 10px">{{item.CreateByName}}</span>
<q-rating <q-rating v-model="item.Score" size="1em" v-if="item.Score!=-1" icon="thumb_up" readonly />
v-model="item.Score"
size="1em"
v-if="item.Score!=-1"
icon="thumb_up"
readonly
/>
</div>
<span style="font-size: 12px;color: #999999">
{{item.CreateTimeStr}}
</span>
</div> </div>
<span style="font-size: 12px;color: #999999">
{{item.CreateTimeStr}}
</span>
</div>
</div> </div>
<div class="c-i-Comment"> <div class="c-i-Comment">
{{item.Comment}} {{item.Comment}}
</div> </div>
</div> </div>
</div> </div>
<!-- 评论区域--> <!-- 评论区域-->
<div class="pl column"> <div class="pl column">
<div class="row" style="align-items: center"> <div class="row" style="align-items: center">
<template v-if="Score!=-1"> <template v-if="Score!=-1">
<span style="margin-right: 5px">备课打分：</span> <span style="margin-right: 5px">备课打分：</span>
<q-rating <q-rating v-model="plmsg.Score" size="1.5em" icon="thumb_up" />
v-model="plmsg.Score"
size="1.5em"
icon="thumb_up"
/>
<span class="ratestyle" v-if="plmsg.Score==5">非常满意</span> <span class="ratestyle" v-if="plmsg.Score==5">非常满意</span>
<span class="ratestyle" v-if="plmsg.Score==4">满意</span> <span class="ratestyle" v-if="plmsg.Score==4">满意</span>
<span class="ratestyle" v-if="plmsg.Score==3">感觉一般</span> <span class="ratestyle" v-if="plmsg.Score==3">感觉一般</span>
...@@ -319,8 +416,9 @@ ...@@ -319,8 +416,9 @@
</template> </template>
</div> </div>
<div class="row" style="margin-top: 20px;align-items: center"> <div class="row" style="margin-top: 20px;align-items: center">
<q-input filled v-model="plmsg.Comment" label="写下你想评价的内容" style="flex:1"/> <q-input filled v-model="plmsg.Comment" label="写下你想评价的内容" style="flex:1" />
<img src="../../assets/images/course/fasong.png" alt="" style="width: 35px;height: 35px;margin-left: 20px" @click="btnpl()"> <img src="../../assets/images/course/fasong.png" alt="" style="width: 35px;height: 35px;margin-left: 20px;cursor:pointer;"
@click="btnpl()">
</div> </div>
</div> </div>
...@@ -338,172 +436,197 @@ ...@@ -338,172 +436,197 @@
updateClassLessPlan, updateClassLessPlan,
GetNowUserLessonComment GetNowUserLessonComment
} from '../../api/course/class'; } from '../../api/course/class';
export default { import {
name: "prepareclassDetails", UploadSelfFile,
data(){ } from '../../api/common/common'
return{ export default {
msg:{ name: "prepareclassDetails",
ClassId:0, data() {
School_Id:0, return {
ClassPlanId:0, msg: {
}, ClassId: 0,
Dloading:false, School_Id: 0,
plmsg:{ ClassPlanId: 0,
Comment:'', },
Score:5, Dloading: false,
LessonPlanId:0, plmsg: {
ClassId:0, Comment: '',
ClassPlanId:0, Score: 5,
TeacherId:0 LessonPlanId: 0,
}, ClassId: 0,
data:{}, ClassPlanId: 0,
CommentList:[], TeacherId: 0
AccountType:true, },
scoreMsg:{ data: {},
ClassPlanId:0, CommentList: [],
ClassId:0 AccountType: true,
}, scoreMsg: {
Score:0, ClassPlanId: 0,
nowDate:'', //现在时间 ClassId: 0
isCanEdit:false, },
isUpData:true Score: 0,
} nowDate: '', //现在时间
}, isCanEdit: false,
created(){ isUpData: true,
conclusion: '', //课后总结
ImgList: [], //总结图片数组
LessonPlanNum:0,
LessonPlanSummaryNum:0,
TeacherId:0,
isShowBtn:false
}
},
created() {
},
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;
this.plmsg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId : 0;
this.scoreMsg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId : 0;
this.scoreMsg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId : 0;
this.LessonPlanNum = this.$route.query.LessonPlanNum ? this.$route.query.LessonPlanNum : 0;
this.LessonPlanSummaryNum = this.$route.query.LessonPlanSummaryNum ? this.$route.query.LessonPlanSummaryNum : 0;
this.TeacherId = this.$route.query.TeacherId ? this.$route.query.TeacherId : 0;
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;
}
this.getList() //备课内容
this.getCommentList() //评价
this.getUserComment();
var today = new Date();
var y = today.getFullYear();
var m = today.getMonth() + 1;
var d = today.getDate();
var h = today.getHours();
var i = today.getMinutes();
var s = today.getSeconds(); // 在小于10的数字钱前加一个‘0’
this.nowDate = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
},
methods: {
//获取评论显示分数
getUserComment() {
GetNowUserLessonComment(this.scoreMsg).then(res => {
if (res.Code == 1) {
this.Score = res.Data.Score;
this.plmsg.Score = this.Score;
}
})
}, },
mounted(){ getList() {
getClassLessPlan(this.msg).then(res => {
if (res.Code == 1) {
this.data = res.Data;
this.msg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId:0; console.log(this.data, 'data');
this.msg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId:0; this.plmsg.TeacherId = res.Data.UpdateBy;
this.plmsg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId:0; var beginTimes = this.nowDate.replace(/-/g, "/"); //当前
this.plmsg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId:0; var endTimes = this.data.ClassEndTime.replace(/-/g, "/"); //结束
this.scoreMsg.ClassPlanId = this.$route.query.ClassPlanId ? this.$route.query.ClassPlanId:0; var a = (Date.parse(endTimes) - Date.parse(beginTimes)) / 3600 / 1000;
this.scoreMsg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId:0; if (a < 0) {
let userInfo = this.getLocalStorage(); this.isCanEdit = true; //可以编辑
this.AccountType = userInfo.AccountType==2?false:true; //是否是教师
this.getList()//备课内容
this.getCommentList()//评价
this.getUserComment();
var today=new Date();
var y=today.getFullYear();
var m=today.getMonth()+1;
var d=today.getDate();
var h=today.getHours();
var i=today.getMinutes();
var s=today.getSeconds();// 在小于10的数字钱前加一个‘0’
this.nowDate = y+'-'+m+'-'+d+' '+ h +':'+i+':'+s;
},
methods:{
//获取评论显示分数
getUserComment(){
GetNowUserLessonComment(this.scoreMsg).then(res => {
if (res.Code == 1) {
this.Score = res.Data.Score;
this.plmsg.Score = this.Score;
} }
}) if (a > 0) {
}, this.isUpData = false;
getList() {
getClassLessPlan(this.msg).then(res => {
if (res.Code == 1) {
this.data = res.Data;
this.plmsg.TeacherId = res.Data.UpdateBy;
var beginTimes =this.nowDate.replace(/-/g,"/"); //当前
var endTimes =this.data.ClassEndTime.replace(/-/g,"/"); //结束
var a =(Date.parse(endTimes)-Date.parse(beginTimes))/3600/1000;
if(a<0){
this.isCanEdit=true; //可以编辑
}
if(a>0){
this.isUpData=false;
}
} }
}) console.log(this.data.LessonPlanList[0].ProjectPicList,'this.data.LessonPlanList[0].ProjectPicList');
}, if(this.data.LessonPlanList&&this.data.LessonPlanList.length>0){
getCommentList(){ this.conclusion = this.data.LessonPlanList[0].Summary;
getLessonCommentList({ this.ImgList = this.data.LessonPlanList[0].ProjectPicList;
ClassId:this.msg.ClassId,
ClassPlanId:this.msg.ClassPlanId,
}).then(res => {
if (res.Code == 1) {
this.CommentList = res.Data
} }
})
},
btnpl(){
if(this.plmsg.Comment==''){
this.$q.notify({
type: 'negative',
position: 'top',
timeout: 1500,
message: `请输入评论内容`
})
return
} }
if(this.plmsg.Score==0 || this.plmsg.Score==''){ })
this.$q.notify({ },
type: 'negative', getCommentList() {
position: 'top', getLessonCommentList({
timeout: 1500, ClassId: this.msg.ClassId,
message: `请对备课评分` ClassPlanId: this.msg.ClassPlanId,
}) }).then(res => {
return if (res.Code == 1) {
this.CommentList = res.Data
} }
})
setLessonComment(this.plmsg).then(res => { },
if (res.Code == 1) { btnpl() {
this.$q.notify({ if (this.plmsg.Comment == '') {
icon: 'iconfont icon-chenggong', this.$q.notify({
color: 'accent', type: 'negative',
timeout: 2000, position: 'top',
message: '评论成功', timeout: 1500,
position: 'top' message: `请输入评论内容`
})
this.plmsg.Score = 5;
this.plmsg.Comment = '';
this.getUserComment()
this.getCommentList()
}
}) })
}, return
saveOrderInfo(){ }
let count=0,LessonNum=0; if (this.plmsg.Score == 0 || this.plmsg.Score == '') {
this.data.LessonPlanList.forEach(x=>{ this.$q.notify({
x.LessonPlanDetailsList.forEach(y=>{ type: 'negative',
if(y.Summary==null||y.Summary==''){ position: 'top',
count++; timeout: 1500,
} message: `请对备课评分`
})
LessonNum+=x.LessonPlanDetailsList.length;
}) })
if(count==LessonNum){ return
}
setLessonComment(this.plmsg).then(res => {
if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
type: 'negative', icon: 'iconfont icon-chenggong',
position: 'top', color: 'accent',
timeout: 1500, timeout: 2000,
message: `请至少填写一项课后总结` message: '评论成功',
position: 'top'
}) })
return this.plmsg.Score = 5;
this.plmsg.Comment = '';
this.getUserComment()
this.getCommentList()
} }
updateClassLessPlan(this.data).then(res => { })
if (res.Code == 1) { },
this.$q.notify({ saveOrderInfo() {
icon: 'iconfont icon-chenggong', if(this.data.LessonPlanList&&this.data.LessonPlanList.length>0){
color: 'accent', this.data.LessonPlanList[0].Summary = this.conclusion;
timeout: 2000, this.data.LessonPlanList[0].ProjectPicList = this.ImgList;
message: res.Message,
position: 'top'
})
this.getList();
}
})
} }
updateClassLessPlan(this.data).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: res.Message,
position: 'top'
})
this.getList();
}
})
},
uploadFile(files) {
UploadSelfFile('studentIcon', files, res => {
if (res.Code == 1) {
this.ImgList.push(res.FileUrl);
}
})
},
//删除图片
deleteItemImg(index) {
this.ImgList.splice(index, 1);
} }
} }
}
</script> </script>
src/pages/course/teacherLesson.vue
View file @ f97efb7c
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.teacherLesson .Cal_List { .teacherLesson .Cal_List {
display: flex; display: flex;
width:95%; width: 95%;
} }
.teacherLesson .Cal_Qiehuan { .teacherLesson .Cal_Qiehuan {
...@@ -101,32 +101,35 @@ ...@@ -101,32 +101,35 @@
.teacherLesson .TeacherNameList { .teacherLesson .TeacherNameList {
position: relative; position: relative;
color: #111111; color: #111111;
font-size:13px;
}
.teacherLesson .TeacherNameList:last-child{
height:auto;
} }
.teacherLesson .cicle1 { .teacherLesson .cicle1 {
position: absolute; position: absolute;
left: -15px; left: -15px;
border-radius: 50%; border-radius: 50%;
list-style: none; list-style: none;
width: 30px; width: 24px;
height: 30px; height: 24px;
background: #ffffff; background: #ffffff;
text-align: center; text-align: center;
line-height: 30px; line-height: 24px;
color: #fff; color: #fff;
position: absolute; position: absolute;
top: 0; top: -3px;
left: -41px; left: -38px;
} }
.TeacherInfo_List:nth-child(odd) .cicle1 { .TeacherInfo_List:nth-child(odd) .cicle1 {
color: #2961FE; color: #3FC4FF;
background-color: #D4DFFF; background-color: #D9F3FF;
} }
.TeacherInfo_List:nth-child(even) .cicle1 { .TeacherInfo_List:nth-child(even) .cicle1 {
color: #3FC4FF; color: #2961FE;
background-color: #D9F3FF; background-color: #D4DFFF;
} }
.teacherLesson .cicle1:first-child { .teacherLesson .cicle1:first-child {
...@@ -155,8 +158,11 @@ ...@@ -155,8 +158,11 @@
.teacherLesson .TeacherInfo_List { .teacherLesson .TeacherInfo_List {
display: flex; display: flex;
height:60px;
}
.teacher-box .TeacherInfo_List:last-child{
height:auto;
} }
.TeacherInfo_List:last-child .timeright { .TeacherInfo_List:last-child .timeright {
border-left: 0 !important; border-left: 0 !important;
} }
...@@ -177,35 +183,94 @@ ...@@ -177,35 +183,94 @@
margin-left: 20px; margin-left: 20px;
cursor: pointer; cursor: pointer;
} }
.teacherLesson .timeleft{
margin-left:12px; .teacherLesson .timeleft {
margin-left: 12px;
/* height:53px; */
} }
.checkedPlan{
background-color: #2961FE!important; .checkedPlan {
color:#fff!important; background-color: #2961FE !important;
color: #fff !important;
} }
/*.checkedPlan .beikeStatus{*/ /*.checkedPlan .beikeStatus{*/
/* background-color: #fff;*/ /* background-color: #fff;*/
/* color:#2961FE!important;*/ /* color:#2961FE!important;*/
/*}*/ /*}*/
.Cal_Content .beike1{ .Cal_Content .beike1 {
background: var(--q-color-negative); background: var(--q-color-negative);
} }
.Cal_Content .beike2{
.Cal_Content .beike2 {
background: var(--q-color-warning); background: var(--q-color-warning);
} }
.Cal_Content .beike3{
.Cal_Content .beike3 {
background: var(--q-color-dark); background: var(--q-color-dark);
} }
.teacherLesson .TeacherName{
color:var(--q-color-primary); .teacherLesson .TeacherName {
margin-left:10px; color: var(--q-color-primary);
} }
.teacherLesson .teacher-box{
background-color: #f5f5f5; .teacherLesson .teacher-box {
padding: 20px; /* background-color: #f5f5f5; */
padding: 20px 20px 10px 20px;
border-radius: 20px; border-radius: 20px;
margin-bottom: 20px; }
.Teacher_Class{
width: 95%;
height:45px;
background-color: #F0F5FB;
padding:0 20px;
color:#111111;
margin-bottom:30px;
font-weight: bold;
display:flex;
align-items: center;
justify-content: space-between;
}
.Teach_BigSpan{
font-size:18px;
margin-right:20px;
}
.Teach_MidSpan{
font-size:14px;
}
.Plan-StartTime{
width: 45px;
font-size:14px;
color:#111111;
font-weight:bold;
}
.Plan_WeiBei{
color:#F44E60;
font-size:12px;
}
.Teach_Circle{
color: #2961FE;
background-color: #D4DFFF;
display:inline-block;
width:24px;
height:24px;
margin:0 10px 0 30px;
border-radius: 50%;
text-align: center;
line-height: 24px;
font-size:12px;
position: relative;
top:-2px;
}
.fankuiBtn{
padding: 6px 20px;
background-color: #fff;
color: #2961FE;
font-size: 13px;
border-radius: 5px;
margin-left: 20px;
cursor: pointer;
border:1px solid #2961FE;
} }
</style> </style>
<template> <template>
...@@ -220,19 +285,21 @@ ...@@ -220,19 +285,21 @@
<div class="Cal_List flex"> <div class="Cal_List flex">
<div class="Cal_Qiehuan" @click="getBeforeMonth()"> <div class="Cal_Qiehuan" @click="getBeforeMonth()">
<div class="Cal_Icon"> <div class="Cal_Icon">
<i class="el-icon-arrow-left"></i></div> <div>上个月 <i class="el-icon-arrow-left"></i></div>
<div>上个月
</div> </div>
</div> </div>
<div class="Cal_Content col"> <div class="Cal_Content col">
<div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" @click="getItem(item)"> <div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}"
{{item}} @click="getItem(item)">
<div class="beikeStatus beike1" v-if="getLessonStatus(item)=='未备课'"> {{item}}
<div class="beikeStatus beike1" v-if="getLessonStatus(item)=='未备课'">
<span>{{getLessonStatus(item)}}</span> <span>{{getLessonStatus(item)}}</span>
</div> </div>
<div class="beikeStatus beike2" v-if="getLessonStatus(item)=='部分'"> <div class="beikeStatus beike2" v-if="getLessonStatus(item)=='部分'">
<span>{{getLessonStatus(item)}}</span> <span>{{getLessonStatus(item)}}</span>
</div> </div>
<div class="beikeStatus beike3" v-if="getLessonStatus(item)=='已备课'"> <div class="beikeStatus beike3" v-if="getLessonStatus(item)=='已备课'">
<span>{{getLessonStatus(item)}}</span> <span>{{getLessonStatus(item)}}</span>
</div> </div>
</div> </div>
...@@ -247,43 +314,64 @@ ...@@ -247,43 +314,64 @@
</div> </div>
<div class="TeacherYarr">{{tYear}}年{{tMonth}}月{{ckedIndex}}日</div> <div class="TeacherYarr">{{tYear}}年{{tMonth}}月{{ckedIndex}}日</div>
<div style="margin-top:30px;"> <div style="margin-top:30px;">
<div > <div>
<div v-for="item1 in newDataListRes" :key="item1.id" class="teacher-box"> <div v-for="item1 in newDataListRes" :key="item1.id" class="teacher-box">
<div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher"> <div class="Teacher_Class">
<div class="timeleft"> <div>
<div style="width: 45px;"> <span class="Teach_BigSpan">{{item1.ClassName}}</span>
{{item.StartTime}} <span class="Teach_MidSpan">第{{item1.Ranks}}次上课</span>
</div> <span class="Teach_Circle">{{item1.TeacherName.substr(0,1)}}</span>
</div> <span class="Teach_MidSpan" style="position:relative;top:-1px;">{{item1.TeacherName}}</span>
<div class="timeright">
<div class="record_List">
<div class="TeacherNameList">
{{item.ClassName}}
<span class="TeacherName">{{item.TeacherName}}</span>
<li class="cicle1">
{{item.ClassName.substr(0,1)}}
</li>
</div> </div>
<div> <div>
<span>单元名：</span><span style="margin-left:30px;">课程名：</span> <span v-if="item1.LessonPlanNum===0" class="Plan_WeiBei">未备课</span>
<span v-if="item1.LessonPlanNum>0" @click="goyibeike(item1)" style="color:#2961FE;font-size:12px;margin-right:20px;cursor:pointer;">已备课</span>
<!-- <span class="beikeBtn" v-if="item1.LessonPlanNum>0" style="backgroundColor:#3FC4FF;margin-right:20px;"
@click="goyibeike(item1)">已备课</span> -->
<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 class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</span>
</div> </div>
<div class="TeacherContent"> </div>
{{item.GuestStr}} <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">
<div class="timeleft">
<div class="Plan-StartTime">
{{item.StartTime}}
</div>
</div> </div>
<div style="margin:20px 0 30px 0;"> <div class="timeright">
<span class="beikeBtn" v-if="item.LessonPlanNum>0" style="backgroundColor:#3FC4FF;" @click="goyibeike(item)">已备课</span> <div class="record_List">
<span class="beikeBtn" v-if="AccountType&&item.LessonPlanNum==0" @click="goBeike(item)">备课</span> <div class="TeacherNameList">
<span class="beikeBtn" v-if="AccountType&&item.LessonPlanNum>0" @click="goBeike(item)">修改</span> <div>
<span class="beikeBtn" style="backgroundColor:#C0C4CC;" v-if="!AccountType&&item.LessonPlanNum===0" >未备课</span> <span class="TeacherName">学员名单：</span>
<span style="color:#333333;">{{item.AllGuestStr}}</span>
</div>
<div>
<span class="TeacherName">出勤名单：</span>
<span style="color:#333333;">{{item.GuestStr}}</span>
</div>
<li class="cicle1">
{{item.TeacherName.substr(0,1)}}
</li>
</div>
<!-- <div class="TeacherContent">
{{item.GuestStr}}
</div> -->
<!-- <div style="margin:20px 0 30px 0;">
<span class="beikeBtn" v-if="item.LessonPlanNum>0" style="backgroundColor:#3FC4FF;"
@click="goyibeike(item)">已备课</span>
<span class="beikeBtn" v-if="AccountType&&item.LessonPlanNum==0" @click="goBeike(item)">备课</span>
<span class="beikeBtn" v-if="AccountType&&item.LessonPlanNum>0" @click="goBeike(item)">修改</span>
<span class="beikeBtn" style="backgroundColor:#C0C4CC;"
v-if="!AccountType&&item.LessonPlanNum===0">未备课</span>
</div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -301,8 +389,8 @@ ...@@ -301,8 +389,8 @@
dataNum: 0, //天数 dataNum: 0, //天数
tYear: 0, //年 tYear: 0, //年
tMonth: 0, //月 tMonth: 0, //月
tDay:0, //日 tDay: 0, //日
ckedIndex:0,// 选中 ckedIndex: 0, // 选中
msg: { msg: {
School_Id: 0, //学校 School_Id: 0, //学校
// Teacher_Id: 5, //老师id // Teacher_Id: 5, //老师id
...@@ -310,9 +398,9 @@ ...@@ -310,9 +398,9 @@
EndTime: '' EndTime: ''
}, },
dataList: [], dataList: [],
newDataList:[], newDataList: [],
newDataListRes:[], newDataListRes: [],
AccountType:true, AccountType: true,
} }
}, },
created() {}, created() {},
...@@ -323,10 +411,10 @@ ...@@ -323,10 +411,10 @@
this.tDay = myDate.getDate(); this.tDay = myDate.getDate();
this.ckedIndex = this.tDay; this.ckedIndex = this.tDay;
this.dataNum = this.mGetDate(this.tYear, this.tMonth); this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.StartTime = this.tYear+'-'+this.tMonth+'-'+'01'; this.msg.StartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.EndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum; this.msg.EndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.AccountType = userInfo.AccountType==2?true:false; //是否是教师 this.AccountType = userInfo.AccountType == 2 ? true : false; //是否是教师
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -343,8 +431,8 @@ ...@@ -343,8 +431,8 @@
this.tMonth = this.tMonth - 1; this.tMonth = this.tMonth - 1;
} }
this.dataNum = this.mGetDate(this.tYear, this.tMonth); this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.StartTime = this.tYear+'-'+this.tMonth+'-'+'01'; this.msg.StartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.EndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum; this.msg.EndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
this.getList(); this.getList();
}, },
//点击下个月 //点击下个月
...@@ -356,8 +444,8 @@ ...@@ -356,8 +444,8 @@
this.tMonth = this.tMonth + 1; this.tMonth = this.tMonth + 1;
} }
this.dataNum = this.mGetDate(this.tYear, this.tMonth); this.dataNum = this.mGetDate(this.tYear, this.tMonth);
this.msg.StartTime = this.tYear+'-'+this.tMonth+'-'+'01'; this.msg.StartTime = this.tYear + '-' + this.tMonth + '-' + '01';
this.msg.EndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum; this.msg.EndTime = this.tYear + '-' + this.tMonth + '-' + this.dataNum;
this.getList(); this.getList();
}, },
//获取数据 //获取数据
...@@ -367,14 +455,14 @@ ...@@ -367,14 +455,14 @@
this.dataList = res.Data; this.dataList = res.Data;
var month = this.tMonth; var month = this.tMonth;
var day = this.ckedIndex; var day = this.ckedIndex;
if(month<10){ if (month < 10) {
month='0'+month; month = '0' + month;
} }
if(day<10){ if (day < 10) {
day='0'+day; day = '0' + day;
} }
this.dataList.forEach(x=>{ this.dataList.forEach(x => {
if(x.DateYear==this.tYear&&x.DateMonth==month&&x.DateDay==day){ if (x.DateYear == this.tYear && x.DateMonth == month && x.DateDay == day) {
this.newDataList = x.planList; this.newDataList = x.planList;
this.newDataListRes = x.planListResult; this.newDataListRes = x.planListResult;
} }
...@@ -383,59 +471,75 @@ ...@@ -383,59 +471,75 @@
}) })
}, },
//点击 //点击
getItem(item){ getItem(item) {
this.ckedIndex=item; this.ckedIndex = item;
var month = this.tMonth; var month = this.tMonth;
var day = item; var day = item;
if(month<10){ if (month < 10) {
month='0'+month; month = '0' + month;
} }
if(day<10){ if (day < 10) {
day='0'+day; day = '0' + day;
} }
this.dataList.forEach(x=>{ this.dataList.forEach(x => {
if(x.DateYear==this.tYear&&x.DateMonth==month&&x.DateDay==day){ if (x.DateYear == this.tYear && x.DateMonth == month && x.DateDay == day) {
this.newDataList = x.PlanList; this.newDataList = x.PlanList;
this.newDataListRes = x.planListResult; this.newDataListRes = x.planListResult;
} }
}) })
}, },
//获取备课状态 //获取备课状态
getLessonStatus(num){ getLessonStatus(num) {
if(num<10){ if (num < 10) {
num='0'+num num = '0' + num
} }
var Str = ''; var Str = '';
this.dataList.forEach(x=>{ this.dataList.forEach(x => {
if(parseInt(x.DateDay)==parseInt(num)){ if (parseInt(x.DateDay) == parseInt(num)) {
if(x.IsLessonStatus==0){ if (x.IsLessonStatus == 0) {
Str='未备课' Str = '未备课'
} }
if(x.IsLessonStatus==1){ if (x.IsLessonStatus == 1) {
Str='部分' Str = '部分'
} }
if(x.IsLessonStatus==2){ if (x.IsLessonStatus == 2) {
Str='已备课' Str = '已备课'
} }
if(x.IsLessonStatus==-1){ if (x.IsLessonStatus == -1) {
Str='' Str = ''
} }
} }
}) })
return Str; return Str;
}, },
//跳转至备课 //跳转至备课
goBeike(item){ goBeike(item) {
        var tempStr = '/course/lessonPreparation?ClassId=' + item.ClassId+'&School_Id='+item.School_Id+'&ClassPlanId='+item.ClassPlanId; // var tempStr = '/course/lessonPreparation?ClassId=' + item.ClassId + '&School_Id=' + item.School_Id +
        this.$router.push({ // '&ClassPlanId=' + item.ClassPlanId + '&Ranks=' + item.Ranks;
          path: tempStr // this.$router.push({
        }); // path: tempStr
// });
this.OpenNewUrl("/course/lessonPreparation", {
ClassId: item.ClassId,
School_Id:item.School_Id,
ClassPlanId:item.ClassPlanId,
Ranks:item.Ranks
});
}, },
goyibeike(item){ goyibeike(item) {
var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId+'&ClassPlanId='+item.ClassPlanId; this.OpenNewUrl("/course/prepareclassDetails", {
this.$router.push({ ClassId: item.ClassId,
path: tempStr ClassPlanId:item.ClassPlanId,
LessonPlanNum:item.LessonPlanNum,
LessonPlanSummaryNum:item.LessonPlanSummaryNum,
TeacherId:item.TeacherId
}); });
// var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId + '&ClassPlanId=' + item.ClassPlanId +
// '&LessonPlanNum=' + item.LessonPlanNum + '&LessonPlanSummaryNum='+ item.LessonPlanSummaryNum + '&TeacherId=' + item.TeacherId;
// this.$router.push({
// path: tempStr
// });
} }
} }
} }
......
src/pages/user/personalData.vue
View file @ f97efb7c
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
<span>{{showObj.DeptName}}</span> <span>{{showObj.DeptName}}</span>
</div> </div>
<!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> --> <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
<div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div> <!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
<div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
<div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div> <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
<div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div> <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
</div> </div>
...@@ -225,6 +225,7 @@ ...@@ -225,6 +225,7 @@
NewSurePassWord:'', NewSurePassWord:'',
} }
import summaryInfo from '../../components/user/summaryInfo' import summaryInfo from '../../components/user/summaryInfo'
import Lockr from 'lockr'
export default { export default {
meta: { meta: {
title: "个人资料" title: "个人资料"
...@@ -237,7 +238,7 @@ ...@@ -237,7 +238,7 @@
loading1: false, loading1: false,
loading2:false, loading2:false,
showObj: {}, showObj: {},
rightType: 0,//右边显示类型 rightType: 1,//右边显示类型
datamodify: {}, datamodify: {},
CompanyList: [], CompanyList: [],
passwordMsg:Object.assign({},defaultpassword), passwordMsg:Object.assign({},defaultpassword),
...@@ -338,11 +339,9 @@ ...@@ -338,11 +339,9 @@
return return
} }
}) })
let localStorageobj={ Lockr.set("loginUserInfo",this.showObj)
data:this.showObj this.$store.dispatch("setUserUpdate",this.showObj)
} // location.reload()
localStorage.setItem("loginUserInfo", JSON.stringify(localStorageobj) );
location.reload()
// this.$router.push({ // this.$router.push({
// path: this.redirect || '/home' // path: this.redirect || '/home'
// }) // })
......
src/store/modules/user.js
View file @ f97efb7c
...@@ -47,6 +47,9 @@ const user = { ...@@ -47,6 +47,9 @@ const user = {
}); });
}); });
}, },
setUserUpdate({commit},u){
commit("SET_USERINFO", u);
},
// 获取权限 // 获取权限
getAuth({ commit }) { getAuth({ commit }) {
......
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