Merge branch 'online' into resetSound

dist/static/css/chunk-459dd303.72eba438.css → dist/static/css/chunk-334b6795.e2ad8c2f.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.imc[data-v-14f80d04]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-14f80d04]{margin-right:20px;background-color:#4eada7}.imc .addBtn[data-v-14f80d04],.setBtn[data-v-9b7fa9de]{line-height:40px;text-align:center;color:#fff;border-radius:4px;cursor:pointer;width:120px;height:40px}.setBtn[data-v-9b7fa9de]{background-color:#444;margin:20px 0}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.imc[data-v-14f80d04]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-14f80d04]{margin-right:20px;background-color:#4eada7}.imc .addBtn[data-v-14f80d04],.setBtn[data-v-69f1cf7d]{line-height:40px;text-align:center;color:#fff;border-radius:4px;cursor:pointer;width:120px;height:40px}.setBtn[data-v-69f1cf7d]{background-color:#444;margin:20px 0}

dist/static/css/chunk-7cd8f6e1.8bd2ecde.css

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

dist/static/css/chunk-93111822.e13a4b2b.css

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

src/templateList.vue

@@ -55,7 +55,6 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      isInit: false
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -73,9 +72,9 @@ export default {
       }
     });
     // 获取分部
-    if (!this.isInit) {
-      this.init();
-    }
+
+    this.init();
+
 
   },
   activated () {

src/utils/searchArray.js

@@ -5,11 +5,12 @@ const courseType = [
   { label: "单技课", value: "SINGLE" },
   { label: "合奏课", value: "MIX" },
   { label: "基础技能课", value: "HIGH" },
-  { label: "乐团网管课", value: "HIGH_ONLINE" },
+  { label: "线上基础技能课", value: "HIGH_ONLINE" },
   { label: "vip课", value: "VIP" },
   { label: "试听课", value: "DEMO" },
   { label: "综合课", value: "COMPREHENSIVE" },
   { label: "网管课", value: "PRACTICE" },
+  { label: "乐团网管课", value: "MUSIC_NETWORK" },
   { label: "启蒙课", value: "ENLIGHTENMENT" },
   { label: "集训单技课", value: "TRAINING_SINGLE" },
   { label: "集训合奏课", value: "TRAINING_MIX" },

src/utils/vueFilter.js

@@ -89,7 +89,7 @@ Vue.filter('coursesType', (value) => {
     PRACTICE: '网管课',
     COMM: '对外课',
     MUSIC: '乐团课',
-    HIGH_ONLINE: '乐团网管课'
+    HIGH_ONLINE: '线上基础技能课'
   }
   return template[value]
 })
@@ -340,7 +340,8 @@ Vue.filter('classType', value => {
     DEMO: '试听',
     SNAP: "临时班",
     PRACTICE: '网管课',
-    HIGH_ONLINE: '乐团网管课'
+    HIGH_ONLINE: '线上基础技能课',
+    MUSIC_NETWORK: '乐团网管课'
   }
   return template[value]
 })

src/views/resetTeaming/components/resetPayList.vue

@@ -0,0 +1,80 @@
+<!--  -->
+<template>
+
+  <div class="m-core">
+    <el-form :inline="true"
+             :model="searchForm">
+      <el-form-item>
+        <el-input v-model.trim="searchForm.search"
+                  @keyup.enter.native="search"
+                  placeholder></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="tableWrap">
+      <el-table style="width: 100%"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                :data="tableList">
+        <el-table-column align="center"
+                         prop="studentId"
+                         label="分部"></el-table-column>
+      </el-table>
+      <pagination :total="rules.total"
+                  :page.sync="rules.page"
+                  :limit.sync="rules.limit"
+                  :page-sizes="rules.page_size"
+                  @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
+
+export default {
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        search: null
+      },
+      teacherList: [],
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      isInit: false
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created () { },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {
+    // 获取分部
+
+    this.init();
+
+
+  },
+  activated () {
+    this.init();
+  },
+  methods: {
+    init () {
+      this.isInit = true;
+      this.isInit = false;
+    },
+    getList () { }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

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

@@ -106,7 +106,7 @@ export default {
         { label: "单技课", value: "SINGLE" },
         { label: "合奏课", value: "MIX" },
         { label: "基础技能课", value: "HIGH" },
-        { label: "乐团网管课", value: "HIGH_ONLINE" },
+        { label: "线上基础技能课", value: "HIGH_ONLINE" },
         { label: "综合课", value: "COMPREHENSIVE" },
         { label: "集训单技课", value: "TRAINING_SINGLE" },
         { label: "集训合奏课", value: "TRAINING_MIX" },

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

@@ -660,7 +660,7 @@ export default {
         { value: "NORMAL", label: "单技班" },
         { value: "MIX", label: "合奏班" },
         { value: "HIGH", label: "基础技能班" },
-        { value: "HIGH_ONLINE", label: "乐团网管课" }
+        { value: "HIGH_ONLINE", label: "线上基础技能课" }
       ],
       rules: {
         // 分页规则
@@ -1090,7 +1090,7 @@ export default {
         }
         case "HIGH_ONLINE": {
           this.courseTypeList = [
-            { value: "HIGH_ONLINE", label: "乐团网管课" }
+            { value: "HIGH_ONLINE", label: "线上基础技能课" }
           ];
           break;
         }

src/views/teamDetail/componentCourse/courseList.vue

@@ -23,7 +23,7 @@
                      value="TRAINING_SINGLE"></el-option>
           <el-option label="单技课"
                      value="SINGLE"></el-option>
-          <el-option label="乐团网管课"
+          <el-option label="线上基础技能课"
                      value="HIGH_ONLINE"></el-option>
         </el-select>
       </el-form-item>