Skip to content

C
confucius
Commit 75b08f7e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 52eab9c2
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 77 deletions
src/api/course/class.js
View file @ 75b08f7e
......@@ -138,9 +138,9 @@ export function addClassCheck(data) {
/**
* 获取班级日志
*/
export function queryClassPlanLogPage(data) {
export function queryClassLogPageList(data) {
return request({
url: '/class/GetClassPlanLogPageList',
url: '/class/GetClassLogPageList',
method: 'post',
data
});
......
src/components/course/classinfo-form.vue
View file @ 75b08f7e
......@@ -34,10 +34,12 @@
.classinfo_Dialog .normalInner {
color: #111111;
}
.drop_NameDown{
margin-top:20px;
width:300px;
.drop_NameDown {
margin-top: 20px;
width: 300px;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
......@@ -95,23 +97,22 @@
<div class="dropClassDialog">
<div style="margin:10px 0 15px 0;">退课</div>
</div>
<q-input square filled v-model="dropMsg.DropOutRemark" borderless label="退课原因" ref="reason" type="textarea" counter
:rules="[val => !!val || '请填写退课原因']" maxlength="200" />
<q-input square filled v-model="dropMsg.DropOutRemark" borderless label="退课原因" ref="reason"
type="textarea" counter :rules="[val => !!val || '请填写退课原因']" maxlength="200" />
<div class="drop_NameDown">
<q-chip v-for="(item,index) in selectedStudent" :key="index">
<q-avatar rounded size="sm" v-if="item.UserIcon">
<img :src="item.UserIcon" />
</q-avatar>
<q-avatar rounded size="sm" color="teal-10" text-color="white" v-if="!item.UserIcon">
{{item.GuestName[0]}}</q-avatar>
{{item.GuestName}}
</q-chip>
<q-chip v-for="(item,index) in selectedStudent" :key="index">
<q-avatar rounded size="sm" v-if="item.UserIcon">
<img :src="item.UserIcon" />
</q-avatar>
<q-avatar rounded size="sm" color="teal-10" text-color="white" v-if="!item.UserIcon">
{{item.GuestName[0]}}</q-avatar>
{{item.GuestName}}
</q-chip>
</div>
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10"
style="font-weight:400 !important" @click="isShowDropPop=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="saveDrop()" />
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important"
@click="isShowDropPop=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveDrop()" />
</q-card-actions>
</q-banner>
</q-popup-proxy>
......@@ -127,20 +128,18 @@
option-value="StuId" option-label="StuName" label="选择学员" />
</div>
<q-card-actions align="right" class="bg-white" style="margin-top:20px;">
<q-btn label="取消" flat color="grey-10"
style="font-weight:400 !important" @click="ishowInvit=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="saveStudent()" />
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="ishowInvit=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveStudent()" />
</q-card-actions>
</q-banner>
</q-popup-proxy>
</q-btn>
</div>
<q-table :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
:selected.sync="selectedStudent" class="sticky-column-table" separator="none"
title="学员信息" :data="studentList" :columns="columns" hide-bottom row-key="Id">
<q-table :loading="loading" no-data-label="暂无相关数据" flat selection="multiple" :selected.sync="selectedStudent"
class="sticky-column-table" separator="none" title="学员信息" :data="studentList" :columns="columns" hide-bottom
row-key="Id">
<template v-slot:body-cell-IsRenew="props">
<q-td auto-width :props="props">
<q-td auto-width :props="props">
<span style="color:red;" v-if="props.row.IsRenew==0">否</span>
<span style="color:green;" v-if="props.row.IsRenew==1">是</span>
</q-td>
......@@ -148,11 +147,14 @@
</q-table>
</div>
<div v-if="tabCheck=='second'">
        <lessForm :seting-obj="setingObj"></lessForm>
      </div>
 <lessForm :seting-obj="setingObj"></lessForm>
 </div>
<div v-if="tabCheck=='third'">
<recordForm :seting-obj="setingObj"></recordForm>
</div>
</div>
<div v-if="tabCheck=='fourth'">
<classlogForm :seting-obj="setingObj"></classlogForm>
</div>
</q-card>
<div class="dialog-out-close" @click="closeShenheForm"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
......@@ -168,8 +170,9 @@
GetStudentList,
AddClassStudent
} from '../../api/course/class';
import lessForm from '../course/lesson-form';
import lessForm from '../course/lesson-form';
import recordForm from '../course/record-form';
import classlogForm from '../course/classlog-form';
export default {
props: {
setingObj: {
......@@ -179,7 +182,8 @@
},
components: {
lessForm,
recordForm
recordForm,
classlogForm
},
data() {
return {
......@@ -240,25 +244,25 @@
},
studentList: [], //学员信息数据
selectedStudent: [], //选中
dropMsg:{
ClassId:0, //班级id
Ids:'', //学员id
DropOutRemark:'', //退课原因
StudentName:'' //学员名称
dropMsg: {
ClassId: 0, //班级id
Ids: '', //学员id
DropOutRemark: '', //退课原因
StudentName: '' //学员名称
},
isShowDropPop:false,
isShowDropPop: false,
ishowInvit:false,
invitationMsg:{
ClassId:0, //班级id
GuestName:'', //学员名称
Sex:'', //性别
Mobile:'', //手机号
BirthDay:'', //生日
StudentId:0
ishowInvit: false,
invitationMsg: {
ClassId: 0, //班级id
GuestName: '', //学员名称
Sex: '', //性别
Mobile: '', //手机号
BirthDay: '', //生日
StudentId: 0
},
InvitationList:[], //学员下拉数据
checkedStudent:'', //选择学员
InvitationList: [], //学员下拉数据
checkedStudent: '', //选择学员
}
},
created() {
......@@ -276,7 +280,7 @@
getStudentData() {
queryClassStudent({
ClassId: this.setingObj.ClassId,
School_Id:this.setingObj.School_Id
School_Id: this.setingObj.School_Id
}).then(res => {
if (res.Code == 1) {
this.studentList = res.Data;
......@@ -285,38 +289,38 @@
},
//获取进度条
getProgress(num, total) {
if (num == 0 || total == 0){
return 0;
if (num == 0 || total == 0) {
return 0;
}
return (Math.round(num / total * 100) / 100.00);
},
//退课
dropClass(){
if(this.selectedStudent.length==0){
dropClass() {
if (this.selectedStudent.length == 0) {
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择退课学员`
})
return;
}else{
this.isShowDropPop=true;
} else {
this.isShowDropPop = true;
}
},
//保存退课信息
saveDrop(){
if(this.selectedStudent.length==0){
saveDrop() {
if (this.selectedStudent.length == 0) {
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择退课学员`
})
return;
}else{
this.dropMsg.ClassId = this.setingObj.ClassId;
} else {
this.dropMsg.ClassId = this.setingObj.ClassId;
let StuArr = [];
let StrName = [];
this.selectedStudent.forEach(x=>{
let StrName = [];
this.selectedStudent.forEach(x => {
StuArr.push(x.Id);
StrName.push(x.GuestName);
})
......@@ -325,33 +329,33 @@
StudentDropOut(this.dropMsg).then(res => {
if (res.Code == 1) {
this.isShowDropPop = false;
this.dropMsg.DropOutRemark='';
this.selectedStudent=[];
this.dropMsg.DropOutRemark = '';
this.selectedStudent = [];
this.getStudentData();
}
})
}
},
//获取学员下拉信息
getStudentList(){
getStudentList() {
GetStudentList({
SchoolId: this.setingObj.School_Id
}).then(res => {
if (res.Code == 1) {
this.InvitationList = res.Data;
this.InvitationList = res.Data;
}
})
},
//保存邀请新学员保存
saveStudent(){
if(this.checkedStudent==''){
saveStudent() {
if (this.checkedStudent == '') {
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择学员`
})
return;
}else{
} else {
this.invitationMsg.ClassId = this.setingObj.ClassId;
this.invitationMsg.GuestName = this.checkedStudent.StuName;
this.invitationMsg.Sex = this.checkedStudent.StuSex;
......@@ -366,7 +370,7 @@
}
})
}
}
}
},
}
......
src/components/course/classlog-form.vue
View file @ 75b08f7e
<template>
<div class="classLog">
</div>
</template>
<script>
import {
queryClassPlanLogPage
queryClassLogPageList
} from '../../api/course/class'
export default {
props: {
......@@ -32,23 +31,24 @@
created() {
this.msg.School_Id = this.setingObj.School_Id;
this.msg.ClassId = this.setingObj.ClassId;
this.getClassLog();
},
mounted() {
this.getClassLog();
},
methods: {
getClassLog() {
queryClassPlanLogPage(this.msg).then(res => {
queryClassLogPageList(this.msg).then(res => {
if (res.Code == 1) {
console.log("res",res.Data);
console.log("res", res.Data);
this.dataList = res.Data.PageData;
}
})
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass');
</style>
\ No newline at end of file
</style>
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