Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

dist/static/css/chunk-ff51b55c.d7074c03.css → dist/static/css/chunk-0e1d63af.28d02d19.css

@@ -1 +1 @@
-.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-258c987e]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-258c987e]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-237969bd]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-237969bd]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-23a813f0.340b5b49.css

@@ -1 +0,0 @@
-.floor[data-v-b2f807a4]{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-b2f807a4]{background:#f85043;margin-left:164px}.floor .add[data-v-b2f807a4],.floor .remove[data-v-b2f807a4]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-b2f807a4]{background:#14928a;margin-left:20px}.studentMask[data-v-b2f807a4]{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-b2f807a4]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-b2f807a4]{margin-bottom:20px}.studentMask .left h4[data-v-b2f807a4]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-b2f807a4]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-b2f807a4]{padding-left:10px;line-height:25px}.studentMask .right[data-v-b2f807a4]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-b2f807a4]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-b2f807a4],.resetClassForm .el-date-editor.el-input__inner[data-v-b2f807a4]{width:180px}.el-date-editor.el-input[data-v-b2f807a4],.el-date-editor.el-input__inner[data-v-b2f807a4]{width:100px}

dist/static/css/chunk-6c6a1408.20ee8028.css

@@ -0,0 +1 @@
+.floor[data-v-0ac88d70]{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-0ac88d70]{background:#f85043;margin-left:164px}.floor .add[data-v-0ac88d70],.floor .remove[data-v-0ac88d70]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-0ac88d70]{background:#14928a;margin-left:20px}.studentMask[data-v-0ac88d70]{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-0ac88d70]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-0ac88d70]{margin-bottom:20px}.studentMask .left h4[data-v-0ac88d70]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-0ac88d70]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-0ac88d70]{padding-left:10px;line-height:25px}.studentMask .right[data-v-0ac88d70]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-0ac88d70]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-0ac88d70],.resetClassForm .el-date-editor.el-input__inner[data-v-0ac88d70]{width:180px}.el-date-editor.el-input[data-v-0ac88d70],.el-date-editor.el-input__inner[data-v-0ac88d70]{width:100px}

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -67,7 +67,7 @@
                               @change='changeTimer(item)'
                               v-model="item.startTime"
                               :picker-options="{
-                             start: '06:30',
+                             start: '04:30',
                              step: '00:05',
                              end: '23:30'
                                             }">
@@ -76,7 +76,7 @@
               <el-time-select placeholder="结束"
                               v-model="item.endTime"
                               :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: item.startTime

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -149,7 +149,7 @@
                           value-format='HH:mm:ss'
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                           }">
@@ -158,7 +158,7 @@
                           v-model="maskForm.endTime"
                           value-format='HH:mm:ss'
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime

src/views/teamDetail/components/classList.vue

@@ -51,11 +51,11 @@
                          prop="studyNum"
                          label="在读人数">
         </el-table-column>
-        <el-table-column align='center'
+        <!-- <el-table-column align='center'
                          prop="quitNum"
                          label="退团人数">
 
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column align='center'
                          label="新增人数">
         </el-table-column> -->

src/views/teamDetail/components/courseList.vue

@@ -174,7 +174,7 @@
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                             }">
@@ -185,7 +185,7 @@
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime

src/views/teamDetail/components/resetClass.vue

@@ -80,10 +80,10 @@
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
                 <el-button type="text"
-                           @click="resetClass(scope.row)">修改</el-button>
+                           @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"
                             width="160"
@@ -117,6 +117,7 @@
         </div>
       </div>
     </div>
+    <!-- 学员选择 -->
     <el-dialog title="学员选择"
                width="700px"
                :visible.sync="studentVisible"
@@ -346,7 +347,7 @@
             <el-time-select placeholder=""
                             v-model="item.startClassTime"
                             :picker-options="{
-                               start: '08:30',
+                               start: '04:30',
                                step: '00:05',
                                end: '23:55'
             }">
@@ -355,7 +356,7 @@
             <el-time-select placeholder=""
                             v-model="item.endClassTime"
                             :picker-options="{
-                              start: '08:30',
+                              start: '04:30',
                               step: '00:05',
                               end: '23:55',
                               minTime:item.startClassTime
@@ -454,7 +455,7 @@
       </div>
     </el-dialog>
     <!-- 班级调整 -->
-    <el-dialog title="班级调整"
+    <!-- <el-dialog title="班级调整"
                width="500px"
                :visible.sync="resetClassVisible"
                :modal-append-to-body="false">
