commit:同步2.2版本

This commit is contained in:
Jerry
2022-01-23 21:00:54 +08:00
parent ff7e52eedb
commit 35ac62e4d2
1201 changed files with 16301 additions and 161770 deletions

View File

@@ -1,8 +1,10 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formClassFilter" :model="formClass" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="所属校区">
<el-form-item label="所属校区" prop="formFilter.schoolId">
<el-select class="filter-item" v-model="formClass.formFilter.schoolId" :clearable="true" filterable
placeholder="所属校区" :loading="formClass.schoolId.impl.loading"
@visible-change="formClass.schoolId.impl.onVisibleChange"
@@ -10,23 +12,24 @@
<el-option v-for="item in formClass.schoolId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="班级名称">
<el-form-item label="班级名称" prop="formFilter.className">
<el-input class="filter-item" v-model="formClass.formFilter.className"
:clearable="true" placeholder="班级名称"
/>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormClass(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormClass">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormClass(true)">查询</el-button>
</filter-box>
</el-form>
<el-form ref="formClass" :model="formData" class="full-width-input" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-card class="base-card" shadow="never" style="height: 620px">
<div slot="header" class="base-card-header">
<span>班级列表</span>
<div class="base-card-operation">
<el-button @click="onFormCreateClassClick()" type="text" size="mini"
<el-button @click="onFormCreateClassClick()" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:formCreateClass')">
新建
</el-button>
@@ -34,9 +37,10 @@
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="studentClass" :data="formClass.StudentClass.impl.dataList" size="mini" @sort-change="formClass.StudentClass.impl.onSortChange"
<el-table ref="studentClass" :data="formClass.StudentClass.impl.dataList" :size="defaultFormItemSize" @sort-change="formClass.StudentClass.impl.onSortChange"
header-cell-class-name="table-header-gray"
highlight-current-row @current-change="formClass.StudentClass.impl.currentRowChange">
highlight-current-row @current-change="formClass.StudentClass.impl.currentRowChange"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.StudentClass.impl.getTableIndex" />
<el-table-column label="班级名称" prop="className">
</el-table-column>
@@ -49,11 +53,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onFormEditClassClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onFormEditClassClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:formEditClass')">
编辑
</el-button>
<el-button @click.stop="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:delete')">
删除
</el-button>
@@ -82,7 +86,7 @@
<div slot="header" class="base-card-header">
<span>班级课程</span>
<div class="base-card-operation">
<el-button @click="onFormSetClassCourseClick()" type="text" size="mini"
<el-button @click="onFormSetClassCourseClick()" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:formSetClassCourse') || !formSetClassCourseEnabled">
设置班级课程
</el-button>
@@ -90,8 +94,9 @@
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="course" :data="formClass.Course.impl.dataList" size="mini" @sort-change="formClass.Course.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="course" :data="formClass.Course.impl.dataList" :size="defaultFormItemSize" @sort-change="formClass.Course.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Course.impl.getTableIndex" />
<el-table-column label="课程名称" prop="courseName">
</el-table-column>
@@ -101,11 +106,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onDeleteClassCourseClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onDeleteClassCourseClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:deleteClassCourse') || !deleteClassCourseEnabled">
移除
</el-button>
<el-button @click.stop="onFormEditClassCourseOrderClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onFormEditClassCourseOrderClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:formEditClassCourseOrder') || !formEditClassCourseOrderEnabled">
课程顺序
</el-button>
@@ -132,7 +137,7 @@
<div slot="header" class="base-card-header">
<span>班级学生</span>
<div class="base-card-operation">
<el-button @click="onFormSetClassStudentClick()" type="text" size="mini"
<el-button @click="onFormSetClassStudentClick()" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:formSetClassStudent') || !formSetClassStudentEnabled">
设置班级学生
</el-button>
@@ -140,8 +145,9 @@
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="student" :data="formClass.Student.impl.dataList" size="mini" @sort-change="formClass.Student.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="student" :data="formClass.Student.impl.dataList" :size="defaultFormItemSize" @sort-change="formClass.Student.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Student.impl.getTableIndex" />
<el-table-column label="姓名" prop="studentName">
</el-table-column>
@@ -151,7 +157,7 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onDeleteClassStudentClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onDeleteClassStudentClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formClass:formClass:deleteClassStudent') || !deleteClassStudentEnabled">
移除
</el-button>
@@ -263,6 +269,10 @@ export default {
}
},
methods: {
onResetFormClass () {
this.$refs.formClassFilter.resetFields();
this.refreshFormClass(true);
},
/**
* 班级数据数据获取函数返回Promise
*/
@@ -305,12 +315,6 @@ export default {
* 班级课程数据获取函数返回Promise
*/
loadCourseWidgetData (params) {
if (
(this.formClass.StudentClass.impl.currentRow || {}).classId == null
) {
this.formClass.Course.impl.clearTable();
return Promise.reject();
}
if (params == null) params = {};
params = {
...params,
@@ -337,12 +341,6 @@ export default {
* 班级学生数据获取函数返回Promise
*/
loadStudentWidgetData (params) {
if (
(this.formClass.StudentClass.impl.currentRow || {}).classId == null
) {
this.formClass.Student.impl.clearTable();
return Promise.reject();
}
if (params == null) params = {};
params = {
...params,
@@ -452,7 +450,6 @@ export default {
this.$dialog.show('新建', formCreateClass, {
area: '800px'
}, params).then(res => {
this.refreshClassCardWidget();
}).catch(e => {});
},
/**
@@ -481,16 +478,10 @@ export default {
* 移除
*/
onDeleteClassCourseClick (row) {
let params = {
classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
courseId: row.courseId
};
this.$confirm('是否从班级中移除此课程?').then(res => {
StudentClassController.deleteClassCourse(this, params).then(res => {
this.$message.success('移除成功');
this.formClass.Course.impl.refreshTable();
}).catch(e => {});
this.formClass.Course.impl.dataList = this.formClass.Course.impl.dataList.filter(item => {
return item.__cascade_add_temp_id__ !== row.__cascade_add_temp_id__;
});
}).catch(e => {});
},
/**
@@ -505,23 +496,16 @@ export default {
this.$dialog.show('课程顺序', formEditClassCourseOrder, {
area: '400px'
}, params).then(res => {
this.formClass.Course.impl.refreshTable();
}).catch(e => {});
},
/**
* 移除
*/
onDeleteClassStudentClick (row) {
let params = {
classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
studentId: row.studentId
};
this.$confirm('是否从班级中移除此学生?').then(res => {
StudentClassController.deleteClassStudent(this, params).then(res => {
this.$message.success('移除成功');
this.formClass.Student.impl.refreshTable();
}).catch(e => {});
this.formClass.Student.impl.dataList = this.formClass.Student.impl.dataList.filter(item => {
return item.__cascade_add_temp_id__ !== row.__cascade_add_temp_id__;
});
}).catch(e => {});
},
/**
@@ -535,22 +519,16 @@ export default {
this.$dialog.show('编辑', formEditClass, {
area: '800px'
}, params).then(res => {
this.formClass.StudentClass.impl.refreshTable();
}).catch(e => {});
},
/**
* 删除
*/
onDeleteClick (row) {
let params = {
classId: row.classId
};
this.$confirm('是否删除此班级?').then(res => {
StudentClassController.delete(this, params).then(res => {
this.$message.success('删除成功');
this.formClass.StudentClass.impl.refreshTable();
}).catch(e => {});
this.formClass.StudentClass.impl.dataList = this.formClass.StudentClass.impl.dataList.filter(item => {
return item.__cascade_add_temp_id__ !== row.__cascade_add_temp_id__;
});
}).catch(e => {});
},
onResume () {

View File

@@ -1,8 +1,10 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formCourseFilter" :model="formCourse" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="所属年级">
<el-form-item label="所属年级" prop="formFilter.gradeId">
<el-select class="filter-item" v-model="formCourse.formFilter.gradeId" :clearable="true" filterable
placeholder="所属年级" :loading="formCourse.gradeId.impl.loading"
@visible-change="formCourse.gradeId.impl.onVisibleChange"
@@ -10,7 +12,7 @@
<el-option v-for="item in formCourse.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="所属学科">
<el-form-item label="所属学科" prop="formFilter.subjectId">
<el-select class="filter-item" v-model="formCourse.formFilter.subjectId" :clearable="true" filterable
placeholder="所属学科" :loading="formCourse.subjectId.impl.loading"
@visible-change="formCourse.subjectId.impl.onVisibleChange"
@@ -18,7 +20,7 @@
<el-option v-for="item in formCourse.subjectId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="课程难度">
<el-form-item label="课程难度" prop="formFilter.difficulty">
<el-select class="filter-item" v-model="formCourse.formFilter.difficulty" :clearable="true" filterable
placeholder="课程难度" :loading="formCourse.difficulty.impl.loading"
@visible-change="formCourse.difficulty.impl.onVisibleChange"
@@ -26,13 +28,14 @@
<el-option v-for="item in formCourse.difficulty.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="课程名称">
<el-form-item label="课程名称" prop="formFilter.courseName">
<el-input class="filter-item" v-model="formCourse.formFilter.courseName"
:clearable="true" placeholder="课程名称"
/>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormCourse(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formCourse:formCourse:formCreateCourse')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormCourse">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormCourse(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formCourse:formCourse:formCreateCourse')"
@click="onFormCreateCourseClick()">
新建
</el-button>
@@ -40,8 +43,9 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="course" :data="formCourse.Course.impl.dataList" size="mini" @sort-change="formCourse.Course.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="course" :data="formCourse.Course.impl.dataList" :size="defaultFormItemSize" @sort-change="formCourse.Course.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formCourse.Course.impl.getTableIndex" />
<el-table-column label="课程名称" prop="courseName">
</el-table-column>
@@ -73,11 +77,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onFormEditCourseClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onFormEditCourseClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formCourse:formCourse:formEditCourse')">
编辑
</el-button>
<el-button @click.stop="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formCourse:formCourse:delete')">
删除
</el-button>
@@ -151,6 +155,10 @@ export default {
}
},
methods: {
onResetFormCourse () {
this.$refs.formCourseFilter.resetFields();
this.refreshFormCourse(true);
},
/**
* 课程数据数据获取函数返回Promise
*/
@@ -277,22 +285,16 @@ export default {
this.$dialog.show('编辑', formEditCourse, {
area: '800px'
}, params).then(res => {
this.formCourse.Course.impl.refreshTable();
}).catch(e => {});
},
/**
* 删除
*/
onDeleteClick (row) {
let params = {
courseId: row.courseId
};
this.$confirm('是否删除此课程?').then(res => {
CourseController.delete(this, params).then(res => {
this.$message.success('删除成功');
this.formCourse.Course.impl.refreshTable();
}).catch(e => {});
this.formCourse.Course.impl.dataList = this.formCourse.Course.impl.dataList.filter(item => {
return item.__cascade_add_temp_id__ !== row.__cascade_add_temp_id__;
});
}).catch(e => {});
},
onResume () {

View File

@@ -1,17 +1,20 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formCourseStatsFilter" :model="formCourseStats" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="统计日期">
<el-form-item label="统计日期" prop="formFilter.statsDate">
<date-range class="filter-item" v-model="formCourseStats.formFilter.statsDate" :clearable="true" :allowTypes="['day']" align="left"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormCourseStats(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormCourseStats">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormCourseStats(true)">查询</el-button>
</filter-box>
</el-form>
<el-form ref="formCourseStats" :model="formData" class="full-width-input" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col class="table-box gutter-bottom" :span="12">
<el-card class="base-card" style="height: 350px" shadow="never" :body-style="{padding: '0px'}">
@@ -160,6 +163,10 @@ export default {
}
},
methods: {
onResetFormCourseStats () {
this.$refs.formCourseStatsFilter.resetFields();
this.refreshFormCourseStats(true);
},
/**
* 课程统计年级数据获取函数返回Promise
*/

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formCreateClass" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="班级名称" prop="StudentClass.className">
@@ -50,11 +50,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formCreateClass:formCreateClass:add')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formCreateClass:formCreateClass:add')"
@click="onAddClick()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formCreateCourse" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="课程名称" prop="Course.courseName">
@@ -81,11 +81,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formCreateCourse:formCreateCourse:add')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formCreateCourse:formCreateCourse:add')"
@click="onAddClick()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formCreateStudent" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="姓名" prop="Student.studentName">
@@ -109,11 +109,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formCreateStudent:formCreateStudent:add')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formCreateStudent:formCreateStudent:add')"
@click="onAddClick()">
新增
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditClass" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="班级名称" prop="StudentClass.className">
@@ -50,11 +50,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formEditClass:formEditClass:update')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formEditClass:formEditClass:update')"
@click="onUpdateClick()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditClassCourseOrder" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="课程顺序" prop="StudentClass.course.classCourse.courseOrder">
@@ -13,11 +13,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formEditClassCourseOrder:formEditClassCourseOrder:updateClassCourse')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formEditClassCourseOrder:formEditClassCourseOrder:updateClassCourse')"
@click="onUpdateClassCourseClick()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditCourse" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="课程名称" prop="Course.courseName">
@@ -81,11 +81,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formEditCourse:formEditCourse:update')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formEditCourse:formEditCourse:update')"
@click="onUpdateClick()">
保存
</el-button>

View File

@@ -1,7 +1,7 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form ref="formEditStudent" :model="formData" class="full-width-input" :rules="rules" style="width: 100%;"
label-width="100px" size="mini" label-position="right" @submit.native.prevent>
label-width="100px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="姓名" prop="Student.studentName">
@@ -135,11 +135,11 @@
</el-col>
<el-col :span="24">
<el-row class="no-scroll flex-box" type="flex" justify="end">
<el-button type="primary" size="mini" :plain="true"
<el-button type="primary" :size="defaultFormItemSize" :plain="true"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formEditStudent:formEditStudent:update')"
<el-button type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formEditStudent:formEditStudent:update')"
@click="onUpdateClick()">
保存
</el-button>

View File

@@ -1,8 +1,10 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSetClassCourseFilter" :model="formSetClassCourse" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="所属年级">
<el-form-item label="所属年级" prop="formFilter.gradeId">
<el-select class="filter-item" v-model="formSetClassCourse.formFilter.gradeId" :clearable="true" filterable
placeholder="所属年级" :loading="formSetClassCourse.gradeId.impl.loading"
@visible-change="formSetClassCourse.gradeId.impl.onVisibleChange"
@@ -10,7 +12,7 @@
<el-option v-for="item in formSetClassCourse.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="所属学科">
<el-form-item label="所属学科" prop="formFilter.subjectId">
<el-select class="filter-item" v-model="formSetClassCourse.formFilter.subjectId" :clearable="true" filterable
placeholder="所属学科" :loading="formSetClassCourse.subjectId.impl.loading"
@visible-change="formSetClassCourse.subjectId.impl.onVisibleChange"
@@ -18,7 +20,7 @@
<el-option v-for="item in formSetClassCourse.subjectId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="课程难度">
<el-form-item label="课程难度" prop="formFilter.difficulty">
<el-select class="filter-item" v-model="formSetClassCourse.formFilter.difficulty" :clearable="true" filterable
placeholder="课程难度" :loading="formSetClassCourse.difficulty.impl.loading"
@visible-change="formSetClassCourse.difficulty.impl.onVisibleChange"
@@ -26,13 +28,14 @@
<el-option v-for="item in formSetClassCourse.difficulty.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="课程名称">
<el-form-item label="课程名称" prop="formFilter.courseName">
<el-input class="filter-item" v-model="formSetClassCourse.formFilter.courseName"
:clearable="true" placeholder="课程名称"
/>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSetClassCourse(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="tableSelectRowList.length <= 0 || !checkPermCodeExist('formSetClassCourse:formSetClassCourse:addClassCourse')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormSetClassCourse">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSetClassCourse(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="tableSelectRowList.length <= 0 || !checkPermCodeExist('formSetClassCourse:formSetClassCourse:addClassCourse')"
@click="onAddClassCourseClick()">
添加
</el-button>
@@ -40,7 +43,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSetClassCourse.Course.impl.dataList" size="mini"
<el-table :data="formSetClassCourse.Course.impl.dataList" :size="defaultFormItemSize"
@sort-change="formSetClassCourse.Course.impl.onSortChange"
@selection-change="onCourseSelectionChange"
header-cell-class-name="table-header-gray">
@@ -147,6 +150,10 @@ export default {
this.refreshParentCachedPage = isSuccess;
this.$router.go(-1);
},
onResetFormSetClassCourse () {
this.$refs.formSetClassCourseFilter.resetFields();
this.refreshFormSetClassCourse(true);
},
onCourseSelectionChange (values) {
this.tableSelectRowList = values;
},
@@ -154,12 +161,6 @@ export default {
* 班级课程数据获取函数返回Promise
*/
loadCourseWidgetData (params) {
if (
this.classId == null
) {
this.formSetClassCourse.Course.impl.clearTable();
return Promise.reject();
}
if (params == null) params = {};
params = {
...params,

View File

@@ -1,8 +1,10 @@
<template>
<div class="form-single-fragment" style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formSetClassStudentFilter" :model="formSetClassStudent" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="所属校区">
<el-form-item label="所属校区" prop="formFilter.schoolId">
<el-select class="filter-item" v-model="formSetClassStudent.formFilter.schoolId" :clearable="true" filterable
placeholder="所属校区" :loading="formSetClassStudent.schoolId.impl.loading"
@visible-change="formSetClassStudent.schoolId.impl.onVisibleChange"
@@ -10,8 +12,9 @@
<el-option v-for="item in formSetClassStudent.schoolId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormSetClassStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="tableSelectRowList.length <= 0 || !checkPermCodeExist('formSetClassStudent:formSetClassStudent:addClassStudent')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormSetClassStudent">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormSetClassStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="tableSelectRowList.length <= 0 || !checkPermCodeExist('formSetClassStudent:formSetClassStudent:addClassStudent')"
@click="onAddClassStudentClick()">
添加
</el-button>
@@ -19,7 +22,7 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formSetClassStudent.Student.impl.dataList" size="mini"
<el-table :data="formSetClassStudent.Student.impl.dataList" :size="defaultFormItemSize"
@sort-change="formSetClassStudent.Student.impl.onSortChange"
@selection-change="onStudentSelectionChange"
header-cell-class-name="table-header-gray">
@@ -114,6 +117,10 @@ export default {
this.refreshParentCachedPage = isSuccess;
this.$router.go(-1);
},
onResetFormSetClassStudent () {
this.$refs.formSetClassStudentFilter.resetFields();
this.refreshFormSetClassStudent(true);
},
onStudentSelectionChange (values) {
this.tableSelectRowList = values;
},
@@ -121,12 +128,6 @@ export default {
* 班级学生数据获取函数返回Promise
*/
loadStudentWidgetData (params) {
if (
this.classId == null
) {
this.formSetClassStudent.Student.impl.clearTable();
return Promise.reject();
}
if (params == null) params = {};
params = {
...params,

View File

@@ -15,9 +15,11 @@
</el-aside>
<el-main style="padding-left: 15px;">
<el-scrollbar :style="{height: (getMainContextHeight - 42) + 'px'}" class="custom-scroll">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formStudentFilter" :model="formStudent" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="所属年级">
<el-form-item label="所属年级" prop="formFilter.gradeId">
<el-select class="filter-item" v-model="formStudent.formFilter.gradeId" :clearable="true" filterable
placeholder="所属年级" :loading="formStudent.gradeId.impl.loading"
@visible-change="formStudent.gradeId.impl.onVisibleChange"
@@ -25,18 +27,19 @@
<el-option v-for="item in formStudent.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="注册日期">
<el-form-item label="注册日期" prop="formFilter.registerDate">
<date-range class="filter-item" v-model="formStudent.formFilter.registerDate" :clearable="true" :allowTypes="['day']" align="left"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<el-form-item label="学生姓名">
<el-form-item label="学生姓名" prop="formFilter.searchString">
<el-input class="filter-item" v-model="formStudent.formFilter.searchString"
:clearable="true" placeholder="输入学生姓名 / 手机号码 模糊查询"
/>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" size="mini" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')"
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormStudent">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormStudent(true)">查询</el-button>
<el-button slot="operator" type="primary" :size="defaultFormItemSize" :disabled="!checkPermCodeExist('formStudent:formStudent:formCreateStudent')"
@click="onFormCreateStudentClick()">
新建
</el-button>
@@ -44,8 +47,9 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="student" :data="formStudent.Student.impl.dataList" size="mini" @sort-change="formStudent.Student.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="student" :data="formStudent.Student.impl.dataList" :size="defaultFormItemSize" @sort-change="formStudent.Student.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudent.Student.impl.getTableIndex" />
<el-table-column label="姓名" prop="studentName">
</el-table-column>
@@ -65,11 +69,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click.stop="onFormEditStudentClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onFormEditStudentClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formStudent:formStudent:formEditStudent')">
编辑
</el-button>
<el-button @click.stop="onDeleteClick(scope.row)" type="text" size="mini"
<el-button @click.stop="onDeleteClick(scope.row)" type="text" :size="defaultFormItemSize"
:disabled="!checkPermCodeExist('formStudent:formStudent:delete')">
删除
</el-button>
@@ -143,6 +147,10 @@ export default {
}
},
methods: {
onResetFormStudent () {
this.$refs.formStudentFilter.resetFields();
this.refreshFormStudent(true);
},
/**
* 学生数据数据获取函数返回Promise
*/
@@ -262,22 +270,16 @@ export default {
this.$dialog.show('编辑', formEditStudent, {
area: '800px'
}, params).then(res => {
this.formStudent.Student.impl.refreshTable();
}).catch(e => {});
},
/**
* 删除
*/
onDeleteClick (row) {
let params = {
studentId: row.studentId
};
this.$confirm('是否删除此学生?').then(res => {
StudentController.delete(this, params).then(res => {
this.$message.success('删除成功');
this.formStudent.Student.impl.refreshTable();
}).catch(e => {});
this.formStudent.Student.impl.dataList = this.formStudent.Student.impl.dataList.filter(item => {
return item.__cascade_add_temp_id__ !== row.__cascade_add_temp_id__;
});
}).catch(e => {});
},
onResume () {

View File

@@ -1,13 +1,15 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formStudentActionDetailFilter" :model="formStudentActionDetail" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="统计日期">
<el-form-item label="统计日期" prop="formFilter.statsDate">
<date-range class="filter-item" v-model="formStudentActionDetail.formFilter.statsDate" :clearable="true" :allowTypes="['day']" align="left"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<el-form-item label="所属年级">
<el-form-item label="所属年级" prop="formFilter.gradeId">
<el-select class="filter-item" v-model="formStudentActionDetail.formFilter.gradeId" :clearable="true" filterable
placeholder="所属年级" :loading="formStudentActionDetail.gradeId.impl.loading"
@visible-change="formStudentActionDetail.gradeId.impl.onVisibleChange"
@@ -15,7 +17,7 @@
<el-option v-for="item in formStudentActionDetail.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-form-item label="行为类型">
<el-form-item label="行为类型" prop="formFilter.actionType">
<el-select class="filter-item" v-model="formStudentActionDetail.formFilter.actionType" :clearable="true" filterable
placeholder="行为类型" :loading="formStudentActionDetail.actionType.impl.loading"
@visible-change="formStudentActionDetail.actionType.impl.onVisibleChange"
@@ -23,13 +25,15 @@
<el-option v-for="item in formStudentActionDetail.actionType.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudentActionDetail(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormStudentActionDetail">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormStudentActionDetail(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="studentActionTrans" :data="formStudentActionDetail.StudentActionTrans.impl.dataList" size="mini" @sort-change="formStudentActionDetail.StudentActionTrans.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="studentActionTrans" :data="formStudentActionDetail.StudentActionTrans.impl.dataList" :size="defaultFormItemSize" @sort-change="formStudentActionDetail.StudentActionTrans.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudentActionDetail.StudentActionTrans.impl.getTableIndex" />
<el-table-column label="学生名称" prop="studentName">
</el-table-column>
@@ -140,6 +144,10 @@ export default {
this.refreshParentCachedPage = isSuccess;
this.$router.go(-1);
},
onResetFormStudentActionDetail () {
this.$refs.formStudentActionDetailFilter.resetFields();
this.refreshFormStudentActionDetail(true);
},
/**
* 学生行为流水数据获取函数返回Promise
*/

View File

@@ -1,13 +1,15 @@
<template>
<div style="position: relative;">
<el-form label-width="100px" size="mini" label-position="right" @submit.native.prevent>
<el-form ref="formStudentActionStatsFilter" :model="formStudentActionStats" :size="defaultFormItemSize"
label-width="100px" label-position="right" @submit.native.prevent
>
<filter-box :item-width="350">
<el-form-item label="统计日期">
<el-form-item label="统计日期" prop="formFilter.statsDate">
<date-range class="filter-item" v-model="formStudentActionStats.formFilter.statsDate" :clearable="true" :allowTypes="['day']" align="left"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item>
<el-form-item label="年级">
<el-form-item label="年级" prop="formFilter.gradeId">
<el-select class="filter-item" v-model="formStudentActionStats.formFilter.gradeId" :clearable="true" filterable
placeholder="年级" :loading="formStudentActionStats.gradeId.impl.loading"
@visible-change="formStudentActionStats.gradeId.impl.onVisibleChange"
@@ -15,13 +17,15 @@
<el-option v-for="item in formStudentActionStats.gradeId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
<el-button slot="operator" type="primary" :plain="true" size="mini" @click="refreshFormStudentActionStats(true)">查询</el-button>
<el-button slot="operator" type="default" :plain="true" :size="defaultFormItemSize" @click="onResetFormStudentActionStats">重置</el-button>
<el-button slot="operator" type="primary" :plain="true" :size="defaultFormItemSize" @click="refreshFormStudentActionStats(true)">查询</el-button>
</filter-box>
</el-form>
<el-row>
<el-col :span="24">
<el-table ref="studentActionStats" :data="formStudentActionStats.StudentActionStats.impl.dataList" size="mini" @sort-change="formStudentActionStats.StudentActionStats.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table ref="studentActionStats" :data="formStudentActionStats.StudentActionStats.impl.dataList" :size="defaultFormItemSize" @sort-change="formStudentActionStats.StudentActionStats.impl.onSortChange"
header-cell-class-name="table-header-gray"
>
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formStudentActionStats.StudentActionStats.impl.getTableIndex" />
<el-table-column label="统计日期">
<template slot-scope="scope">
@@ -125,6 +129,10 @@ export default {
}
},
methods: {
onResetFormStudentActionStats () {
this.$refs.formStudentActionStatsFilter.resetFields();
this.refreshFormStudentActionStats(true);
},
/**
* 学生行为统计数据获取函数返回Promise
*/