wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：添加多对多关联中间表更新支持，功能位于 班级管理 -> 课程 -> 编辑课程顺序

Browse Source
This commit is contained in:
Jerry
2020-09-27 22:22:59 +08:00
parent 295d466207
commit 307588694e
495 changed files with 7134 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
orange-demo-multi-web/src/api/Controller/ClassController.js
View File

@@ -1,65 +0,0 @@
export default class ClassController {
static list (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/list', 'post', params, axiosOption, httpOption);
}
static view (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/view', 'get', params, axiosOption, httpOption);
}
static export (sender, params, fileName) {
return sender.download('/admin/CourseClass/class/export', params, fileName);
}
static add (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/add', 'post', params, axiosOption, httpOption);
}
static update (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/update', 'post', params, axiosOption, httpOption);
}
static delete (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/delete', 'post', params, axiosOption, httpOption);
}
static listClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/listClassCourse', 'post', params, axiosOption, httpOption);
}
static listNotInClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/listNotInClassCourse', 'post', params, axiosOption, httpOption);
}
static addClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/addClassCourse', 'post', params, axiosOption, httpOption);
}
static updateClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/updateClassCourse', 'post', params, axiosOption, httpOption);
}
static deleteClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/deleteClassCourse', 'post', params, axiosOption, httpOption);
}
static listClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/listClassStudent', 'post', params, axiosOption, httpOption);
}
static listNotInClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/listNotInClassStudent', 'post', params, axiosOption, httpOption);
}
static addClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/addClassStudent', 'post', params, axiosOption, httpOption);
}
static updateClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/updateClassStudent', 'post', params, axiosOption, httpOption);
}
static deleteClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/class/deleteClassStudent', 'post', params, axiosOption, httpOption);
}
}

12
orange-demo-multi-web/src/api/Controller/StudentClassController.js
View File

@@ -35,12 +35,16 @@ export default class StudentClassController {
return sender.doUrl('/admin/CourseClass/studentClass/addClassCourse', 'post', params, axiosOption, httpOption);
}
static deleteClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/deleteClassCourse', 'post', params, axiosOption, httpOption);
}
static updateClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/updateClassCourse', 'post', params, axiosOption, httpOption);
}
static deleteClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/deleteClassCourse', 'post', params, axiosOption, httpOption);
static viewClassCourse (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/viewClassCourse', 'get', params, axiosOption, httpOption);
}
static listClassStudent (sender, params, axiosOption, httpOption) {
@@ -55,10 +59,6 @@ export default class StudentClassController {
return sender.doUrl('/admin/CourseClass/studentClass/addClassStudent', 'post', params, axiosOption, httpOption);
}
static updateClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/updateClassStudent', 'post', params, axiosOption, httpOption);
}
static deleteClassStudent (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/CourseClass/studentClass/deleteClassStudent', 'post', params, axiosOption, httpOption);
}

25
orange-demo-multi-web/src/api/Controller/SysDeptController.js
View File

@@ -1,25 +0,0 @@
export default class SysDeptController {
static list (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/upms/sysDept/list', 'post', params, axiosOption, httpOption);
}
static view (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/upms/sysDept/view', 'get', params, axiosOption, httpOption);
}
static export (sender, params, fileName) {
return sender.download('/admin/upms/sysDept/export', params, fileName);
}
static add (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/upms/sysDept/add', 'post', params, axiosOption, httpOption);
}
static update (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/upms/sysDept/update', 'post', params, axiosOption, httpOption);
}
static delete (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/upms/sysDept/delete', 'post', params, axiosOption, httpOption);
}
}

BIN
orange-demo-multi-web/src/assets/img/login_bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 899 KiB

After

Width:  |  Height:  |  Size: 482 KiB

8
orange-demo-multi-web/src/router/systemRouters.js
View File

