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