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

2026-01-17 18:46:36 +08:00 · 2020-09-27 22:22:59 +08:00
parent 295d466207
commit 307588694e
495 changed files with 7134 additions and 1183 deletions
--- a/orange-demo-single-web/README.md
+++ b/orange-demo-single-web/README.md
@@ -12,4 +12,4 @@ npm run build

 # run all tests
 npm test
-```
+```
--- a/orange-demo-single-web/public/index.html
+++ b/orange-demo-single-web/public/index.html
@@ -5,11 +5,11 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>橙单工程</title>
+    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>
  <body class="demo-project">
    <noscript>
-      <strong>We're sorry but 橙单工程 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>
    <div id="app"></div>
    <!-- built files will be auto injected -->
--- a/orange-demo-single-web/src/api/Controller/StudentClassController.js
+++ b/orange-demo-single-web/src/api/Controller/StudentClassController.js
@@ -43,6 +43,10 @@ export default class StudentClassController {
    return sender.doUrl('/admin/app/studentClass/updateClassCourse', 'post', params, axiosOption, httpOption);
  }

+  static viewClassCourse (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('/admin/app/studentClass/viewClassCourse', 'get', params, axiosOption, httpOption);
+  }
+
  static listClassStudent (sender, params, axiosOption, httpOption) {
    return sender.doUrl('/admin/app/studentClass/listClassStudent', 'post', params, axiosOption, httpOption);
  }
@@ -58,8 +62,4 @@ export default class StudentClassController {
  static deleteClassStudent (sender, params, axiosOption, httpOption) {
    return sender.doUrl('/admin/app/studentClass/deleteClassStudent', 'post', params, axiosOption, httpOption);
  }
-
-  static updateClassStudent (sender, params, axiosOption, httpOption) {
-    return sender.doUrl('/admin/app/studentClass/updateClassStudent', 'post', params, axiosOption, httpOption);
-  }
 }
--- a/orange-demo-single-web/src/core/config/development.js
+++ b/orange-demo-single-web/src/core/config/development.js
@@ -1,4 +1,4 @@
 module.exports = {
-  baseUrl: 'http://localhost:8082/',
+  baseUrl: 'http://10.24.82.239:8082/',
  projectName: '橙单生成器项目'
 }
--- a/orange-demo-single-web/src/router/systemRouters.js
+++ b/orange-demo-single-web/src/router/systemRouters.js
@@ -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: '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: '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: '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: 'formClassCourse', component: _import('generated/formClassCourse/index'), name: 'formClassCourse', props: getProps, meta: {title: '班级课程'}}
    ]
  }
 ];
--- a/orange-demo-single-web/src/views/generated/formClass/index.vue
+++ b/orange-demo-single-web/src/views/generated/formClass/index.vue
@@ -36,10 +36,10 @@
          <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="classLevelDictMap.name">
-          </el-table-column>
          <el-table-column label="所属校区" prop="schoolIdDictMap.name">
          </el-table-column>
+          <el-table-column label="班级级别" prop="classLevelDictMap.name">
+          </el-table-column>
          <el-table-column label="已完成课时" prop="finishClassHour">
          </el-table-column>
          <el-table-column label="创建时间" prop="createTime">
--- a/orange-demo-single-web/src/views/generated/formClassCourse/index.vue
+++ b/orange-demo-single-web/src/views/generated/formClassCourse/index.vue
@@ -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')">
                移除
@@ -56,6 +60,9 @@
        </el-row>
      </el-col>
    </el-row>
+    <label v-if="closeVisible == '1'" class="page-close-box">
+      <el-button type="text" @click="onCancel(true)" icon="el-icon-close" />
+    </label>
  </div>
 </template>

@@ -65,18 +72,23 @@ 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';
+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',
  props: {
    classId: {
      default: undefined
+    },
+    closeVisible: {
+      type: [Number, String],
+      default: 0
    }
  },
