Skip to content

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

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

# Conflicts:
#	src/App.vue
#	src/pages/teacher/teacherSchedule.vue
parents 59461220 ea4ee0cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2983 additions and 265 deletions
src/App.vue
View file @ 43d76395
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_6so9z0a6plx.css');
@import url('//at.alicdn.com/t/font_2077629_yfy3fscrw0g.css');
.q-scrollarea__thumb{
z-index: 999999!important;
}
......
src/api/scheduling/schedu.js
View file @ 43d76395
......@@ -290,4 +290,52 @@ export function GetHandoverShiftList() {
method: 'post',
data: ""
})
}
/**
* 获取节假日计划分页列表
* @param {JSON参数} data
*/
export function getHolidayPlanList(data) {
return request({
url: '/Holiday/GetHolidayList',
method: 'post',
data: data
})
}
/**
* 获取节假日计划详情
* @param {JSON参数} data
*/
export function getHolidayInfo(data) {
return request({
url: '/Holiday/GetHolidayInfo',
method: 'post',
data: data
})
}
/**
* 新增节假日计划
* @param {JSON参数} data
*/
export function setHolidayPlan(data) {
return request({
url: '/Holiday/SetHoliday ',
method: 'post',
data: data
})
}
/**
* 删除节假日计划
* @param {JSON参数} data
*/
export function delHolidayPlan(data) {
return request({
url: '/Holiday/DelHoliday ',
method: 'post',
data: data
})
}
\ No newline at end of file
src/api/teacher/student.js 0 → 100644
View file @ 43d76395
import request from '../../utils/request'
/**
* 获取学员管理列表
* @param {JSON参数} data
*/
export function GetStuPageList(data) {
return request({
url: '/TeacherClass/GetClassStudent',
method: 'post',
data
})
}
src/components/course/classmate-form.vue
View file @ 43d76395
......@@ -10,7 +10,7 @@
height: 40px;
}
.MainPlan td {
.planClass-table td {
vertical-align: top;
padding: 5px;
width: 14%;
......@@ -126,7 +126,7 @@
</thead>
</table>
<div class="planTabDiv" ref="planTabDiv">
<table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index">
<td>
......
src/components/schedul/vacationPlan-form.vue 0 → 100644
View file @ 43d76395
<template>
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
<q-card style="width: 480px;max-width:480px;">
<q-card-section>
<div class="text-h6">
{{ addMsg.HolidayId > 0 ? "修改计划表" : "新增计划表" }}
</div>
</q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="row wrap">
<q-select filled class="col-12" option-value="value" option-label="label" ref="DayType"
v-model="addMsg.DayType" :options="typeOpts" :rules="[val => !!val || '请选择计划类型']" emit-value map-options
label="计划类型" />
</div>
<div class="row wrap">
<div class="col-12 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="date" value-format="yyyy-MM-dd" type="daterange"  range-separator="至"
 start-placeholder="开始日期"  end-placeholder="结束日期">
 </el-date-picker>       
</template>
</q-field>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeVisitForm" />
<q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" :loading="saveCourseLoading"
@click="saveCourse" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script>
import {
setHolidayPlan,
} from '../../api/scheduling/schedu'
export default {
components: {},
props: {
saveObj: {
type: Object,
default: null
}
},
data() {
return {
persistent: true,
addMsg: {
HolidayId: 0,
DayType: 1, //类型
StartTime: "", //开始时间
EndTime: "", //结束时间
},
date: [],
typeOpts: [{
label: '节假日',
value: 1
},
{
label: '工作日',
value: 2
}
],
saveCourseLoading: false,
};
},
created() {
if (this.saveObj && this.saveObj.HolidayId > 0) {
this.addMsg = this.saveObj
this.date[0] = this.saveObj.StartTime
this.date[1] = this.saveObj.EndTime
}
},
methods: {
//关闭弹窗
closeVisitForm() {
this.$emit("close");
this.persistent = false;
},
//保存菜单
saveCourse() {
if (!this.date) {
this.date = ["", ""]
}
this.addMsg.StartTime = this.date[0]
this.addMsg.EndTime = this.date[1]
console.log(97, this.date, this.addMsg)
if (this.addMsg.StartTime == "" || this.addMsg.EndTime == "") {
this.$q.notify({
icon: "error",
color: "negative",
message: '请选择时间',
position: "top"
})
return
}
setHolidayPlan(this.addMsg).then(res=>{
if(res.Code===1){
this.Success(res.Message)
this.closeVisitForm();
this.$emit("success")
}
})
},
}
};
</script>
src/pages/Work.vue
View file @ 43d76395
......@@ -32,7 +32,7 @@
</q-list>
</q-menu>
</q-btn>
<q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理">
<!-- <q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理"> -->
</q-btn>
<q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn>
<q-btn flat @click="changeMenu(4)" v-if="AccountType==2" :color="chosenMenu==4?'primary':'blue-grey-14'" :class="[chosenMenu==4?'text-weight-bold':'']" label="我的上课计划"></q-btn>
......
src/pages/activity/makeAd.vue
View file @ 43d76395
......@@ -1301,7 +1301,7 @@
  showQRcode(path) {
      this.apipostDS(
        "/api/user/GetWeiXinQRCodeForHT",
        { Path: "/pages/"+path+'?JumpType=17', With: 212 },
        { Path: "/pages/"+path, With: 212 },
        (res) => {
          if (res.data.resultCode == 1) {
            if (res.data.data) {
......
src/pages/classroom/components/scenicSummary.vue
View file @ 43d76395
......@@ -18,7 +18,7 @@
</thead>
</table>
<div class="planTabDiv" ref="planTabDiv">
<table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody>
<tr v-for="(item,index) in tbodayData.fridayList" :key="index">
<td>
......@@ -116,7 +116,7 @@
height: 40px;
}
.MainPlan td {
.planClass-table td {
vertical-align: top;
padding: 5px;
width: 14%;
......
src/pages/classroom/courseInfo.vue
View file @ 43d76395
......@@ -301,11 +301,9 @@
if (this.$route.query.id) {
this.id = this.$route.query.id;
}
},
mounted(){
this.getdata();
this.getdata();
},
methods: {
getdata(){
......@@ -351,8 +349,7 @@
getVideoPlayUrl({strVid:url}).then(res=>{
if(res.Code===1){
this.initPlayer(res.Data.URL,res.Data.VideoImg,auth)
}
}
})
}
},
......
src/pages/classroom/useRecord.vue
View file @ 43d76395
......@@ -8,7 +8,7 @@
</div>
<div class="col-3">
<q-select @input="getClassRoomTimeList" standout="bg-primary text-white" option-value="RoomId"
option-label="RoomName" v-model="msg.ClassRoomId" :options="classroomopt" emit-value map-options
option-label="RoomName" v-model="msg.ClassRoomId" :options="classroomopt" emit-value map-options use-input clearable
label="关联教室" @filter="filterFn">
<template v-slot:no-option>
<q-item>
......@@ -78,10 +78,8 @@
},
tbodayData: [],
schoolopt: [],
classroomopt: [{
RoomName: "不限",
RoomId: 0
}],
classroomopt: [],
AllClassroomOpt:[]
};
},
created() {
......@@ -109,11 +107,10 @@
filterFn(val, update) {
update(() => {
if (val === '') {
this.classroomopt = JSON.parse(JSON.stringify(this.classroomopt))
this.classroomopt = JSON.parse(JSON.stringify(this.AllClassroomOpt))
} else {
const needle = val.toLowerCase();
this.classroomopt = this.classroomopt.filter(v => v.RoomName.toLowerCase().indexOf(needle) > -1);
this.classroomopt = this.AllClassroomOpt.filter(v => v.RoomName.toLowerCase().indexOf(needle) > -1);
}
})
},
......@@ -126,10 +123,6 @@
if (!this.$route.query.key) {
this.msg.SchoolId = res.Data[0].Key
}
this.schoolopt.unshift({
SchoolName: "不限",
Key: -1
})
this.schoolChange2(this.msg.SchoolId)
}
}).catch(() => {
......@@ -147,6 +140,7 @@
RoomId: 0
}
this.classroomopt = [obj, ...res[0].RoomList]
this.AllClassroomOpt=[obj, ...res[0].RoomList]
}
}
......@@ -164,6 +158,7 @@
RoomId: 0
}
this.classroomopt = [obj, ...res[0].RoomList]
this.AllClassroomOpt=[obj, ...res[0].RoomList]
}
this.getClassRoomTimeList()
......@@ -184,10 +179,6 @@
this.msg.ClassRoomId = val.RoomId
this.msg.SchoolId = val.schoolId
this.getClassRoomTimeList();
this.$forceUpdate()
},
dateChoose(value, reason, details) {
},
//获取结束日期
getEndTime(date) {
......
src/pages/course/classManage.vue
View file @ 43d76395
......@@ -63,6 +63,12 @@
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增班级" @click="EditCourse(null)" />
</div>
</template>
<template v-slot:body-cell-CourseId="props">
<q-td auto-width :props="props">
<span style="color:blue;cursor:pointer;" @click="goChapter(props.row.CouseId)">详情</span>
</q-td>
</template>
<template v-slot:body-cell-ClassName="props">
<q-td auto-width :props="props">
<div style="display: flex;align-items: center;">
......@@ -262,6 +268,12 @@
field: 'OtherCourseName',
align: 'left'
},
{
name: 'CourseId',
label: '课程大纲',
field: 'CourseId',
align: 'left'
},
{
name: 'TeacherName',
label: '带班老师',
......@@ -280,6 +292,12 @@
field: 'OpenTime',
align: 'left'
},
{
name: 'FinishTimeStr',
label: '预计结束时间',
field: 'FinishTimeStr',
align: 'left'
},
{
name: 'CompleteProgress',
label: '课程进度',
......@@ -423,8 +441,7 @@
query: {
ClassId: item.ClassId,
School_Id: item.School_Id,
ClassName: item.ClassName,
ClassName: encodeURI(item.ClassName),
blank: 'y'
}
})
......@@ -522,6 +539,12 @@
ClassId: row.ClassId,
ClassName: ClassName,
});
},
//跳转到课程大纲
goChapter(CouseId){
this.OpenNewUrl('/course/chapter' , {
CourseId: CouseId
});
}
}
}
......
src/pages/course/lessonPreparation.vue
View file @ 43d76395
......@@ -118,10 +118,10 @@
border: 1px dashed #E2E2E2;
}
.lessonPreparation .cont .q-gutter-y-xs>*,
/* .lessonPreparation .cont .q-gutter-y-xs>*,
.q-gutter-xs>* {
margin: 0;
}
} */
.lessonPreparation .cont:hover .Less_Delete {
display: inline-block;
......
src/pages/course/prepareclassDetails.vue
View file @ 43d76395
......@@ -355,21 +355,7 @@
课后总结
</div>
</div>
<template v-if="(LessonPlanNum>0&&LessonPlanSummaryNum>0) || this.data.LessonPlanList[0].Summary!=''">
<div class="text14-o q-pa-md Pre-ComBg rounded-borders" style="margin-top:10px;background-color:rgb(251, 246, 240)">{{conclusion}}</div>
<div style="display:flex;flex-wrap: wrap;margin-top:20px;">
<div v-if="ImgList.length>0" v-for="(item,index) in ImgList">
<div class="pre-ImgDiv">
<el-image
style="height: 100%;height:100%"
:src="item"
fit="cover"
:preview-src-list="ImgList"></el-image>
</div>
</div>
</div>
</template>
<template v-else>
<template v-if="LessonPlanNum>0&&LessonPlanSummaryNum==0">
<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">
......@@ -390,6 +376,20 @@
</el-upload>
</div>
</template>
<template v-else>
<div class="text14-o q-pa-md Pre-ComBg rounded-borders" style="margin-top:10px;background-color:rgb(251, 246, 240)">{{conclusion}}</div>
<div style="display:flex;flex-wrap: wrap;margin-top:20px;">
<div v-if="ImgList.length>0" v-for="(item,index) in ImgList">
<div class="pre-ImgDiv">
<el-image
style="height: 100%;height:100%"
:src="item"
fit="cover"
:preview-src-list="ImgList"></el-image>
</div>
</div>
</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="提交" />
......@@ -595,11 +595,10 @@
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){
this.conclusion = this.data.LessonPlanList[0].Summary;
this.ImgList = this.data.LessonPlanList[0].ProjectPicList;
this.isShowBtn=false
// this.isShowBtn=false
}
}
})
......@@ -667,6 +666,10 @@
position: 'top'
})
this.getList();
var tempStr = '/course/teacherLesson'
this.$router.push({
path: tempStr
});
}
})
},
......
src/pages/course/teacherLesson.vue
View file @ 43d76395
<style>
.teacherLesson .TeacherTop {
display: flex;
min-width: 1200px;
/* min-width: 1200px; */
}
.teacherLesson .Teacher_Left {
......@@ -67,7 +67,7 @@
}
.teacherLesson .Cal_Content {
min-width: 880px;
/* min-width: 880px; */
width: 80%;
display: inline-block;
margin-left: 10px;
......@@ -328,6 +328,8 @@
<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" 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>
......
src/pages/financial/EasyReport.vue
View file @ 43d76395
This diff is collapsed.
src/pages/financial/JumpReport.vue
View file @ 43d76395
<style scoped>
@import "css/cssReset.css";
.page_fnDm{background-color: white}
.query-box{overflow: inherit}
/* .page_fnDm{background-color: white} */
.page_fnDm{padding: 20px;}
.query-box{overflow: inherit;}
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
......@@ -108,7 +109,7 @@
<template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex(),getPageList()">
<div class="query-box">
<div class="query-box" style="background: #FFFFFF;border-radius: 6px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<!-- <el-col :span="4">
......@@ -298,19 +299,21 @@
</template>
</el-row>
</el-form>
<ul class="clearfix">
<ul class="clearfix" style="padding-right:20px ;">
<li class="hight_query">
<!-- <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()" style="margin: 0;">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" label="查询" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
<div class="JumpDivTitleOne">应收金额：{{SumYingShou}} <span class="JumpSpan">实收金额：{{SumShiShou}}</span> 待收金额：{{SumDaiShou}}</div>
<div class="JumpDivTitleTwo">应付金额：{{SumYingFu}} <span class="JumpSpan">实付金额：{{SumShiFu}}</span> 待付金额：{{SumDaiFu}}</div>
</div>
<div class="_fnDm_content" v-loading='loading'>
<div class="_fnDm_content" v-loading='loading' style="padding: 20px;background: #FFFFFF;">
<!-- <v-table-->
<!-- is-horizontal-resize-->
<!-- column-width-drag-->
......@@ -330,7 +333,7 @@
<el-table
:data="DataList"
border
style="width: 100%;font-size: 12px">
style="width: 100%;font-size: 12px;padding: ;">
<el-table-column prop="FrID" label="单号" width="80">
<template slot-scope='scope'>
<el-popover
......@@ -547,6 +550,7 @@
path: '/' + path,
query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
})
},
}
})
......@@ -1069,6 +1073,12 @@
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.startDate && this.$route.query.endDate){//7月8号新加 因为从简易报表跳转过来的 季度那种情况时间带不过来 然后从新处理了
this.msg.sTradeDate=this.$route.query.startDate;
this.msg.eTradeDate=this.$route.query.endDate;
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
}
......@@ -1546,7 +1556,11 @@
this.currentPage = 1;
},
goUrl(path,rowData,){
this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
// this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
this.OpenNewUrl('/financial/financalDocument/'+ path, {
"id":rowData.FrID,
tab:'单据详情'
});
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
......
src/pages/financial/TeamRevenueReport.vue
View file @ 43d76395
......@@ -1473,6 +1473,7 @@
query: {
ClassId: rowData.ClassId,
School_Id: rowData.SchoolId,
ClassName:encodeURI(rowData.ClassName),
blank: 'y'
}
})
......
src/pages/financial/financalDocument/BasicDocuments.vue
View file @ 43d76395
......@@ -3344,7 +3344,8 @@
path: '/course/' + path,
query: {
'ClassId': item.ClassId,
'School_Id': item.School_Id
'School_Id': item.School_Id,
'ClassName': encodeURI(item.ClassName) ,
}
})
} else {
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 43d76395
......@@ -2204,7 +2204,9 @@
path: '/course/' + path,
query: {
'ClassId': item.ClassId,
'School_Id': item.School_Id
'School_Id': item.School_Id,
'ClassName': encodeURI(item.ClassName) ,
}
})
} else {
......
src/pages/sale/japaneseTrain.vue
View file @ 43d76395
......@@ -223,6 +223,9 @@
</q-banner>
</q-popup-proxy>
</div>
<div>
<span style="color:blue;cursor:pointer;" @click="goChapter(item.CouseId)">课程大纲</span>
</div>
</div>
<div class="d3">
<div style="margin: 0">招生信息</div>
......@@ -361,7 +364,7 @@
this.CourseList();
this.GetTeacherList();
if (this.$route.query && this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
if (this.$route.query && this.$route.query.ClassNo) {
this.msg.ClassNo = this.$route.query.ClassNo;
......@@ -526,6 +529,12 @@
this.orderObj.Unit_Price = item.SellPrice;
this.isShowEditOrderForm = true;
},
//跳转到课程大纲
goChapter(CouseId){
this.OpenNewUrl('/course/chapter' , {
CourseId: CouseId
});
}
}
}
......
src/pages/sale/orderStatistics.vue
View file @ 43d76395
......@@ -221,7 +221,7 @@
this.msg.EnterID = Number(this.$route.query.EnterID) ;
}
if (this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
this.getOrderState();
this.getCourseList();
......
src/pages/scheduling/vacationPlan.vue 0 → 100644
View file @ 43d76395
<template>
<div class="page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.DayType" :options="typeOpts"
option-value="value" option-label="label" label="节假日类型" emit-value map-options />
</div>
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="开始日期"  end-placeholder="结束日期" >
 </el-date-picker>       
</template>
</q-field>
</div>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">节假日计划表</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增计划" @click="EditPlan(null)" />
</div>
</template>
<!-- <template v-slot:body-cell-time="props">
<q-td :props="props">
{{props.row.StartTime}}/{{props.row.EndTime}}
</q-td>
</template> -->
<template v-slot:body-cell-type="props">
<q-td :props="props">
<span v-if="props.row.DayType===1">节假日</span>
<span v-if="props.row.DayType===2">工作日</span>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-family:perfectFont" label="编辑"
@click="EditPlan(props.row)" />
<q-btn flat size="xs" icon="delete" color="accent" style="font-family:perfectFont" label="删除"
@click="delHolidayPlan(props.row)" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
</q-table>
<VacationPlanForm v-if="isShowSchoolForm" :save-obj="objOption" @close="closeSchoolForm" @success="resetSearch">
</VacationPlanForm>
</div>
</div>
</template>
<script>
import {
getHolidayPlanList,
delHolidayPlan
} from '../../api/scheduling/schedu'
import VacationPlanForm from '../../components/schedul/vacationPlan-form'
export default {
meta: {
title: "节假日计划表"
},
components: {
VacationPlanForm
},
data() {
return {
columns: [{
name: 'HolidayId',
label: '编号',
field: 'HolidayId',
align: 'left',
},
{
name: 'StartTime',
label: '开始时间',
align: 'left',
field: 'StartTime'
},
{
name: 'EndTime',
label: '结束时间',
align: 'left',
field: 'EndTime'
},
{
name: 'type',
label: '计划类型',
align: 'left',
field: ''
},
{
name: 'optioned',
label: '操作',
field: 'SId'
},
],
data: [],
loading: true,
typeOpts: [{
label: '不限',
value: 0
},
{
label: '节假日',
value: 1
},
{
label: '工作日',
value: 2
}
],
dateList: [],
msg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
DayType: 0, //类型
StartTime: "", //开始时间
EndTime: "", //结束时间
},
pageCount: 0,
objOption: {
DayType: 0, //类型
StartTime: "", //开始时间
EndTime: "", //结束时间
},
isShowSchoolForm: false, //是否显示校区弹窗
}
},
created() {
},
mounted() {
this.getList()
},
methods: {
getList() {
if(!this.dateList){
this.dateList=["",""]
}
this.msg.StartTime = this.dateList[0]
this.msg.EndTime = this.dateList[1]
this.loading = true
getHolidayPlanList(this.msg).then(res => {
this.loading = false
if (res.Code === 1) {
this.data = res.Data.PageData
this.pageCount = res.Data.PageCount
}
}).catch(err => {
this.loading = false
})
},
//重新查询
resetSearch() {
this.msg.pageIndex = 1;
this.getList();
},
//分页改变
changePage(val) {
this.msg.pageIndex = val;
this.getList()
},
//关闭校区弹窗
closeSchoolForm() {
this.isShowSchoolForm = false;
},
//新增、修改校区
EditPlan(obj) {
if (obj) {
this.objOption = obj;
} else {
this.objOption = null;
}
this.isShowSchoolForm = true;
},
//删除计划
delHolidayPlan(item){
let that=this
this.$q.dialog({
title: '删除确认',
message: '删除且无法恢复，你确定要删除吗',
cancel: {
label: "取消",
flat: true
},
ok: {
label: "确认",
flat: true,
focus: true,
color: "negative"
}
}).onOk(() => {
delHolidayPlan({HolidayId:item.HolidayId}).then(res=>{
console.log(res)
if(res.Code===1){
this.$message.success("操作成功")
that.resetSearch()
}
})
})
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
<style>
.Sysuser_Date .el-range-editor .el-range-input {
background-color: transparent;
width: 100%;
border: none;
}
.Sysuser_Date .el-range-editor.el-input__inner {
background-color: transparent;
width: 100%;
border: none;
}
.el-date-range-picker {
z-index:9999 !important;
}
</style>
src/pages/teacher/components/classmate-form.vue
View file @ 43d76395
......@@ -10,7 +10,7 @@
height: 40px;
}
.MainPlan td {
.teacher-Table td {
vertical-align: top;
padding: 5px;
width: 14%;
......@@ -126,7 +126,7 @@
</thead>
</table>
<div class="planTabDiv" ref="planTabDiv">
<table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<table class="ClassPlanTable teacher-Table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index">
<td>
......
src/pages/teacher/components/mateitem.vue
View file @ 43d76395
......@@ -37,7 +37,7 @@
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
{{subItem.Ranks}}/{{subItem.TotalPlanNum}}
</div>
</div>
</div>
......
src/pages/teacher/components/teachTable.vue
View file @ 43d76395
<template>
<div class="page-body" style="padding:20px 0">
<div style="padding:20px 0">
<div class="page-content">
<q-table :pagination="setMsg" no-data-label="暂无相关数据" flat
class="sticky-column-table sticky-right-column-table" separator="none" :data="tableData" :columns="columns"
row-key="name">
<q-table :pagination="setMsg" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
separator="none" :data="tableData" :columns="columns" row-key="name">
<template v-slot:body-cell-GuestList="props">
<q-td auto-width :props="props">
<span v-for="(item,index) in props.row.GuestList" style="margin-right:5px;">
{{item.GuestName}}
{{item.GuestName}}
</span>
</q-td>
</template>
<template v-slot:body-cell-StartTime="props">
<q-td auto-width :props="props">
{{props.row.StartTime}}-{{props.row.EndTime}}
</q-td>
</template>
<template v-slot:body-cell-TotalPlanNum="props">
<q-td>
{{props.row.Ranks}}/{{props.row.TotalPlanNum}}
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
<q-td>
<q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType==1" color="accent"
style="font-weight:400" label="课程回顾" @click="goCourseRecord(props.row)" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="PageIndex" color="primary" :max="PageCount"
:input="true" @input="changePage" />
......@@ -28,7 +38,7 @@
export default {
props: {
setMsg: {
type:Object,
type: Object,
default: null
},
tableData: {
......@@ -49,6 +59,16 @@
data() {
return {
columns: [{
name: 'ClassDate',
label: '日期',
field: 'ClassDate',
align: 'left'
}, {
name: 'StartTime',
label: '上课时间',
field: 'StartTime',
align: 'left'
}, {
name: 'ClassName',
label: '班级',
field: 'ClassName',
......@@ -66,12 +86,6 @@
field: 'GuestList',
align: 'left'
},
{
name: 'StartTime',
label: '上课时间',
field: 'StartTime',
align: 'left'
},
{
name: 'TeacherName',
label: '教师',
......@@ -83,33 +97,45 @@
label: '课程进度',
field: 'TotalPlanNum',
align: 'left'
},
{
name: 'optioned',
label: '操作',
field: 'Id'
}
],
tabMsg:{
PageIndex:1,
PageSize:15,
tabMsg: {
PageIndex: 1,
PageSize: 15,
rowsPerPage: 15,
StartTime:'',
EndTime:'',
TeacherId:0,
ClassRoomId:0,
ClassType:0
StartTime: '',
EndTime: '',
TeacherId: 0,
ClassRoomId: 0,
ClassType: 0
},
PageIndex:1
PageIndex: 1
}
},
created() {
},
mounted() {
console.log(this.setMsg,'setMsg');
},
methods: {
//翻页
changePage(val) {
this.PageIndex = val;
console.log(val,'val');
this.$emit('getChange',this.PageIndex);
this.$emit('getChange', this.PageIndex);
},
//跳转到课程回顾
goCourseRecord(item) {
this.$router.push({
path: "../../classroom/courseInfo",
query: {
id: item.Id
}
})
}
}
}
......
src/pages/teacher/lessonTimeStatistics.vue 0 → 100644
View file @ 43d76395
This diff is collapsed.
src/pages/teacher/myClass.vue
View file @ 43d76395
......@@ -68,7 +68,6 @@
</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-OtherCourseName="props">
......@@ -108,6 +107,11 @@
<span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
</q-td>
</template>
<template v-slot:body-cell-CourseId="props">
<q-td auto-width :props="props">
<span style="color:blue;cursor:pointer;" @click="goChapter(props.row.CouseId)">详情</span>
</q-td>
</template>
<template v-slot:body-cell-CompleteProgress="props">
<q-td auto-width :props="props">
{{props.row.UsePlanNum}}/{{props.row.TotalPlanNum}}
......@@ -233,6 +237,12 @@
field: 'OtherCourseName',
align: 'left'
},
{
name: 'CourseId',
label: '课程大纲',
field: 'CourseId',
align: 'left'
},
{
name: 'TeacherName',
label: '带班老师',
......@@ -245,6 +255,12 @@
field: 'OpenTime',
align: 'left'
},
{
name: 'FinishTimeStr',
label: '预计结束时间',
field: 'FinishTimeStr',
align: 'left'
},
{
name: 'CompleteProgress',
label: '课程进度',
......@@ -391,7 +407,7 @@
query: {
ClassId: item.ClassId,
School_Id: item.School_Id,
ClassName: item.ClassName,
ClassName: encodeURI(item.ClassName) ,
isFromMyClass : 1,
blank: 'y'
}
......@@ -490,6 +506,12 @@
ClassId: row.ClassId,
ClassName: ClassName,
});
},
//跳转到课程大纲
goChapter(CouseId){
this.OpenNewUrl('/course/chapter' , {
CourseId: CouseId
});
}
}
}
......
src/pages/teacher/myPrepareLessons.vue 0 → 100644
View file @ 43d76395
This diff is collapsed.
src/pages/teacher/studentManager.vue 0 → 100644
View file @ 43d76395
This diff is collapsed.
src/pages/teacher/studentsClassSee.vue 0 → 100644
View file @ 43d76395
This diff is collapsed.
src/pages/teacher/teacherSchedule.vue
View file @ 43d76395
<template>
<div class="page-body MainPlan">
<div class="col row wrap q-col-gutter-md">
<div class="col-2">
<el-select v-model="msg.TeacherId" style="width:100%;" placeholder="教师团队" size="small" @change="getTypeWay()">
<el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
</el-option>
</el-select>
</div>
<div class="col-2">
<el-select v-model="msg.ClassRoomId" style="width:100%;" placeholder="教室" size="small" @change="getTypeWay()">
<el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
......@@ -34,8 +28,8 @@
</el-select>
</div>
<div class="col-2">
<q-btn color="accent" size="sm" class="q-mr-md" @click="exchangeType" :label="typeName" />
<q-btn color="negative" size="sm" label="调课申请" @click="openForm"></q-btn>
<q-btn color="accent" size="sm" class="q-mr-md" style="margin-top:2px;" @click="exchangeType" :label="typeName" />
<q-btn color="negative" size="sm" label="调课申请" @click="openForm"></q-btn>
</div>
</div>
<classmateForm :dataList="dataList" v-if="commonType==1"></classmateForm>
......@@ -103,7 +97,10 @@
if (this.$route.query && this.$route.query.ClassType) {
this.msg.ClassType = this.$route.query.ClassType;
}
this.GetTeacherList();
let userinfo = this.getLocalStorage();
this.msg.TeacherId = userinfo.AccountId;
this.tabMsg.TeacherId = userinfo.AccountId;
this.getClassRoomList();
},
mounted() {
......@@ -126,19 +123,6 @@
})
},
//获取教师下拉
GetTeacherList() {
getTeacherDropDownList({}).then(res => {
if (res.Code == 1) {
this.TeacherList = res.Data;
var obj = {
TeacherName: '请选择',
TId: 0
}
this.TeacherList.unshift(obj);
}
})
},
//获取教室下拉
getClassRoomList() {
queryClassRoomList({}).then(res => {
......@@ -166,7 +150,6 @@
getTableList(){
this.tabMsg.StartTime = this.msg.StartTime;
this.tabMsg.EndTime = this.msg.EndTime;
this.tabMsg.TeacherId = this.msg.TeacherId;
this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
this.tabMsg.ClassType = this.msg.ClassType;
GetClassPlanStatisticalPage(this.tabMsg).then(res => {
......
src/pages/teacher/teacherclassSee.vue 0 → 100644
View file @ 43d76395
This diff is collapsed.
src/router/routes.js
View file @ 43d76395
......@@ -914,6 +914,11 @@ const routes = [{
component: () =>
import("pages/scheduling/scheduleInfo.vue")
},
{
path: "/scheduling/vacationPlan", //假期计划表
component: () =>
import("pages/scheduling/vacationPlan")
},
{
path: "/test", //API测试
component: () =>
......@@ -960,6 +965,30 @@ const routes = [{
import("pages/teacher/teachMonthLessonCost")
},
{
path: "/teacher/myPrepareLessons", //我的备课
component: () =>
import("pages/teacher/myPrepareLessons")
},
{
path: "/teacher/lessonTimeStatistics", //课时统计
component: () =>
import("pages/teacher/lessonTimeStatistics")
},
{
path: "/teacher/teacherclassSee", //课时统计-查看老师
component: () =>
import("pages/teacher/teacherclassSee")
},
{
path: "/teacher/studentsClassSee", //课时统计-查看学生
component: () =>
import("pages/teacher/studentsClassSee")
},
{
path: "/teacher/studentManager", //学员管理
component: () =>
import("pages/teacher/studentManager")
}, {
path: "/teacher/teacherSchedule",
component: () =>
import("pages/teacher/teacherSchedule")
......
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