Merge branch 'online' into wxl

dist/static/css/chunk-121ab10a.91b99469.css

@@ -0,0 +1 @@
+.floor[data-v-4e3cb33f]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-4e3cb33f]{background:#f85043;margin-left:164px}.floor .add[data-v-4e3cb33f],.floor .remove[data-v-4e3cb33f]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-4e3cb33f]{background:#14928a;margin-left:20px}.studentMask[data-v-4e3cb33f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-4e3cb33f]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-4e3cb33f]{margin-bottom:20px}.studentMask .left h4[data-v-4e3cb33f]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-4e3cb33f]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-4e3cb33f]{padding-left:10px;line-height:25px}.studentMask .right[data-v-4e3cb33f]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-4e3cb33f]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-4e3cb33f],.resetClassForm .el-date-editor.el-input__inner[data-v-4e3cb33f]{width:180px}.el-date-editor.el-input[data-v-4e3cb33f],.el-date-editor.el-input__inner[data-v-4e3cb33f]{width:100px}

dist/static/css/chunk-8f5e867e.b1406e93.css

@@ -1 +0,0 @@
-.floor[data-v-473fdee8]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-473fdee8]{background:#f85043;margin-left:164px}.floor .add[data-v-473fdee8],.floor .remove[data-v-473fdee8]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-473fdee8]{background:#14928a;margin-left:20px}.studentMask[data-v-473fdee8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-473fdee8]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-473fdee8]{margin-bottom:20px}.studentMask .left h4[data-v-473fdee8]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-473fdee8]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-473fdee8]{padding-left:10px;line-height:25px}.studentMask .right[data-v-473fdee8]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-473fdee8]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-473fdee8],.resetClassForm .el-date-editor.el-input__inner[data-v-473fdee8]{width:180px}.el-date-editor.el-input[data-v-473fdee8],.el-date-editor.el-input__inner[data-v-473fdee8]{width:100px}

dist/static/css/chunk-5d453422.abefc249.css → dist/static/css/chunk-b698cf5c.e7112fd4.css

@@ -1 +1 @@
-.m-core[data-v-3d27f5b0]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3d27f5b0]{width:180px}.m-core h4[data-v-3d27f5b0]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3d27f5b0],.m-core .right[data-v-3d27f5b0],.m-core .vipLeft[data-v-3d27f5b0]{width:400px}.planList[data-v-3d27f5b0]{padding:0 25px}.planList .planTop[data-v-3d27f5b0]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3d27f5b0]{font-size:14px}.planList .planCore .row[data-v-3d27f5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3d27f5b0]{width:87px}.okBtn[data-v-3d27f5b0]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-64de2df7]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-64de2df7]{width:180px}.m-core h4[data-v-64de2df7]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-64de2df7],.m-core .right[data-v-64de2df7],.m-core .vipLeft[data-v-64de2df7]{width:400px}.planList[data-v-64de2df7]{padding:0 25px}.planList .planTop[data-v-64de2df7]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-64de2df7]{font-size:14px}.planList .planCore .row[data-v-64de2df7]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-64de2df7]{width:87px}.okBtn[data-v-64de2df7]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/api/buildTeam.js

@@ -734,4 +734,13 @@ export function getMusicGroupStuNoClassType (data) {
     method: 'GET',
     params: data
   })
+}
+
+// 调整班级(调整老师，重排课)
+export function classGroupUpdate (data) {
+  return request({
+    url: api + `/classGroup/classGroupUpdate`,
+    method: 'POST',
+    data
+  })
 }

src/views/buildVip/index.vue

@@ -813,8 +813,12 @@ export default {
           online--;
           if (online == 0) break
         }
+        if (onlineList.length == 1 || this.isAllEqual(onlineList)) {
+          date.setDate(date.getDate() + 7);
+        }
+
         // 加一周
-        // date.setDate(date.getDate() + 7);
+
       }
 
       // console.log(date1)
@@ -835,7 +839,10 @@ export default {
           if (offline == 0) break
         }
         // 加一周