@@ -37,14 +37,14 @@ const routers = [
{path: 'formSchool', component: _import('generated/formSchool/index'), name: 'formSchool', props: getProps, meta: {title: '校区管理'}},
{path: 'formStudent', component: _import('generated/formStudent/index'), name: 'formStudent', props: getProps, meta: {title: '学生管理'}},
{path: 'formCourse', component: _import('generated/formCourse/index'), name: 'formCourse', props: getProps, meta: {title: '课程管理'}},
{path: 'formCourseStats', component: _import('generated/formCourseStats/index'), name: 'formCourseStats', props: getProps, meta: {title: '课程统计'}},
{path: 'formStudentActionStats', component: _import('generated/formStudentActionStats/index'), name: 'formStudentActionStats', props: getProps, meta: {title: '学生行为统计'}},
{path: 'formStudentActionDetail', component: _import('generated/formStudentActionDetail/index'), name: 'formStudentActionDetail', props: getProps, meta: {title: '学生行为详情'}},
{path: 'formClass', component: _import('generated/formClass/index'), name: 'formClass', props: getProps, meta: {title: '班级管理'}},
{path: 'formClassStudent', component: _import('generated/formClassStudent/index'), name: 'formClassStudent', props: getProps, meta: {title: '班级学生'}},
{path: 'formClassCourse', component: _import('generated/formClassCourse/index'), name: 'formClassCourse', props: getProps, meta: {title: '班级课程'}},
{path: 'formSetClassStudent', component: _import('generated/formSetClassStudent/index'), name: 'formSetClassStudent', props: getProps, meta: {title: '设置班级学生'}},
{path: 'formSetClassCourse', component: _import('generated/formSetClassCourse/index'), name: 'formSetClassCourse', props: getProps, meta: {title: '设置班级课程'}},
{path: 'formCourseStats', component: _import('generated/formCourseStats/index'), name: 'formCourseStats', props: getProps, meta: {title: '课程统计'}},
{path: 'formStudentActionStats', component: _import('generated/formStudentActionStats/index'), name: 'formStudentActionStats', props: getProps, meta: {title: '学生行为统计'}},
{path: 'formStudentActionDetail', component: _import('generated/formStudentActionDetail/index'), name: 'formStudentActionDetail', props: getProps, meta: {title: '学生行为详情'}}
{path: 'formSetClassCourse', component: _import('generated/formSetClassCourse/index'), name: 'formSetClassCourse', props: getProps, meta: {title: '设置班级课程'}}
]
}
];

72
orange-demo-multi-web/src/views/generated/formClass/index.vue
View File

