瀏覽代碼

05/18 11:21

11
mo 5 年之前
父節點
當前提交
5b4970edcd
共有 50 個文件被更改,包括 100 次插入7 次删除
  1. 0 0
      dist/index.html
  2. 1 1
      dist/static/css/chunk-334b6795.e2ad8c2f.css
  3. 0 1
      dist/static/css/chunk-7cd8f6e1.8bd2ecde.css
  4. 1 0
      dist/static/css/chunk-93111822.e13a4b2b.css
  5. 0 0
      dist/static/css/chunk-ef9bb24a.44e6b19b.css
  6. 0 0
      dist/static/js/app.0c071873.js
  7. 0 0
      dist/static/js/app.25696d72.js
  8. 0 0
      dist/static/js/chunk-01894b84.2b30d819.js
  9. 0 0
      dist/static/js/chunk-01894b84.311989e0.js
  10. 0 0
      dist/static/js/chunk-09753c97.e487803a.js
  11. 0 0
      dist/static/js/chunk-09753c97.f1a0bd2b.js
  12. 0 0
      dist/static/js/chunk-257cc208.1198720f.js
  13. 0 0
      dist/static/js/chunk-257cc208.17e3ca96.js
  14. 0 0
      dist/static/js/chunk-283867d0.26408dcf.js
  15. 0 0
      dist/static/js/chunk-2d09c9d0.daad823c.js
  16. 0 0
      dist/static/js/chunk-2d09c9d0.f26258be.js
  17. 0 0
      dist/static/js/chunk-334b6795.9e5405d2.js
  18. 0 0
      dist/static/js/chunk-3e4fee58.0bfa5156.js
  19. 0 0
      dist/static/js/chunk-3e4fee58.35557185.js
  20. 0 0
      dist/static/js/chunk-40e665d1.0d7e338d.js
  21. 0 0
      dist/static/js/chunk-40e665d1.9d671a77.js
  22. 0 0
      dist/static/js/chunk-459dd303.f4b72218.js
  23. 0 0
      dist/static/js/chunk-4c9621a5.bc1b0b4b.js
  24. 0 0
      dist/static/js/chunk-4c9621a5.c2a402fd.js
  25. 0 0
      dist/static/js/chunk-4df36711.50387701.js
  26. 0 0
      dist/static/js/chunk-4df36711.5ac13f98.js
  27. 0 0
      dist/static/js/chunk-6181ddae.0571d163.js
  28. 0 0
      dist/static/js/chunk-6181ddae.f0f98f62.js
  29. 0 0
      dist/static/js/chunk-6cb6556b.ae95566c.js
  30. 0 0
      dist/static/js/chunk-6cb6556b.d7a056c4.js
  31. 0 0
      dist/static/js/chunk-7cd8f6e1.8d9d4452.js
  32. 0 0
      dist/static/js/chunk-93111822.78ef51e9.js
  33. 0 0
      dist/static/js/chunk-96db54d2.92a488aa.js
  34. 0 0
      dist/static/js/chunk-96db54d2.d2955e15.js
  35. 0 0
      dist/static/js/chunk-98ae4e4a.43ec78f9.js
  36. 0 0
      dist/static/js/chunk-98ae4e4a.52b92556.js
  37. 0 0
      dist/static/js/chunk-ac13cdcc.05502a1b.js
  38. 0 0
      dist/static/js/chunk-ac13cdcc.b02e7001.js
  39. 0 0
      dist/static/js/chunk-bc672cf4.12b7a901.js
  40. 0 0
      dist/static/js/chunk-bc672cf4.d0a8c657.js
  41. 0 0
      dist/static/js/chunk-bdad1ada.4d6c041d.js
  42. 0 0
      dist/static/js/chunk-bdad1ada.96d36cf6.js
  43. 0 0
      dist/static/js/chunk-edcf4054.02318d3c.js
  44. 0 0
      dist/static/js/chunk-edcf4054.154aaf39.js
  45. 0 0
      dist/static/js/chunk-ef9bb24a.bbe78ae3.js
  46. 3 4
      src/templateList.vue
  47. 1 0
      src/utils/searchArray.js
  48. 2 1
      src/utils/vueFilter.js
  49. 80 0
      src/views/resetTeaming/components/resetPayList.vue
  50. 12 0
      src/views/teamDetail/components/resetClass.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
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}

+ 0 - 1
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}

+ 1 - 0
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}

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-ef9bb24a.44e6b19b.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0c071873.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.25696d72.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-01894b84.2b30d819.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-01894b84.311989e0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-09753c97.e487803a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-09753c97.f1a0bd2b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-257cc208.1198720f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-257cc208.17e3ca96.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-283867d0.26408dcf.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2d09c9d0.daad823c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2d09c9d0.f26258be.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-334b6795.9e5405d2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3e4fee58.0bfa5156.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3e4fee58.35557185.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-40e665d1.0d7e338d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-40e665d1.9d671a77.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-459dd303.f4b72218.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4c9621a5.bc1b0b4b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4c9621a5.c2a402fd.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4df36711.50387701.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4df36711.5ac13f98.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6181ddae.0571d163.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6181ddae.f0f98f62.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6cb6556b.ae95566c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6cb6556b.d7a056c4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7cd8f6e1.8d9d4452.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-93111822.78ef51e9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-96db54d2.92a488aa.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-96db54d2.d2955e15.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-98ae4e4a.43ec78f9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-98ae4e4a.52b92556.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ac13cdcc.05502a1b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ac13cdcc.b02e7001.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bc672cf4.12b7a901.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bc672cf4.d0a8c657.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bdad1ada.4d6c041d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bdad1ada.96d36cf6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-edcf4054.02318d3c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-edcf4054.154aaf39.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ef9bb24a.bbe78ae3.js


+ 3 - 4
src/templateList.vue

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

+ 1 - 0
src/utils/searchArray.js

@@ -10,6 +10,7 @@ const courseType = [
   { label: "试听课", value: "DEMO" },
   { label: "试听课", value: "DEMO" },
   { label: "综合课", value: "COMPREHENSIVE" },
   { label: "综合课", value: "COMPREHENSIVE" },
   { label: "网管课", value: "PRACTICE" },
   { label: "网管课", value: "PRACTICE" },
+  { label: "乐团网管课", value: "MUSIC_NETWORK" },
   { label: "启蒙课", value: "ENLIGHTENMENT" },
   { label: "启蒙课", value: "ENLIGHTENMENT" },
   { label: "集训单技课", value: "TRAINING_SINGLE" },
   { label: "集训单技课", value: "TRAINING_SINGLE" },
   { label: "集训合奏课", value: "TRAINING_MIX" },
   { label: "集训合奏课", value: "TRAINING_MIX" },

+ 2 - 1
src/utils/vueFilter.js

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

+ 80 - 0
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>

+ 12 - 0
src/views/teamDetail/components/resetClass.vue

@@ -1421,6 +1421,18 @@ export default {
   watch: {
   watch: {
     infoVisible (val) {
     infoVisible (val) {
       if (!val) {
       if (!val) {
+        this.teacherForm = {
+          isAdd: null,
+          coreTeacher: "",
+          assistant: [],
+          courseType: "",
+          courseTime: "",
+          checked: false,
+          courseNum: "",
+          mixClassGroupId: "",
+          sound: "",
+          expectStudentNum: ""
+        }
         this.$refs["teacherForm"].resetFields();
         this.$refs["teacherForm"].resetFields();
         this.weekList = [];
         this.weekList = [];
       }
       }

Some files were not shown because too many files changed in this diff