-        // date1.setDate(date1.getDate() + 7);
+        if (offlineList.length == 1 || this.isAllEqual(offlineList)) {
+          date1.setDate(date1.getDate() + 7);
+        }
+
       }
       // console.log(this.timeTable);
       this.dialogFormVisible = false;
@@ -893,6 +900,15 @@ export default {
       })
 
     },
+    isAllEqual (array) {
+      if (array.length > 0) {
+        return !array.some((val, index) => {
+          return val.week != array[0].week
+        })
+      } else {
+        return true
+      }
+    },
     submitInfo () {
       let online = parseInt(this.centerForm.onlineCourseNum);
       let offline = parseInt(this.centerForm.offlineCourseNum);

src/views/teamBuild/components/teamResetSound.vue

@@ -222,10 +222,20 @@ export default {
   methods: {
     // 删除声部
     removeListItem () {
-      console.log(this.multipleSelection)
+      // 先获取选择的声部 从全局把 this.allActiveStudent
       for (let i = 0; i < this.activeSoundList.length; i++) {
         for (let j = 0; j < this.multipleSelection.length; j++) {
           if (this.activeSoundList[i].id == this.multipleSelection[j].id) {
+            // 在这里把(this.activeSoundList[i]的学生释放出来
+            // console.log(this.activeSoundList[i].studentList)
+            for (let x in this.allActiveStudent) {
+              for (let y in this.activeSoundList[i].studentList) {
+                if (this.allActiveStudent[x].userId == this.activeSoundList[i].studentList[y].userId) {
+                  this.allActiveStudent.splice(x, 1);
+                }
+
+              }
+            }
             console.log('删除');
             this.activeSoundList.splice(i, 1);
             // 遍历循环所有的group 删除所选id
@@ -302,8 +312,8 @@ export default {
       // 筛选学生1
       for (let i in this.activeSoundList) {
         if (this.activeSoundList[i].id == this.activeSoundId) {
-          console.log(this.activeSoundList[i].id);
-          console.log(this.activeSoundList[i].studentList);
+          // console.log(this.activeSoundList[i].id);
+          // console.log(this.activeSoundList[i].studentList);
           this.activeListStudent = this.activeSoundList[i].studentList;
         }
       }
@@ -326,7 +336,7 @@ export default {
             item.musicGroupName = teamName;
             return item;
           });
-          console.log(this.studentList)
+          // console.log(this.studentList)
           // 若学生在全局中被选中  则下次更新列表的时候不显示该学生
           for (let i in this.studentList) {
             for (let j in this.allActiveStudent) {
@@ -350,7 +360,7 @@ export default {
 
           // 去重
           let result = this.objArrayRemoval(this.activeSoundList[i].studentList, 'id')
-          console.log(result);
+          // console.log(result);
 
           // 不对
           this.activeSoundList[i].studentList = result;
@@ -358,7 +368,7 @@ export default {
           // // 添加全局 
 
           if (this.allActiveStudent.length <= 0) {
-            console.log('第一次添加数据')
+            // console.log('第一次添加数据')
             this.allActiveStudent = result;
           } else {
             this.allActiveStudent = this.allActiveStudent.concat(result);

src/views/teamDetail/components/baseInfo.vue

@@ -119,7 +119,6 @@ export default {
         this.topForm.cooperate = res.data.schoolName;
         this.topForm.type = res.data.chargeTypeName;
         this.topForm.section = res.data.organName;
-        this.topForm.boss = res.data.educationalTeacherName;
         this.topForm.add = res.data.address
         // 差上课地点
         this.$emit('getname', res.data.name)

src/views/teamDetail/components/resetClass.vue

@@ -81,8 +81,8 @@
                 <!-- v-if="scope.row.type !='MIX'" -->
                 <el-button type="text"
                            @click="resetClass(scope.row)">学员调整</el-button>
-                <!-- <el-button type="text"
-                           @click="classAdjustment(scope.row)">班级调整</el-button> -->
+                <el-button type="text"
+                           @click="classAdjustment(scope.row)">班级调整</el-button>
                 <!--<el-button type="text"
                            @click="recourse(scope.row)">重新排课</el-button> -->
                 <el-popover placement="top"
@@ -277,6 +277,15 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item> -->
+        <el-form-item label="调整方式"
+                      v-if="!isNewClass"
+                      prop="isAdd">
+          <el-radio v-model="teacherForm.isAdd"
+                    label="new">班级加课</el-radio>
+          <el-radio v-model="teacherForm.isAdd"
+                    label="renew">重新排课</el-radio>
+        </el-form-item>
+        <br>
         <el-form-item label="主教老师"
                       prop='coreTeacher'>
           <el-select v-model="teacherForm.coreTeacher"
@@ -308,6 +317,7 @@
                        :label="item.label"></el-option>
           </el-select>
         </el-form-item>
+        <br>
         <el-form-item label="排课次数"
                       prop="courseNum">
           <el-input type='number'
@@ -374,12 +384,16 @@
            class="dialog-footer">
         <!-- 1为临时班级 -->
         <el-button type="primary"
-                   v-if="isTemporary"
+                   v-if="isTemporary&&isNewClass"
                    @click="submitTemporary(1)">确 定</el-button>
         <!-- 2为新增班级 -->
         <el-button type="primary"
-                   v-if="!isTemporary"
+                   v-if="!isTemporary&&isNewClass"
                    @click="submitTemporary(2)">确 定</el-button>
+        <!-- 修改班级信息 -->
+        <el-button type="primary"
+                   v-if="!isNewClass"
+                   @click="submitTemporary(3)">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 新增合奏班 -->
@@ -592,7 +606,7 @@
   </div>
 </template>
 <script>
-import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher, findNoClassSingle, getMusicGroupStuNoClassType } from '@/api/buildTeam'
+import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher, findNoClassSingle, getMusicGroupStuNoClassType, classGroupUpdate } from '@/api/buildTeam'
 import { getClassAllStudent, removeStudents, addStudents } from '@/api/studentManager'
 import axios from 'axios'
 import qs from 'qs'
@@ -624,6 +638,7 @@ export default {
       soundList: [],
       infoVisible: false, // 判断是否需要显示老师设置
       teacherForm: {
+        isAdd: null,
         coreTeacher: '',
         assistant: [],
         courseType: '',
@@ -633,6 +648,7 @@ export default {
         mixClassGroupId: ''
       },
       teacherRules: {
+        isAdd: [{ required: true, message: '请选择调整类型' }],
         coreTeacher: [{ required: true, message: '请选择主教老师' }],
         courseType: [{ required: true, message: '请选择上课类型' }],
         courseTime: [{ required: true, message: '请选择开始时间' }],
@@ -919,6 +935,13 @@ export default {
     },
     // 班级调整
     classAdjustment (row) {
+      console.log(row);
+      this.activeType = row.type;
+      this.activeClass = row.id;
+      // this.activeListStudent = row.subjectIdList.split(',')
+      this.setType(row.type)
+      // activeListStudent
+      this.isNewClass = false;
       this.teacherForm.assistant = [];
       for (let i in row.classGroupTeacherMapperList) {
         if (row.classGroupTeacherMapperList[i].teacherRole == 'BISHOP') {
@@ -1093,6 +1116,7 @@ export default {
     submitTemporary (type) {
       // 参数是一样  type为1 新增临时班
       // type为2  新增单技班
+      // type为3 修改班级信息
       if (type == 1) {
         this.isTemporary = true;
       } else {
@@ -1140,7 +1164,8 @@ export default {
             holiday,
             courseTimes,
             courseTimeDtoList: courseList,
-            type: mineType
+            type: mineType,
+            courseAddType: this.teacherForm.isAdd
           }
           if (type == 1) {
             // 新增临时班级
@@ -1165,6 +1190,16 @@ export default {
                 this.getList();
               }
             })
+          } else if (type == 3) {
+            // activeClass
+            obj.classGroupId = this.activeClass;
+            classGroupUpdate(obj).then(res => {
+              if (res.code == 200) {
+                this.$message.success('修改成功');
+                this.infoVisible = false;
+                this.getList();
+              }
+            })
           }
 
         } else {

vue.config.js

@@ -16,7 +16,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000 
 // 
-let target = 'http://testadm.dayaedu.com/'
+let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