-  mixins: [uploadMixin, statsDateRangeMixin, cachePageMixin],
+  mixins: [uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin],
  data () {
    return {
      formClassCourse: {
@@ -92,6 +104,11 @@ export default {
    }
  },
  methods: {
+    onCancel (isSuccess) {
+      this.removeCachePage(this.$options.name);
+      this.refreshParentCachedPage = isSuccess;
+      this.$router.go(-1);
+    },
    /**
     * 班级课程数据获取函数，返回Primise
     */
@@ -143,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 => {});
+    },
    /**
     * 移除
     */
--- a/orange-demo-single-web/src/views/generated/formClassStudent/index.vue
+++ b/orange-demo-single-web/src/views/generated/formClassStudent/index.vue
@@ -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>
@@ -50,6 +50,9 @@
        </el-row>
      </el-col>
    </el-row>
+    <label v-if="closeVisible == '1'" class="page-close-box">
+      <el-button type="text" @click="onCancel(true)" icon="el-icon-close" />
+    </label>
  </div>
 </template>

@@ -59,7 +62,7 @@ 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';
+import { uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin } from '@/core/mixins';
 /* eslint-disable-next-line */
 import { StudentClassController, DictionaryController } from '@/api';

@@ -68,9 +71,13 @@ export default {
  props: {
    classId: {
      default: undefined
+    },
+    closeVisible: {
+      type: [Number, String],
+      default: 0
    }
  },
-  mixins: [uploadMixin, statsDateRangeMixin, cachePageMixin],
+  mixins: [uploadMixin, statsDateRangeMixin, cachePageMixin, cachedPageChildMixin],
  data () {
    return {
      formClassStudent: {
@@ -86,6 +93,11 @@ export default {
    }
  },
  methods: {
+    onCancel (isSuccess) {
+      this.removeCachePage(this.$options.name);
+      this.refreshParentCachedPage = isSuccess;
+      this.$router.go(-1);
+    },
    /**
     * 班级学生数据获取函数，返回Primise
     */
@@ -146,7 +158,7 @@ export default {
        studentId: row.studentId
      };

-      this.$confirm('是否从班级中移除此学生？').then(res => {
+      this.$confirm('是否从课程中移除此学生？').then(res => {
        StudentClassController.deleteClassStudent(this, params).then(res => {
          this.$message.success('移除成功');
          this.formClassStudent.Student.impl.refreshTable();
--- a/orange-demo-single-web/src/views/generated/formCreateClass/index.vue
+++ b/orange-demo-single-web/src/views/generated/formCreateClass/index.vue
@@ -91,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
        }
--- a/orange-demo-single-web/src/views/generated/formCreateStudent/index.vue
+++ b/orange-demo-single-web/src/views/generated/formCreateStudent/index.vue
@@ -138,7 +138,7 @@ export default {
          birthday: undefined,
          experienceLevel: undefined,
          totalCoin: undefined,
-          leftCoin: 0,
+          leftCoin: undefined,
          gradeId: undefined,
          schoolId: undefined,
          registerTime: undefined,
--- a/orange-demo-single-web/src/views/generated/formEditClass/index.vue
+++ b/orange-demo-single-web/src/views/generated/formEditClass/index.vue
@@ -94,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
        }
@@ -237,10 +215,12 @@ export default {
     * 更新编辑班级
     */
    refreshFormEditClass (reloadData = false) {
-      if (!this.formEditClass.isInit) {
-        // 初始化下拉数据
-      }
-      this.formEditClass.isInit = true;
+      this.loadStudentClassData().then(res => {
+        if (!this.formEditClass.isInit) {
+          // 初始化下拉数据
+        }
+        this.formEditClass.isInit = true;
+      }).catch(e => {});
    },
    /**
     * 保存
@@ -265,6 +245,29 @@ export default {
        }).catch(e => {});
      });
    },
+    /**
+     * 获取班级数据详细信息
+     */
+    loadStudentClassData () {
+      return new Promise((resolve, reject) => {
+        if (!this.formData.StudentClass.isDatasourceInit) {
+          let params = {
+            classId: this.classId
+          };
+          StudentClassController.view(this, params).then(res => {
+            this.formData.StudentClass = {...res.data, isDatasourceInit: true};
+            if (this.formData.StudentClass.classLevelDictMap) this.formEditClass.classLevel.impl.dropdownList = [this.formData.StudentClass.classLevelDictMap];
+            if (this.formData.StudentClass.schoolIdDictMap) this.formEditClass.schoolId.impl.dropdownList = [this.formData.StudentClass.schoolIdDictMap];
+            if (this.formData.StudentClass.leaderIdDictMap) this.formEditClass.leaderId.impl.dropdownList = [this.formData.StudentClass.leaderIdDictMap];
+            resolve();
+          }).catch(e => {
+            reject();
+          });
+        } else {
+          resolve();
+        }
+      });
+    },
    initFormData () {
    },
    formInit () {
--- a/orange-demo-single-web/src/views/generated/formEditClassCourseOrder/index.vue
+++ b/orange-demo-single-web/src/views/generated/formEditClassCourseOrder/index.vue
@@ -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>
--- a/orange-demo-single-web/src/views/generated/formSetClassCourse/index.vue
+++ b/orange-demo-single-web/src/views/generated/formSetClassCourse/index.vue
@@ -51,7 +51,7 @@
          </el-table-column>
          <el-table-column label="所属学科" prop="subjectIdDictMap.name">
          </el-table-column>
-          <el-table-column label="课时数量" prop="classHour" sortable="custom">
+          <el-table-column label="课时数量" prop="classHour">
          </el-table-column>
          <el-table-column label="创建时间" prop="createTime">
            <template slot-scope="scope">
--- a/orange-demo-single-web/src/views/generated/formSetClassStudent/index.vue
+++ b/orange-demo-single-web/src/views/generated/formSetClassStudent/index.vue
@@ -27,7 +27,7 @@
          </el-table-column>
          <el-table-column label="手机号码" prop="loginMobile">
          </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="schoolIdDictMap.name">
          </el-table-column>