Skip to content

C
confucius
Commit 24316755 authored by zhengke's avatar zhengke
Browse files
Options

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

parents d1465085 36897b09
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 168 deletions
src/api/course/class.js
View file @ 24316755
...@@ -399,7 +399,7 @@ export function GetTeacherClassHours(data) { ...@@ -399,7 +399,7 @@ export function GetTeacherClassHours(data) {
* 班级月度课耗 * 班级月度课耗
* @param {JSON参数} data * @param {JSON参数} data
*/ */
export function getClassMonthStatistics(data) { export function getClassMonthStatistics(data) {
return request({ return request({
url: '/finance/GetClassMonthStatistics', url: '/finance/GetClassMonthStatistics',
method: 'post', method: 'post',
...@@ -411,7 +411,7 @@ export function GetTeacherClassHours(data) { ...@@ -411,7 +411,7 @@ export function GetTeacherClassHours(data) {
* 教师奖励 获取课时费老师列表 * 教师奖励 获取课时费老师列表
* @param {JSON参数} data * @param {JSON参数} data
*/ */
export function getTeachingRewardsSendEmployeeList(data) { export function getTeachingRewardsSendEmployeeList(data) {
return request({ return request({
url: '/TeachingRewards/GetTeachingRewardsSendEmployeeList', url: '/TeachingRewards/GetTeachingRewardsSendEmployeeList',
method: 'post', method: 'post',
...@@ -422,10 +422,21 @@ export function GetTeacherClassHours(data) { ...@@ -422,10 +422,21 @@ export function GetTeacherClassHours(data) {
* 教师奖励 设置 老师已发放 * 教师奖励 设置 老师已发放
* @param {JSON参数} data * @param {JSON参数} data
*/ */
export function setTeachingRewardsSendEmployee(data) { export function setTeachingRewardsSendEmployee(data) {
return request({ return request({
url: '/TeachingRewards/SetTeachingRewardsSendEmployee', url: '/TeachingRewards/SetTeachingRewardsSendEmployee',
method: 'post', method: 'post',
data data
}) })
} }
/**
* 教师奖励 设置 老师已发放
* @param {JSON参数} data
*/
export function delLessonComment(data) {
return request({
url: '/class/DelLessonComment',
method: 'post',
data
})
}
\ No newline at end of file
src/components/sale/transferclass-form.vue
View file @ 24316755
...@@ -472,7 +472,7 @@ ...@@ -472,7 +472,7 @@
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
position: "top", position: "top",
message: `请选择要续费的班级` message: `请选择要班级`
}) })
return; return;
} }
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
timeout: 2000, timeout: 2000,
message: '转班成功！', message: '转班申请成功！',
position: 'top' position: 'top'
}) })
//调用父页面成功方法 //调用父页面成功方法
......
src/components/teacher/stopLessonForm.vue
View file @ 24316755
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="text-h6">创建停课申请单</div> <div class="text-h6">创建停课申请单</div>
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none"> <q-card-section class="q-pt-none">
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div> <!-- <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div> -->
<div class="col flex items-center"> <div class="col flex items-center">
<div class="col-2 text-grey-6"> <div class="col-2 text-grey-6">
选择停课生效日期： 选择停课生效日期：
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
this.msg.OrderGuestId = this.setObj.Id this.msg.OrderGuestId = this.setObj.Id
this.msg.OldStudentStatus = this.setObj.GuestState this.msg.OldStudentStatus = this.setObj.GuestState
} }
console.log(57, this.msg)
}, },
methods: { methods: {
closeSaveForm() { closeSaveForm() {
......
src/pages/course/prepareclassDetails.vue
View file @ 24316755
...@@ -209,20 +209,27 @@ ...@@ -209,20 +209,27 @@
margin: 0 10px 10px 0; margin: 0 10px 10px 0;
display: inline-block; display: inline-block;
} }
.Pre-ComBg{
.Pre-ComBg {
background-color: #e8e8e8; background-color: #e8e8e8;
} }
</style> </style>
<template> <template>
<div class="row prepareclassDetails"> <div class="row prepareclassDetails">
<div class="page-body col" style="height: calc(100% - 30px) !important;" v-if="data.Chapter"> <!-- <div class="page-body col" style="height: calc(100% - 30px) !important;" v-if="data.Chapter">
<q-scroll-area <q-scroll-area :thumb-style="thumbStyle" :content-style="contentStyle" :content-active-style="contentActiveStyle"
:thumb-style="thumbStyle" class="full-width full-height">
:content-style="contentStyle"
:content-active-style="contentActiveStyle" </q-scroll-area>
class="full-width full-height" </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="row">
<div class="prepareTopTitle q-table__title col"> <div class="prepareTopTitle q-table__title col">
<div class="prePare_Line"></div> <div class="prePare_Line"></div>
...@@ -242,34 +249,31 @@ ...@@ -242,34 +249,31 @@
<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="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="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="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>
<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="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>
<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> </div>
<div v-else class="q-pa-lg bg-grey-2 rounded-borders q-my-lg">暂无章节信息</div> <div v-else class="q-pa-lg bg-grey-2 rounded-borders q-my-lg">暂无章节信息</div>
</q-scroll-area> </q-card-section>
</div> </q-card>
<div class="page-body col" style="height: calc(100% - 30px) !important;"> </q-expansion-item>
<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">
...@@ -294,18 +298,19 @@ ...@@ -294,18 +298,19 @@
</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="margint-15 row" style="align-items: flex-start" <div class="margint-15 row" style="align-items: flex-start" v-for="(item,index) in data.LessonPlanList"
v-for="(item,index) in data.LessonPlanList" :key="index" v-if="index==0"> :key="index" v-if="index==0">
<div class="text14-o q-pa-md Pre-ComBg rounded-borders" 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="margint-15" style="align-items: flex-start" <div class="margint-15" style="align-items: flex-start" v-for="(item,index) in data.LessonPlanList"
v-for="(item,index) in data.LessonPlanList" :key="index" v-if="index==0"> :key="index" v-if="index==0">
<!-- <div class="text12-n width50">{{item.CourseName}}：</div> --> <!-- <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 v-html="x.ProjectContent">
</div> </div>
...@@ -351,22 +356,22 @@ ...@@ -351,22 +356,22 @@
<div class="beike-jan"> <div class="beike-jan">
<div class="jan-l"></div> <div class="jan-l"></div>
</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> <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>
</div> </div>
<!-- <template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0"> --> <!-- <template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0"> -->
<template v-if="(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify"> <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 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">
<el-image <el-image style="height: 100%;height:100%" :src="item" fit="cover" :preview-src-list="ImgList">
style="height: 100%;height:100%" </el-image>
: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>
...@@ -378,38 +383,32 @@ ...@@ -378,38 +383,32 @@
</div> </div>
</template> </template>
<template v-else> <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 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">
<el-image <el-image style="height: 100%;height:100%" :src="item" fit="cover" :preview-src-list="ImgList">
style="height: 100%;height:100%" </el-image>
:src="item"
fit="cover"
:preview-src-list="ImgList"></el-image>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</div> </div>
<q-btn color="accent" size="sm" v-if="(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify" class="margint-15" @click="saveOrderInfo()" <q-btn color="accent" size="sm" v-if="(data.BeiKeStatus>0&&data.FanKuiStatus===0&&isShowBtn)||isModify"
style="margin:20px 0 0 15px;width:97%;height:40px;" label="提交" /> 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()" <!-- <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> </q-scroll-area>
</div> </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;"> 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 <q-scroll-area :thumb-style="thumbStyle" :content-style="contentStyle" :content-active-style="contentActiveStyle"
:thumb-style="thumbStyle" class="full-width" style="height:calc(100% - 251px);">
:content-style="contentStyle"
:content-active-style="contentActiveStyle"
class="full-width"
style="height:calc(100% - 251px);"
>
<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"
...@@ -432,6 +431,23 @@ ...@@ -432,6 +431,23 @@
{{item.CreateTimeStr}} {{item.CreateTimeStr}}
</span> </span>
</div> </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>
<div class="c-i-Comment"> <div class="c-i-Comment">
{{item.Comment}} {{item.Comment}}
...@@ -454,8 +470,8 @@ ...@@ -454,8 +470,8 @@
</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="写下你想评价的内容" type="textarea" style="flex:1" /> <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;" <img src="../../assets/images/course/fasong.png" alt=""
@click="btnpl()"> style="width: 35px;height: 35px;margin-left: 20px;cursor:pointer;" @click="btnpl()">
</div> </div>
</div> </div>
...@@ -471,7 +487,8 @@ ...@@ -471,7 +487,8 @@
getLessonCommentList, getLessonCommentList,
setLessonComment, setLessonComment,
updateClassLessPlan, updateClassLessPlan,
GetNowUserLessonComment GetNowUserLessonComment,
delLessonComment
} from '../../api/course/class'; } from '../../api/course/class';
import { import {
UploadSelfFile, UploadSelfFile,
...@@ -480,6 +497,7 @@ ...@@ -480,6 +497,7 @@
name: "prepareclassDetails", name: "prepareclassDetails",
data() { data() {
return { return {
loginId:0,
contentStyle: {}, contentStyle: {},
contentActiveStyle: {}, contentActiveStyle: {},
thumbStyle: { thumbStyle: {
...@@ -496,19 +514,22 @@ ...@@ -496,19 +514,22 @@
}, },
Dloading: false, Dloading: false,
plmsg: { plmsg: {
LessonCommentId:0,
Comment: '', Comment: '',
Score: 5, Score: 5,
LessonPlanId: 0, LessonPlanId: 0,
ClassId: 0, ClassId: 0,
ClassPlanId: 0, ClassPlanId: 0,
TeacherId: 0 TeacherId: 0,
ClassDate:"",
}, },
data: {}, data: {},
CommentList: [], CommentList: [],
AccountType: true, AccountType: true,
scoreMsg: { scoreMsg: {
ClassPlanId: 0, ClassPlanId: 0,
ClassId: 0 ClassId: 0,
ClassDate:"",
}, },
Score: 0, Score: 0,
nowDate: '', //现在时间 nowDate: '', //现在时间
...@@ -516,20 +537,26 @@ ...@@ -516,20 +537,26 @@
isUpData: true, isUpData: true,
conclusion: '', //课后总结 conclusion: '', //课后总结
ImgList: [], //总结图片数组 ImgList: [], //总结图片数组
LessonPlanNum:0, LessonPlanNum: 0,
LessonPlanSummaryNum:0, LessonPlanSummaryNum: 0,
TeacherId:0, TeacherId: 0,
isShowBtn:false, isShowBtn: false,
isModify:false, isModify: false,
headStyle: {
'font-size': '16px',
'font-family': 'perfectFont',
'color': '#000000',
'font-weight': 'bold',
'letter-spacing': '.005em',
'padding-left': '0'
}
} }
}, },
created() { created() {
let data=JSON.parse(localStorage.getItem("loginUserInfo"))
this.loginId=data.data.Id
}, },
mounted() { mounted() {
this.msg.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId : 0; 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.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.ClassId = this.$route.query.ClassId ? this.$route.query.ClassId : 0;
...@@ -545,14 +572,13 @@ ...@@ -545,14 +572,13 @@
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.AccountType = userInfo.AccountType == 2 ? false : true; //是否是教师 this.AccountType = userInfo.AccountType == 2 ? false : true; //是否是教师
let AccountId = userInfo.AccountId; let AccountId = userInfo.AccountId;
if(AccountId==this.TeacherId){ if (AccountId == this.TeacherId) {
this.isShowBtn=true; this.isShowBtn = true;
}else{ } else {
this.isShowBtn=false; this.isShowBtn = false;
} }
this.getList() //备课内容 this.getList() //备课内容
this.getCommentList() //评价
this.getUserComment();
var today = new Date(); var today = new Date();
var y = today.getFullYear(); var y = today.getFullYear();
...@@ -565,9 +591,9 @@ ...@@ -565,9 +591,9 @@
}, },
methods: { methods: {
//是否能修改总结 //是否能修改总结
modify(){ modify() {
// this.isModify=true // this.isModify=true
this.isModify=!this.isModify this.isModify = !this.isModify
}, },
//获取评论显示分数 //获取评论显示分数
getUserComment() { getUserComment() {
...@@ -581,10 +607,10 @@ ...@@ -581,10 +607,10 @@
getList() { getList() {
getClassLessPlan(this.msg).then(res => { getClassLessPlan(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
let data=res.Data; let data = res.Data;
if (data.Chapter && data.Chapter.length>0) { if (data.Chapter && data.Chapter.length > 0) {
if(!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length==0){ if (!data.Chapter[0].ChildList || data.Chapter[0].ChildList.length == 0) {
data.Chapter[0].ChildList=[] data.Chapter[0].ChildList = []
data.Chapter[0].ChildList.push(data.Chapter[0]) data.Chapter[0].ChildList.push(data.Chapter[0])
} }
this.chapters = data.Chapter this.chapters = data.Chapter
...@@ -600,11 +626,15 @@ ...@@ -600,11 +626,15 @@
if (a > 0) { if (a > 0) {
this.isUpData = false; 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.conclusion = this.data.LessonPlanList[0].Summary;
this.ImgList = this.data.LessonPlanList[0].ProjectPicList; this.ImgList = this.data.LessonPlanList[0].ProjectPicList;
// this.isShowBtn=false // this.isShowBtn=false
} }
this.plmsg.ClassDate=res.Data.ClassStartTime
this.scoreMsg.ClassDate=res.Data.ClassStartTime
this.getCommentList() //评价
this.getUserComment();
} }
}) })
}, },
...@@ -612,6 +642,7 @@ ...@@ -612,6 +642,7 @@
getLessonCommentList({ getLessonCommentList({
ClassId: this.msg.ClassId, ClassId: this.msg.ClassId,
ClassPlanId: this.msg.ClassPlanId, ClassPlanId: this.msg.ClassPlanId,
ClassDate:this.plmsg.ClassDate,
}).then(res => { }).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.CommentList = res.Data this.CommentList = res.Data
...@@ -649,16 +680,17 @@ ...@@ -649,16 +680,17 @@
}) })
this.plmsg.Score = 5; this.plmsg.Score = 5;
this.plmsg.Comment = ''; this.plmsg.Comment = '';
this.plmsg.LessonCommentId=0;
this.getUserComment() this.getUserComment()
this.getCommentList() this.getCommentList()
if(this.data.TotalScore===0){ if (this.data.TotalScore === 0) {
this.getList() this.getList()
} }
} }
}) })
}, },
saveOrderInfo() { 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].Summary = this.conclusion;
this.data.LessonPlanList[0].ProjectPicList = this.ImgList; this.data.LessonPlanList[0].ProjectPicList = this.ImgList;
} }
...@@ -689,6 +721,48 @@ ...@@ -689,6 +721,48 @@
//删除图片 //删除图片
deleteItemImg(index) { deleteItemImg(index) {
this.ImgList.splice(index, 1); 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 @ 24316755
...@@ -334,6 +334,10 @@ ...@@ -334,6 +334,10 @@
<span style="color:#3FC4FF;font-size:12px;cursor:pointer" v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(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:#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> <span class="fankuiBtn" v-if="AccountType&&item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">反馈</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>
</div> </div>
</div> </div>
<div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher"> <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">
......
src/pages/teacher/myPrepareLessons.vue
View file @ 24316755
...@@ -101,11 +101,13 @@ ...@@ -101,11 +101,13 @@
.teacherLesson .TeacherNameList { .teacherLesson .TeacherNameList {
position: relative; position: relative;
color: #111111; color: #111111;
font-size:13px; font-size: 13px;
} }
.teacherLesson .TeacherNameList:last-child{
height:auto; .teacherLesson .TeacherNameList:last-child {
height: auto;
} }
.teacherLesson .cicle1 { .teacherLesson .cicle1 {
position: absolute; position: absolute;
left: -15px; left: -15px;
...@@ -158,11 +160,13 @@ ...@@ -158,11 +160,13 @@
.teacherLesson .TeacherInfo_List { .teacherLesson .TeacherInfo_List {
display: flex; display: flex;
height:60px; height: 60px;
} }
.teacher-box .TeacherInfo_List:last-child{
height:auto; .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;
} }
...@@ -219,50 +223,57 @@ ...@@ -219,50 +223,57 @@
padding: 20px 20px 10px 20px; padding: 20px 20px 10px 20px;
border-radius: 20px; border-radius: 20px;
} }
.Teacher_Class{
.Teacher_Class {
width: 95%; width: 95%;
height:45px; height: 45px;
background-color: #F0F5FB; background-color: #F0F5FB;
padding:0 20px; padding: 0 20px;
color:#111111; color: #111111;
margin-bottom:30px; margin-bottom: 30px;
font-weight: bold; font-weight: bold;
display:flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Teach_BigSpan{
font-size:18px; .Teach_BigSpan {
margin-right:20px; font-size: 18px;
margin-right: 20px;
} }
.Teach_MidSpan{
font-size:14px; .Teach_MidSpan {
font-size: 14px;
} }
.Plan-StartTime{
.Plan-StartTime {
width: 100px; width: 100px;
font-size:14px; font-size: 14px;
color:#111111; color: #111111;
font-weight:bold; font-weight: bold;
} }
.Plan_WeiBei{
color:#F44E60; .Plan_WeiBei {
font-size:12px; color: #F44E60;
font-size: 12px;
} }
.Teach_Circle{
.Teach_Circle {
color: #2961FE; color: #2961FE;
background-color: #D4DFFF; background-color: #D4DFFF;
display:inline-block; display: inline-block;
width:24px; width: 24px;
height:24px; height: 24px;
margin:0 10px 0 30px; margin: 0 10px 0 30px;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 24px; line-height: 24px;
font-size:12px; font-size: 12px;
position: relative; position: relative;
top:-2px; top: -2px;
} }
.fankuiBtn{
.fankuiBtn {
padding: 6px 20px; padding: 6px 20px;
background-color: #fff; background-color: #fff;
color: #2961FE; color: #2961FE;
...@@ -270,8 +281,9 @@ ...@@ -270,8 +281,9 @@
border-radius: 5px; border-radius: 5px;
margin-left: 20px; margin-left: 20px;
cursor: pointer; cursor: pointer;
border:1px solid #2961FE; border: 1px solid #2961FE;
} }
</style> </style>
<template> <template>
<div class="page-body teacherLesson"> <div class="page-body teacherLesson">
...@@ -325,13 +337,22 @@ ...@@ -325,13 +337,22 @@
</div> </div>
<div> <div>
<span v-if="item1.LessonPlanNum===0" class="Plan_WeiBei">未备课</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 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;" <!-- <span class="beikeBtn" v-if="item1.LessonPlanNum>0" style="backgroundColor:#3FC4FF;margin-right:20px;"
@click="goyibeike(item1)">已备课</span> --> @click="goyibeike(item1)">已备课</span> -->
<span class="beikeBtn" v-if="AccountType&&item1.LessonPlanNum===0" @click="goBeike(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:#3FC4FF;font-size:12px;cursor:pointer"
<span style="color:#FFA800;font-size:12px;" v-if="item1.LessonPlanSummaryNum==0&&item1.LessonPlanNum>0">未反馈</span> v-if="item1.LessonPlanSummaryNum>0&&item1.LessonPlanNum>0" @click="goyibeike(item1)">已反馈</span>
<span class="fankuiBtn" v-if="AccountType&&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>
<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>
</div> </div>
</div> </div>
<div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher"> <div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">
...@@ -521,18 +542,18 @@ ...@@ -521,18 +542,18 @@
// }); // });
this.OpenNewUrl("/course/lessonPreparation", { this.OpenNewUrl("/course/lessonPreparation", {
ClassId: item.ClassId, ClassId: item.ClassId,
School_Id:item.School_Id, School_Id: item.School_Id,
ClassPlanId:item.ClassPlanId, ClassPlanId: item.ClassPlanId,
Ranks:item.Ranks Ranks: item.Ranks
}); });
}, },
goyibeike(item) { goyibeike(item) {
this.OpenNewUrl("/course/prepareclassDetails", { this.OpenNewUrl("/course/prepareclassDetails", {
ClassId: item.ClassId, ClassId: item.ClassId,
ClassPlanId:item.ClassPlanId, ClassPlanId: item.ClassPlanId,
LessonPlanNum:item.LessonPlanNum, LessonPlanNum: item.LessonPlanNum,
LessonPlanSummaryNum:item.LessonPlanSummaryNum, LessonPlanSummaryNum: item.LessonPlanSummaryNum,
TeacherId:item.TeacherId TeacherId: item.TeacherId
}); });
// var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId + '&ClassPlanId=' + item.ClassPlanId + // var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId + '&ClassPlanId=' + item.ClassPlanId +
......
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