@@ -504,13 +505,12 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="resetClassVisible = false">取 消</el-button>
-        <!-- 班级学员修改 -->
         <el-button type="primary"
                    @click="">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
     <!-- 重新排课 -->
-    <el-dialog title="重新排课"
+    <!-- <el-dialog title="重新排课"
                width="700px"
                :visible.sync="resetCourseVisible"
                :modal-append-to-body="false">
@@ -585,11 +585,10 @@
       <div slot="footer"
            class="dialog-footer">
         <el-button @click="resetCourseVisible = false">取 消</el-button>
-        <!-- 班级学员修改 -->
         <el-button type="primary"
                    @click="">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -861,7 +860,8 @@ export default {
       this.studentVisible = true;
       this.activeClass = row.id
       this.isSearch = false;
-      console.log(row);
+      this.activeType = row.type;
+      // console.log(row);
       // 根据单机班id 查询单技班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then(res => {
         if (res.code == 200) {
@@ -876,16 +876,16 @@ export default {
     },
     // 班级调整
     classAdjustment (row) {
-      this.resetClassForm.assistant = [];
+      this.teacherForm.assistant = [];
       for (let i in row.classGroupTeacherMapperList) {
         if (row.classGroupTeacherMapperList[i].teacherRole == 'BISHOP') {
-          this.resetClassForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
+          this.teacherForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
         }
         if (row.classGroupTeacherMapperList[i].teacherRole == 'TEACHING') {
-          this.resetClassForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
+          this.teacherForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
         }
       }
-      this.resetClassVisible = true;
+      this.infoVisible = true;
     },
     getNoClassStudent (type) {
       // 获取乐团内所有未分班的学生
@@ -902,19 +902,34 @@ export default {
       //     }
       //   })
       // }
+      // res.data - activeListStudent
       getMusicGroupStuNoClassType({ musicGroupId: this.teamid, type }).then(res => {
         if (res.code == 200) {
-          this.studentList = res.data
+          // this.studentList = res.data.concat(this.activeListStudent).filter(item=>{
+          //   return res.data
+          // });
+          let idarr1 = [];
+          let idarr2 = [];
+          let arr3 = res.data.concat(this.activeListStudent);
+          for (let i in res.data) {
+            idarr1.push(res.data[i].userId);
+          }
+          for (let j in this.activeListStudent) {
+            idarr2.push(this.activeListStudent[j].userId);
+          }
+          this.studentList = arr3.filter(item => {
+            return idarr1.indexOf(item.userId) === -1 || (idarr2.indexOf(item.userId) === -1)
+          })
         }
       })
 
     },
     // 删除学生 调整
     removeStudent (item) {
-      // console.log(item.userId);
       // removeStudents({ classGroupId:}).then(res => {
       removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
         if (res.code == 200) {
+          this.$message.success('删除成功');
           item.isVisible = false;
           // 这里刷新 this.studentList this.activeListStudent 
           this.getList(this.activeMixClass);
@@ -923,16 +938,17 @@ export default {
               this.activeListStudent = res.data;
             }
           })
-          getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
-            if (res.code == 200) {
-              this.$message.success('删除成功');
-              this.studentList = res.data.map(item => {
-                item.isVisible = false;
-                return item;
-              });
+          this.getNoClassStudent(this.activeType);
+          // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
+          //   if (res.code == 200) {
+          //     this.$message.success('删除成功');
+          //     this.studentList = res.data.map(item => {
+          //       item.isVisible = false;
+          //       return item;
+          //     });
 
-            }
-          })
+          //   }
+          // })
         }
       })
     },
@@ -942,6 +958,10 @@ export default {
       let arr = this.chioseStudent.map(item => {
         return item.userId;
       });
+      if (arr.length <= 0) {
+        this.$message.error('至少添加一名学员')
+        return;
+      }
       addStudents({ classGroupId: this.activeClass, userIdsStr: arr.join(',') }).then(res => {
         if (res.code == 200) {
           this.studentVisible = false;

src/views/vipClass/vipReset.vue

@@ -104,7 +104,7 @@
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30'
                             }">
@@ -115,7 +115,7 @@
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
                           :picker-options="{
-                            start: '06:30',
+                            start: '04:30',
                             step: '00:05',
                             end: '23:30',
                             minTime: maskForm.startTime
@@ -164,7 +164,7 @@
             <div>
               <el-time-select v-model="scope.row.startClassTimeStr"
                               :picker-options="{
-                                start: '06:30',
+                                start: '04:30',
                                 step: '00:05',
                                 end: '23:30'
                               }"

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000 
 // 
 // let target = 'http://testadm.dayaedu.com/' //勇哥迁库
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://47.99.212.176:8000' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {