Skip to content

C
confucius
Commit 020beca0 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 521493f2
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 93 deletions
src/components/course/classlist.vue
View file @ 020beca0
......@@ -220,9 +220,6 @@
import classconflictForm from '../../components/course/classconflict-form';
export default {
meta: {
title: "班级列表"
},
props: {
data: {
type: Array,
......
src/components/question/questionlist-form.vue
View file @ 020beca0
......@@ -49,7 +49,7 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
separator="none" :data="data" :columns="columns" row-key="QuestionId" :selection="editStatus?'multiple':'none'"
:selected.sync="selectedQuestion">
<template v-slot:top="props">
<template v-slot:top>
<div class="col-2 q-table__title">问题列表</div>
<q-space />
<div class="page-option" v-if="editStatus">
......@@ -149,9 +149,7 @@
default: true
}
},
meta: {
title: "问题列表"
},
components: {
questionForm,
questionUpload
......
src/pages/course/catagory.vue
View file @ 020beca0
......@@ -3,20 +3,19 @@
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.CateName" label="系列名称"
@clear="resetSearch" maxlength="20" />
<q-input @input="resetSearch" clearable filled v-model="msg.CateName" label="系列名称" @clear="resetSearch"
maxlength="20" />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
<q-select @input="resetSearch" filled v-model="msg.CourseSubject" :options="CourseSubjectList"
option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目" clearable />
</div>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" :data="dataList" :columns="columns">
<template v-slot:top="props">
<template v-slot:top>
<div class="col-2 q-table__title">系列信息</div>
<q-space />
<div class="page-option">
......@@ -57,7 +56,7 @@
export default {
meta: {
title: "课程系类"
title: "课程系列"
},
components: {
categoryForm,
......@@ -70,7 +69,7 @@
rowsPerPage: 10,
PageCount: 1,
CateName: "", //系列名称
CourseSubject:'' //所属科目
CourseSubject: '' //所属科目
},
CourseSubjectList: [], //科目列表
currentUrl: "",
......@@ -85,7 +84,7 @@
label: '所属科目',
field: 'CourseSubjectName',
align: 'left'
},{
}, {
name: 'CateName',
label: '系列名称',
field: 'CateName',
......@@ -205,9 +204,7 @@
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
</style>
\ No newline at end of file
src/pages/course/lessonNotes.vue
View file @ 020beca0
......@@ -25,8 +25,8 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">课程信息</div>
<template v-slot:top>
<div class="col-2 q-table__title">课程大纲信息</div>
<q-space />
</template>
<template v-slot:body-cell-CoverImg="props">
......@@ -43,7 +43,7 @@
</template>
<template v-slot:body-cell-PreferentialListSellCommission="props">
<q-td :props="props" style="padding-right:0px;padding-left:0px">
<div v-for="x in props.value">
<div v-for="(x,index) in props.value" :key="index">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.SaleCommissionType == 1 ? "￥" : ""
......@@ -61,7 +61,7 @@
</template>
<template v-slot:body-cell-PreferentialListB2BCommission="props">
<q-td :props="props" style="padding-left:0px">
<div v-for="x in props.value">
<div v-for="(x,index) in props.value" :key="index">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.B2BCommissionType == 1 ? "￥" : ""
......@@ -79,7 +79,7 @@
</template>
<template v-slot:body-cell-EducationCommission="props">
<q-td :props="props" style="padding-left:0px">
<div v-for="x in props.value">
<div v-for="(x,index) in props.value" :key="index">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.EduCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "￥" : ""
......@@ -130,7 +130,7 @@
} from "vuex";
export default {
meta: {
title: "课程教案"
title: "课程大纲"
},
components: {
selectTree
......
src/pages/course/teacherLesson.vue
View file @ 020beca0
......@@ -101,11 +101,13 @@
.teacherLesson .TeacherNameList {
position: relative;
color: #111111;
font-size:13px;
font-size: 13px;
}
.teacherLesson .TeacherNameList:last-child{
height:auto;
.teacherLesson .TeacherNameList:last-child {
height: auto;
}
.teacherLesson .cicle1 {
position: absolute;
left: -15px;
......@@ -158,11 +160,13 @@
.teacherLesson .TeacherInfo_List {
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 {
border-left: 0 !important;
}
......@@ -219,50 +223,57 @@
padding: 20px 20px 10px 20px;
border-radius: 20px;
}
.Teacher_Class{
.Teacher_Class {
width: 95%;
height:45px;
height: 45px;
background-color: #F0F5FB;
padding:0 20px;
color:#111111;
margin-bottom:30px;
padding: 0 20px;
color: #111111;
margin-bottom: 30px;
font-weight: bold;
display:flex;
display: flex;
align-items: center;
justify-content: space-between;
}
.Teach_BigSpan{
font-size:18px;
margin-right:20px;
.Teach_BigSpan {
font-size: 18px;
margin-right: 20px;
}
.Teach_MidSpan{
font-size:14px;
.Teach_MidSpan {
font-size: 14px;
}
.Plan-StartTime{
.Plan-StartTime {
width: 100px;
font-size:14px;
color:#111111;
font-weight:bold;
font-size: 14px;
color: #111111;
font-weight: bold;
}
.Plan_WeiBei{
color:#F44E60;
font-size:12px;
.Plan_WeiBei {
color: #F44E60;
font-size: 12px;
}
.Teach_Circle{
.Teach_Circle {
color: #2961FE;
background-color: #D4DFFF;
display:inline-block;
width:24px;
height:24px;
margin:0 10px 0 30px;
display: inline-block;
width: 24px;
height: 24px;
margin: 0 10px 0 30px;
border-radius: 50%;
text-align: center;
line-height: 24px;
font-size:12px;
font-size: 12px;
position: relative;
top:-2px;
top: -2px;
}
.fankuiBtn{
.fankuiBtn {
padding: 6px 20px;
background-color: #fff;
color: #2961FE;
......@@ -270,7 +281,7 @@
border-radius: 5px;
margin-left: 20px;
cursor: pointer;
border:1px solid #2961FE;
border: 1px solid #2961FE;
}
</style>
<template>
......@@ -290,7 +301,7 @@
</div>
</div>
<div class="Cal_Content col">
<div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}"
<div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" :key="index"
@click="getItem(item)">
{{item}}
<div class="beikeStatus beike1" v-if="getLessonStatus(item)=='未备课'">
......@@ -325,22 +336,29 @@
</div>
<div>
<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;"
@click="goyibeike(item1)">已备课</span> -->
<span class="beikeBtn" style="margin:0 20px 0 0" v-if="AccountType&&item1.LessonPlanNum>0" @click="goBeike(item1)">修改</span>
<span class="beikeBtn" style="margin:0 20px 0 0" 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:#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>
<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>
<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 class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher">
<div class="TeacherInfo_List" v-for="(item,index) in item1.planListTeacher" :key="index">
<div class="timeleft">
<div class="Plan-StartTime">
{{item.StartTime}}-{{item.EndTime}}
......@@ -387,7 +405,7 @@
} from '../../api/course/class';
export default {
meta: {
title: "课程"
title: "备课管理"
},
props: {},
data() {
......@@ -527,18 +545,18 @@
// });
this.OpenNewUrl("/course/lessonPreparation", {
ClassId: item.ClassId,
School_Id:item.School_Id,
ClassPlanId:item.ClassPlanId,
Ranks:item.Ranks
School_Id: item.School_Id,
ClassPlanId: item.ClassPlanId,
Ranks: item.Ranks
});
},
goyibeike(item) {
this.OpenNewUrl("/course/prepareclassDetails", {
ClassId: item.ClassId,
ClassPlanId:item.ClassPlanId,
LessonPlanNum:item.LessonPlanNum,
LessonPlanSummaryNum:item.LessonPlanSummaryNum,
TeacherId:item.TeacherId
ClassPlanId: item.ClassPlanId,
LessonPlanNum: item.LessonPlanNum,
LessonPlanSummaryNum: item.LessonPlanSummaryNum,
TeacherId: item.TeacherId
});
// var tempStr = '/course/prepareclassDetails?ClassId=' + item.ClassId + '&ClassPlanId=' + item.ClassPlanId +
......@@ -549,9 +567,7 @@
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
</style>
\ No newline at end of file
src/pages/scheduling/schedulingRecord.vue
View file @ 020beca0
......@@ -155,7 +155,7 @@
} from '../../api/users/user'; //获取员工
export default {
meta: {
title: "排班计划"
title: "值班记录"
},
components: {
......
src/pages/studyAbroad/subscribe.vue
View file @ 020beca0
......@@ -155,7 +155,9 @@
><span>{{ __item.ScrollMaxNum }}</span>
</div> -->
</div>
<div v-if="viewType == 'week'&&__item.ClassType === 3" style="white-space:pre-wrap;font-size:10px">{{__item.CourseGradeName}}<span>({{__item.Ranks||0}})</span> </div>
<div v-if="viewType == 'week'&&__item.ClassType === 3"
style="white-space:pre-wrap;font-size:10px">
{{__item.CourseGradeName}}<span>({{__item.Ranks||0}})</span> </div>
</div>
<div style="position:relative">
<q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0"
......@@ -182,11 +184,11 @@
<span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 1">
<span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
<span class="detailLabel">进度：</span><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="detailLabel">进度：</span><span>第{{ __item.Ranks||0 }}次课</span>
<span class="q-ml-sm" v-if="__item.CourseGradeName">({{__item.CourseGradeName}})</span>
<span class="detailLabel">进度：</span><span>第{{ __item.Ranks||0 }}次课</span>
<span class="q-ml-sm" v-if="__item.CourseGradeName">({{__item.CourseGradeName}})</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel"> 类型：</span><span v-if="__item.ClassType == 1">跟班</span><span
......@@ -260,6 +262,9 @@
import QCalendar from "@quasar/quasar-ui-qcalendar";
export default {
meta: {
title: "约课中心",
},
data() {
return {
config: {
......@@ -582,7 +587,6 @@
}
}
};
</script>
<style lang="scss">
......@@ -625,5 +629,4 @@
width: 100%;
display: inline-block;
}
</style>
</style>
\ No newline at end of file
src/pages/teacher/changeClassManager.vue
View file @ 020beca0
......@@ -185,7 +185,7 @@
import tougaoForm from "../../components/sale/tougao-form.vue";
export default {
meta: {
title: "业务单据",
title: "我的业务单据",
},
components: {
backbillForm,
......
src/pages/teacher/myClass.vue
View file @ 020beca0
......@@ -77,7 +77,7 @@
import classlist from '../../components/course/classlist';
export default {
meta: {
title: "班级管理"
title: "我的班级"
},
components: {
classlist,
......
src/pages/teacher/studentManager.vue
View file @ 020beca0
......@@ -113,8 +113,6 @@
<StopLesson-form v-if="isShowStopLesson" :setObj="stuObj" @success="reloadPage" @close="closeMenuSaveForm"/>
<ProvisionalInvite-form v-if="isShowProvisionalInvite" @close="closeMenuSaveForm"/>
</div>
</div>
</template>
<script>
......@@ -137,7 +135,7 @@
import ProvisionalInviteForm from '../../components/teacher/provisionalInviteForm'
export default {
meta: {
title: "班级管理"
title: "学员管理"
},
components: {
// classForm,
......
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