1130 19:26

111

dist/static/css/chunk-0d829c04.8bcaf299.css

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

dist/static/css/chunk-17c335d6.c98ac437.css

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

src/utils/request.js

@@ -46,7 +46,7 @@ function tryHideFullScreenLoading () {
 const service = axios.create({
   baseURL: '', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 180000 // request timeout
 })
 // { fullscreen: true, text: '努力加载中', spinner: 'el-icon-loading' }
 // request interceptor

src/utils/vueFilter.js

@@ -299,12 +299,15 @@ Vue.filter('studentSign', value => {
   }
   return template[value]
 })
-
 // 班级类型
 Vue.filter('classType', value => {
   let template = {
     NORMAL: "普通班级",
-    MIX: '合奏班'
+    MIX: '合奏班',
+    HIGH: '基础技能班',
+    VIP: 'VIP',
+    DEMO: '试听',
+    SNAP: "临时班"
   }
   return template[value]
 })

src/views/teamBuild/components/teamBaseInfo.vue

@@ -544,21 +544,21 @@ export default {
           }
           // 循环缴费月
           this.payList.chioseMonth = res.data.months;
-          if (this.topFrom.section) {
+          if (res.data.musicGroup.organId) {
             // 获取员工
-            queryEmployByOrganId({ organId: this.topFrom.section, rows: 1000 }).then(res => {
+            queryEmployByOrganId({ organId: res.data.musicGroup.organId, rows: 1000 }).then(res => {
               if (res.code == 200) {
                 this.orgianList = res.data.rows;
               }
             })
             // 获取合作单位
-            queryByOrganId({ organId: this.topFrom.section }).then(res => {
+            queryByOrganId({ organId: res.data.musicGroup.organId }).then(res => {
               if (res.code == 200) {
                 this.cooperationList = res.data;
               }
             })
             // 获取教学点
-            getSchool({ organId: this.topFrom.section }).then(res => {
+            getSchool({ organId: res.data.musicGroup.organId }).then(res => {
               if (res.code == 200) {
                 this.addList = res.data
               }

src/views/teamDetail/components/classList.vue

@@ -23,10 +23,10 @@
                          label="班级名称">
         </el-table-column>
         <el-table-column align='center'
-                         label="课程类型">
+                         label="班级类型">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.classGroupType | coursesType}}
+              {{ scope.row.classGroupType | classType}}
             </div>
           </template>
         </el-table-column>

src/views/teamDetail/components/resetClass.vue

@@ -93,7 +93,11 @@
           <div class="add"
                @click="temporary">临时调整</div>
           <div class='add'
-               @click="addNewClass">新建班级</div>
+               @click="addNewClass">新建单技班</div>
+          <!-- <div class='add'
+               @click="addMix">新建合奏班</div> -->
+          <!-- <div class='add'
+               @click="">基础技能班</div> -->
         </div>
       </div>
     </div>
@@ -103,7 +107,6 @@
                :modal-append-to-body="false">
       <div class="studentMask">
         <div class="left">
-
           <div class="wrap">
             <el-input placeholder="请输入班级名称"
                       :disabled="!isNewClass"
@@ -220,7 +223,6 @@
               </el-table-column>
             </el-table>
           </div>
-
         </div>
       </div>
       <div slot="footer"
@@ -362,10 +364,66 @@
                    @click="submitTemporary(2)">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 新增合奏班 -->
+    <el-dialog title="新增合奏班"
+               width="700px"
+               :visible.sync="MixVisible"
+               :modal-append-to-body="false">
+      <div class="studentMask">
+        <div class="left">
+          <div class="wrap">
+            <!-- :disabled="!isNewClass" -->
+            <el-input placeholder="请输入合奏班名称"
+                      v-model="className"></el-input>
+          </div>
+          <div class="chioseStudentList">
+            <h4 style="padding-left:10px;">当前已选班级</h4>
+            <div class="studentItem"
+                 v-for="(item,index) in activeSingleLists"
+                 :key="index">
+              {{ item.name }}
+              <el-button type='text'
+                         @click="removeSiginforMix(item)">删除</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="right">
+          <!--   列表开始  -->
+          <div class="tableList">
+            <el-table tooltip-effect="dark"
+                      style="width: 100%; margin-top:10px;"
+                      :data='singleList'
+                      ref='mixList'
+                      @selection-change="SelectionMix">
+              <el-table-column type="selection"
+                               align='center'
+                               width="55">
+              </el-table-column>
+              <el-table-column prop="name"
+                               align='center'
+                               label="班级名称">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="studentVisible = false">取 消</el-button>
+        <!-- 班级学员修改 -->
+        <el-button type="primary"
+                   v-if="!isNewClass"
+                   @click="addSomeStudent">确 定</el-button>
+        <!-- 临时调整或者新建班级 -->
+        <el-button type="primary"
+                   v-if="isNewClass"
+                   @click="setInfoMsg">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher } from '@/api/buildTeam'
+import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher, findNoClassSingle } from '@/api/buildTeam'
 import { getClassAllStudent, removeStudents, addStudents } from '@/api/studentManager'
 import axios from 'axios'
 import qs from 'qs'
@@ -380,6 +438,7 @@ export default {
       maxClassList: [],
       activeSingleList: [],
       studentVisible: false,
+      MixVisible: false,// 新增合奏班弹窗
       activeListStudent: [], // 当前选中的学生列表
       activeChioseSound: '', //选择的声部
       chioseSoundList: [], //当前的所有声部
@@ -441,7 +500,9 @@ export default {
         { value: 'HIGH', label: '基础技能班' },
         { value: 'SNAP', label: '临时班' },
       ],
-      cooperationList: []
+      cooperationList: [],
+      singleList: [],
+      activeSingleLists: []
     }
   },
   created () {
@@ -449,6 +510,12 @@ export default {
   },
   mounted () {
     sessionStorage.setItem('resetCode', 3)
+    // 获取乐团下未分班的单技班
+    findNoClassSingle({ musicGroupId: this.teamid }).then(res => {
+      if (res.code == 200) {
+        this.singleList = res.data;
+      }
+    })
     // 1.获取乐团下所有的合奏班
     // 2.根据合奏班获取所有的单技班
     // 3.根据乐团id 查询 此乐团所有的合奏班
@@ -492,6 +559,9 @@ export default {
     })
   },
   methods: {
+    addMix () {
+      this.MixVisible = true;
+    },
     setAssistant (val) {
       for (let i in val) {
         if (val[i] == this.teacherForm.coreTeacher) {
@@ -555,6 +625,7 @@ export default {
     },
     // 新增选中的学生
     NewselectionStudent (val) {
+
       this.chioseStudent = val;
       // 这里新增的添加到选中的学生列表  根据学生id去重
       if (this.chioseStudent.length > 0) {
@@ -562,10 +633,10 @@ export default {
       } else {
         this.chioseStudent = val;
       }
-
-      this.activeListStudent = this.activeListStudent.concat(this.chioseStudent);
-      // 去重
-      this.activeListStudent = this.objArrayRemoval(this.activeListStudent, 'userId');
+      this.activeListStudent = this.objArrayRemoval(this.chioseStudent, 'userId')
+      // this.activeListStudent = this.activeListStudent.concat(this.chioseStudent);
+      // // 去重
+      // this.activeListStudent = this.objArrayRemoval(this.activeListStudent, 'userId');
       // 将其填入选中的学生
     },
     // 删除班级
@@ -637,8 +708,6 @@ export default {
           })
         }
       })
-
-
     },
     // 批量添加学生
     addSomeStudent () {
@@ -652,8 +721,16 @@ export default {
         }
       })
     },
-
-    // 
+    SelectionMix (val) {
+      this.activeSingleLists = val;
+    },
+    removeSiginforMix (item) {
+      for (let k in this.activeSingleLists) {
+        if (this.activeSingleLists[k].id == item.id) {
+          this.$refs['mixList'].toggleRowSelection(item, false)
+        }
+      }
+    },
     temporaryRemoveStudent (item) {
       // 列表中删除
       for (let i in this.activeListStudent) {
@@ -755,7 +832,6 @@ export default {
             this.$message.error('新增班级至少排一节课')
             return
           }
-
           let obj = {
             classGroupName,
             mixClassGroupId,

vue.config.js

@@ -19,9 +19,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 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:8000' //勇哥
-// let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://192.168.3.8:18000' //勇哥
+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 = {
   /**