@@ -31,9 +31,9 @@
</el-form>
<el-row>
<el-col :span="24">
<el-table :data="formClass.Class.impl.dataList" size="mini" @sort-change="formClass.Class.impl.onSortChange"
<el-table :data="formClass.StudentClass.impl.dataList" size="mini" @sort-change="formClass.StudentClass.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Class.impl.getTableIndex" />
<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>
<el-table-column label="所属校区" prop="schoolIdDictMap.name">
@@ -42,17 +42,21 @@
</el-table-column>
<el-table-column label="已完成课时" prop="finishClassHour">
</el-table-column>
<el-table-column label="班级创建时间" prop="createTime">
<el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope">
<span>{{formatDateByStatsType(scope.row.createTime, 'day')}}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" min-width="150px">
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click="onFormEditClassClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClass:formClass:formEditClass')">
编辑
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClass:formClass:delete')">
删除
</el-button>
<el-button @click="onFormClassStudentClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClass:formClass:formClassStudent')">
学生
@@ -61,22 +65,18 @@
:disabled="!checkPermCodeExist('formClass:formClass:formClassCourse')">
课程
</el-button>
<el-button @click="onDeleteClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClass:formClass:delete')">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" style="margin-top: 10px;">
<el-pagination
:total="formClass.Class.impl.totalCount"
:current-page="formClass.Class.impl.currentPage"
:page-size="formClass.Class.impl.pageSize"
:total="formClass.StudentClass.impl.totalCount"
:current-page="formClass.StudentClass.impl.currentPage"
:page-size="formClass.StudentClass.impl.pageSize"
:page-sizes="[10, 20, 50, 100]"
layout="total, prev, pager, next, sizes"
@current-change="formClass.Class.impl.onCurrentPageChange"
@size-change="formClass.Class.impl.onPageSizeChange">
@current-change="formClass.StudentClass.impl.onCurrentPageChange"
@size-change="formClass.StudentClass.impl.onPageSizeChange">
</el-pagination>
</el-row>
</el-col>
@@ -86,6 +86,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins';
@@ -118,8 +120,8 @@ export default {
classLevel: {
impl: new DropdownWidget(this.loadClassLevelDropdownList)
},
Class: {
impl: new TableWidget(this.loadClassData, this.loadClassVerify, true, 'createTime', 1)
StudentClass: {
impl: new TableWidget(this.loadStudentClassData, this.loadStudentClassVerify, true, 'createTime', 1)
},
isInit: false
}
@@ -129,7 +131,7 @@ export default {
/**
* 班级数据数据获取函数，返回Primise
*/
loadClassData (params) {
loadStudentClassData (params) {
if (params == null) params = {};
params = {
...params,
@@ -153,7 +155,7 @@ export default {
/**
* 班级数据数据获取检测函数，返回true正常获取数据，返回false停止获取数据
*/
loadClassVerify () {
loadStudentClassVerify () {
this.formClass.formFilterCopy.className = this.formClass.formFilter.className;
this.formClass.formFilterCopy.schoolId = this.formClass.formFilter.schoolId;
this.formClass.formFilterCopy.classLevel = this.formClass.formFilter.classLevel;
@@ -200,9 +202,9 @@ export default {
*/
refreshFormClass (reloadData = false) {
if (reloadData) {
this.formClass.Class.impl.refreshTable(true, 1);
this.formClass.StudentClass.impl.refreshTable(true, 1);
} else {
this.formClass.Class.impl.refreshTable();
this.formClass.StudentClass.impl.refreshTable();
}
if (!this.formClass.isInit) {
// 初始化下拉数据
@@ -232,7 +234,22 @@ export default {
this.$dialog.show('编辑', formEditClass, {
area: ['800px']
}, params).then(res => {
this.formClass.Class.impl.refreshTable();
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 => {});
}).catch(e => {});
},
/**
@@ -257,21 +274,6 @@ export default {
params.closeVisible = 1;
this.$router.push({name: 'formClassCourse', query: params});
},
/**
* 删除
*/
onDeleteClick (row) {
let params = {
classId: row.classId
};
this.$confirm('是否删除此班级？').then(res => {
StudentClassController.delete(this, params).then(res => {
this.$message.success('删除成功');
this.formClass.Class.impl.refreshTable();
}).catch(e => {});
}).catch(e => {});
},
onResume () {
this.refreshFormClass();
},

22
orange-demo-multi-web/src/views/generated/formClassCourse/index.vue
View File

@@ -36,6 +36,10 @@
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button @click="onFormEditClassCourseOrderClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClassCourse:formClassCourse:formEditClassCourseOrder')">
课程顺序
</el-button>
<el-button @click="onDeleteClassCourseClick(scope.row)" type="text" size="mini"
:disabled="!checkPermCodeExist('formClassCourse:formClassCourse:deleteClassCourse')">
移除
@@ -64,11 +68,14 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';
/* eslint-disable-next-line */
import { StudentClassController, DictionaryController } from '@/api';
import formEditClassCourseOrder from '@/views/generated/formEditClassCourseOrder';
export default {
name: 'formClassCourse',
@@ -153,6 +160,21 @@ export default {
params.closeVisible = 1;
this.$router.push({name: 'formSetClassCourse', query: params});
},
/**
* 课程顺序
*/
onFormEditClassCourseOrderClick (row) {
let params = {
classId: this.classId,
courseId: row.courseId
};
this.$dialog.show('课程顺序', formEditClassCourseOrder, {
area: ['400px']
}, params).then(res => {
this.formClassCourse.Course.impl.refreshTable();
}).catch(e => {});
},
/**
* 移除
*/

4
orange-demo-multi-web/src/views/generated/formClassStudent/index.vue
View File

@@ -19,7 +19,7 @@
</el-table-column>
<el-table-column label="所属校区" prop="schoolIdDictMap.name">
</el-table-column>
<el-table-column label="年级" prop="gradeIdDictMap.name">
<el-table-column label="所属年级" prop="gradeIdDictMap.name">
</el-table-column>
<el-table-column label="经验等级" prop="experienceLevelDictMap.name">
</el-table-column>
@@ -58,6 +58,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formCourse/index.vue
View File

@@ -101,6 +101,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formCourseStats/index.vue
View File

@@ -74,6 +74,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { defaultLineChartOption, defaultBarChartOption, defaultPieChartOption } from '@/utils/chartOption.js';

34
orange-demo-multi-web/src/views/generated/formCreateClass/index.vue
View File

@@ -64,6 +64,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
@@ -89,35 +91,13 @@ export default {
createTime: undefined,
status: undefined,
course: {
courseId: undefined,
courseName: undefined,
price: undefined,
description: undefined,
difficulty: undefined,
gradeId: undefined,
subjectId: undefined,
classHour: undefined,
pictureUrl: undefined,
createUserId: undefined,
createTime: undefined,
updateTime: undefined
classCourse: {
classId: undefined,
courseId: undefined,
courseOrder: undefined
}
},
student: {
studentId: undefined,
loginMobile: undefined,
studentName: undefined,
provinceId: undefined,
cityId: undefined,
districtId: undefined,
gender: undefined,
birthday: undefined,
experienceLevel: undefined,
totalCoin: undefined,
leftCoin: undefined,
gradeId: undefined,
schoolId: undefined,
registerTime: undefined,
status: undefined
},
isDatasourceInit: false
}

2
orange-demo-multi-web/src/views/generated/formCreateCourse/index.vue
View File

@@ -91,6 +91,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formCreateSchool/index.vue
View File

@@ -48,6 +48,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';

18
orange-demo-multi-web/src/views/generated/formCreateStudent/index.vue
View File

@@ -98,9 +98,9 @@
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formCreateStudent:formCreateStudent:update')"
@click="onUpdateClick()">
保存
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formCreateStudent:formCreateStudent:add')"
@click="onAddClick()">
新增
</el-button>
</el-row>
</el-col>
@@ -137,8 +137,8 @@ export default {
gender: undefined,
birthday: undefined,
experienceLevel: undefined,
totalCoin: 0,
leftCoin: 0,
totalCoin: undefined,
leftCoin: undefined,
gradeId: undefined,
schoolId: undefined,
registerTime: undefined,
@@ -385,9 +385,9 @@ export default {
this.formCreateStudent.isInit = true;
},
/**
* 保存
* 新增
*/
onUpdateClick () {
onAddClick () {
this.$refs.formCreateStudent.validate((valid) => {
if (!valid) return;
let params = {
@@ -404,12 +404,12 @@ export default {
leftCoin: this.formData.Student.leftCoin,
gradeId: this.formData.Student.gradeId,
schoolId: this.formData.Student.schoolId,
status: this.StudentStatus.NORMAL
status: this.formData.Student.status
}
};
StudentController.add(this, params).then(res => {
this.$message.success('保存成功');
this.$message.success('新增成功');
this.onCancel(true);
}).catch(e => {});
});

34
orange-demo-multi-web/src/views/generated/formEditClass/index.vue
View File

@@ -64,6 +64,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
@@ -92,35 +94,13 @@ export default {
createTime: undefined,
status: undefined,
course: {
courseId: undefined,
courseName: undefined,
price: undefined,
description: undefined,
difficulty: undefined,
gradeId: undefined,
subjectId: undefined,
classHour: undefined,
pictureUrl: undefined,
createUserId: undefined,
createTime: undefined,
updateTime: undefined
classCourse: {
classId: undefined,
courseId: undefined,
courseOrder: undefined
}
},
student: {
studentId: undefined,
loginMobile: undefined,
studentName: undefined,
provinceId: undefined,
cityId: undefined,
districtId: undefined,
gender: undefined,
birthday: undefined,
experienceLevel: undefined,
totalCoin: undefined,
leftCoin: undefined,
gradeId: undefined,
schoolId: undefined,
registerTime: undefined,
status: undefined
},
isDatasourceInit: false
}

157
orange-demo-multi-web/src/views/generated/formEditClassCourseOrder/index.vue Normal file
View File

@@ -0,0 +1,157 @@
<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>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="课程顺序" prop="StudentClass.course.classCourse.courseOrder">
<el-input-number class="input-item" v-model="formData.StudentClass.course.classCourse.courseOrder"
:clearable="true" controls-position="right" placeholder="课程顺序(数值越小越靠前)" />
</el-form-item>
</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"
@click="onCancel(false)">
取消
</el-button>
<el-button type="primary" size="mini" :disabled="!checkPermCodeExist('formEditClassCourseOrder:formEditClassCourseOrder:updateClassCourse')"
@click="onUpdateClassCourseClick()">
保存
</el-button>
</el-row>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
/* eslint-disable-next-line */
import { StudentClassController, DictionaryController } from '@/api';
export default {
name: 'formEditClassCourseOrder',
props: {
classId: {
default: undefined
},
courseId: {
default: undefined
}
},
mixins: [uploadMixin, statsDateRangeMixin],
data () {
return {
formData: {
StudentClass: {
classId: undefined,
className: undefined,
schoolId: undefined,
leaderId: undefined,
finishClassHour: undefined,
classLevel: undefined,
createUserId: undefined,
createTime: undefined,
status: undefined,
course: {
classCourse: {
classId: undefined,
courseId: undefined,
courseOrder: undefined
}
},
student: {
},
isDatasourceInit: false
}
},
rules: {
'StudentClass.course.classCourse.courseOrder': [
{required: true, message: '请输入课程顺序', trigger: 'blur'}
]
},
formEditClassCourseOrder: {
formFilter: {
},
formFilterCopy: {
},
menuBlock: {
isInit: false
},
isInit: false
}
}
},
methods: {
onCancel (isSuccess) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
}
},
/**
* 更新编辑课程顺序
*/
refreshFormEditClassCourseOrder (reloadData = false) {
this.loadStudentClassData().then(res => {
if (!this.formEditClassCourseOrder.isInit) {
// 初始化下拉数据
}
this.formEditClassCourseOrder.isInit = true;
}).catch(e => {});
},
/**
* 保存
*/
onUpdateClassCourseClick () {
let params = {
classCourse: {
classId: this.classId,
courseId: this.courseId,
courseOrder: this.formData.StudentClass.course.classCourse.courseOrder
}
};
StudentClassController.updateClassCourse(this, params).then(res => {
this.$message.success('保存成功');
this.onCancel(true);
}).catch(e => {});
},
/**
* 获取班级数据详细信息
*/
loadStudentClassData () {
return new Promise((resolve, reject) => {
if (!this.formData.StudentClass.isDatasourceInit) {
let params = {
classId: this.classId,
courseId: this.courseId
};
StudentClassController.viewClassCourse(this, params).then(res => {
this.formData.StudentClass.course.classCourse = {...res.data, isDatasourceInit: true};
resolve();
}).catch(e => {
reject();
});
} else {
resolve();
}
});
},
initFormData () {
},
formInit () {
this.refreshFormEditClassCourseOrder();
}
},
computed: {
},
created () {
this.formInit();
}
}
</script>

2
orange-demo-multi-web/src/views/generated/formEditCourse/index.vue
View File

@@ -91,6 +91,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formEditSchool/index.vue
View File

@@ -48,6 +48,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formSchool/index.vue
View File

@@ -71,6 +71,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins';

10
orange-demo-multi-web/src/views/generated/formSetClassCourse/index.vue
View File

@@ -10,9 +10,9 @@
<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="所属学科">
<el-select class="filter-item" v-model="formSetClassCourse.formFilter.subjectId" :clearable="true" filterable
placeholder="所属科目" :loading="formSetClassCourse.subjectId.impl.loading"
placeholder="所属学科" :loading="formSetClassCourse.subjectId.impl.loading"
@visible-change="formSetClassCourse.subjectId.impl.onVisibleChange"
@change="onSubjectIdValueChange">
<el-option v-for="item in formSetClassCourse.subjectId.impl.dropdownList" :key="item.id" :value="item.id" :label="item.name" />
@@ -82,6 +82,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';
@@ -196,7 +198,7 @@ export default {
onGradeIdValueChange (value) {
},
/**
* 所属科目下拉数据获取函数
* 所属学科下拉数据获取函数
*/
loadSubjectIdDropdownList () {
return new Promise((resolve, reject) => {
@@ -209,7 +211,7 @@ export default {
});
},
/**
* 所属科目选中值改变
* 所属学科选中值改变
*/
onSubjectIdValueChange (value) {
},

16
orange-demo-multi-web/src/views/generated/formSetClassStudent/index.vue
View File

@@ -10,10 +10,6 @@
<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-form-item label="学生姓名">
<el-input class="filter-item" v-model="formSetClassStudent.formFilter.searchString"
:clearable="true" placeholder="输入学生姓名 / 手机号码模糊查询" />
</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')"
@click="onAddClassStudentClick()">
@@ -66,6 +62,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';
@@ -89,12 +87,10 @@ export default {
tableSelectRowList: [],
formSetClassStudent: {
formFilter: {
schoolId: undefined,
searchString: undefined
schoolId: undefined
},
formFilterCopy: {
schoolId: undefined,
searchString: undefined
schoolId: undefined
},
schoolId: {
impl: new DropdownWidget(this.loadSchoolIdDropdownList)
@@ -123,8 +119,7 @@ export default {
params = {
...params,
studentFilter: {
schoolId: this.formSetClassStudent.formFilterCopy.schoolId,
searchString: this.formSetClassStudent.formFilterCopy.searchString
schoolId: this.formSetClassStudent.formFilterCopy.schoolId
},
classId: this.classId
}
@@ -144,7 +139,6 @@ export default {
*/
loadStudentVerify () {
this.formSetClassStudent.formFilterCopy.schoolId = this.formSetClassStudent.formFilter.schoolId;
this.formSetClassStudent.formFilterCopy.searchString = this.formSetClassStudent.formFilter.searchString;
return true;
},
/**

2
orange-demo-multi-web/src/views/generated/formStudent/index.vue
View File

@@ -94,6 +94,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formStudentActionDetail/index.vue
View File

@@ -80,6 +80,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/generated/formStudentActionStats/index.vue
View File

@@ -88,6 +88,8 @@
<script>
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin, cachePageMixin } from '@/core/mixins';

2
orange-demo-multi-web/src/views/upms/formEditSysUser/index.vue
View File

@@ -37,7 +37,7 @@
</el-row>
<!-- 弹窗下发按钮栏，必须设置class为dialog-btn-layer -->
<el-row type="flex" justify="end" class="dialog-btn-layer">
<el-button size="mini" type="primary" @click="onCancel(false)" >取消</el-button>
<el-button size="mini" type="primary" :plain="true" @click="onCancel(false)" >取消</el-button>
<el-button type="primary" size="mini" @click="onSubmit"
:disabled="!(checkPermCodeExist('formSysUser:fragmentSysUser:update') || checkPermCodeExist('formSysUser:fragmentSysUser:add'))">
确定

18
orange-demo-multi-web/src/views/welcome/index.vue
View File

@@ -13,15 +13,15 @@
<li>技术选型、包名、作者署名都由您钦定。</li>
<li>手把手教的操作指南和教学视频。</li>
<li>详尽、完善、免费、护眼的开发文档。</li>
<li>合理、超低价的商业授权。</li>
<li>全网超合理、超低价商业授权，就是撸顿串的价格。</li>
</ul>
</el-collapse-item>
<el-collapse-item title="我们的技术选型" name="2">
<ul class="item-list">
<li>Element (Vue) / Ant Design (React) / ECharts / AntV / Axios / Webpack</li>
<li>Spring Boot / Spring Cloud / Spring Cloud Alibaba + Mybatis + Jwt</li>
<li>Hutool + Guava + Caffeine + Lombok + MapStruct + 通用 mapper</li>
<li>Redis + ZooKeeper + Consul + Apollo + XXL-Job + Kafka + Seata</li>
<li>Hutool + Guava + Caffeine + Lombok + MapStruct + 通用 Mapper</li>
<li>Redis + Zookeeper + Nacos + Consul + Apollo + XXL-Job + Kafka + Seata</li>
<li>ELK + PinPoint / SkyWalking + Grafana + Prometheus</li>
</ul>
</el-collapse-item>
@@ -36,11 +36,11 @@
</el-collapse-item>
<el-collapse-item title="设计理念和未来目标" name="4">
<ul class="item-list">
<li>全面、实用的日志跟踪和服务监控体系。</li>
<li>前沿的单表组合式设计，使系统拆分SO EASY。</li>
<li>先代码，后SQL的原则，让服务扩充更具弹性。</li>
<li>全面、实用的日志跟踪和服务监控体系。</li>
<li>未来将演化为云原生架构，支持更多开发语言。</li>
<li>不会让数据中台成为我们的空白。</li>
<li>统一的数据组装接口，更高效的满足微服务的拆分与再合并。</li>
<li>拥抱云原生架构，更多可落地的实用功能正在开发之中。</li>
</ul>
</el-collapse-item>
</el-collapse>
@@ -54,7 +54,7 @@
<el-divider></el-divider>
<div class="item">
<span style="width: 120px;">网站首页</span>
<a href="http://101.200.178.51/" target="_blank">http://101.200.178.51/</a>
<a href="http://www.orangeforms.com/" target="_blank">http://www.orangeforms.com/</a>
</div>
<el-divider></el-divider>
<div class="item">
@@ -64,12 +64,12 @@
<el-divider></el-divider>
<div class="item">
<span style="width: 120px;">操作指南</span>
<a href="http://101.200.178.51/orange-doc/" target="_blank">http://101.200.178.51/orange-doc/</a>
<a href="http://www.orangeforms.com/orange-doc/" target="_blank">http://www.orangeforms.com/orange-doc/</a>
</div>
<el-divider></el-divider>
<div class="item">
<span style="width: 120px;">开发文档</span>
<a href="http://101.200.178.51/development-doc/" target="_blank">http://101.200.178.51/development-doc/</a>
<a href="http://www.orangeforms.com/development-doc/" target="_blank">http://www.orangeforms.com/development-doc/</a>
</div>
<el-divider></el-divider>
<div class="item">