lex-xin %!s(int64=4) %!d(string=hai) anos
pai
achega
1242a587a5

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-0ab096c2.21e2ebdf.css


+ 1 - 0
dist/static/css/chunk-15538ba0.b489899f.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-09a71c9b]{line-height:44px}.fixedBox[data-v-09a71c9b]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-09a71c9b]{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}.fixedBox .boxWrap i[data-v-09a71c9b]{font-size:18px;cursor:pointer}[data-v-09a71c9b] .el-divider--horizontal{margin:0!important}.topWrap[data-v-09a71c9b]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-09a71c9b]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

+ 1 - 1
dist/static/css/chunk-5d0da7dc.e21876a4.css

@@ -1 +1 @@
-[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-14d3870f]{line-height:44px}.fixedBox[data-v-14d3870f]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-14d3870f]{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}.fixedBox .boxWrap i[data-v-14d3870f]{font-size:18px;cursor:pointer}[data-v-14d3870f] .el-divider--horizontal{margin:0!important}.topWrap[data-v-14d3870f]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-14d3870f]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-09a71c9b]{line-height:44px}.fixedBox[data-v-09a71c9b]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-09a71c9b]{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}.fixedBox .boxWrap i[data-v-09a71c9b]{font-size:18px;cursor:pointer}[data-v-09a71c9b] .el-divider--horizontal{margin:0!important}.topWrap[data-v-09a71c9b]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-09a71c9b]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/chunk-614c3733.f709b103.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.1f91f2ba.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.c8810f44.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-15538ba0.5b4fca40.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-614c3733.d213eee2.js


+ 85 - 83
src/views/teamDetail/componentClass/classCompound.vue

@@ -15,77 +15,82 @@
             <el-divider></el-divider>
           </div>
           <div class="topWrap">
-             <el-select
-            placeholder="请选择主班"
-            v-model="radio"
-            clearable
-            @change="changeMasterClass"
-          >
-            <el-option
-              v-for="(item, index) in dataList"
-              :label="item.name"
-              :value="item.id"
-              :key="index"
-            ></el-option>
-          </el-select>
-             <el-button type="text" style="float: right" @click="clearCom"
-            >清空列表</el-button
-          >
+            <el-select
+              placeholder="请选择主班"
+              v-model="radio"
+              clearable
+              @change="changeMasterClass"
+            >
+              <el-option
+                v-for="(item, index) in dataList"
+                :label="item.name"
+                :value="item.id"
+                :key="index"
+              >
+                <span style="float: left">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  String(item.id)
+                }}</span>
+              </el-option>
+            </el-select>
+            <el-button type="text" style="float: right" @click="clearCom"
+              >清空列表</el-button
+            >
           </div>
 
           <div>
             <!-- <el-radio-group v-model="radio" @change="changeMasterClass"> -->
-              <el-table
-                :data="dataList"
-                height="300px"
-                :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+            <el-table
+              :data="dataList"
+              height="300px"
+              :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+            >
+              <el-table-column align="center" label="班级编号" width="110">
+                <template slot-scope="scope">
+                  {{ scope.row.id }}
+                  <!-- <el-radio :label="scope.row.id"></el-radio> -->
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                width="180px"
+                label="班级名称"
+                prop="name"
+              ></el-table-column>
+              <el-table-column align="center" label="班级类型">
+                <template slot-scope="scope">
+                  <div>{{ scope.row.type | classType }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                width="180px"
+                prop="teacherName"
+                label="已选学生数"
               >
-                <el-table-column align="center" label="班级编号" width="110">
-                  <template slot-scope="scope">
-                    {{scope.row.id}}
-                    <!-- <el-radio :label="scope.row.id"></el-radio> -->
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  width="180px"
-                  label="班级名称"
-                  prop="name"
-                ></el-table-column>
-                <el-table-column align="center" label="班级类型">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.type | classType }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  width="180px"
-                  prop="teacherName"
-                  label="已选学生数"
-                >
-                  <!--    -->
-                  <template slot-scope="scope">
-                    <div>
-                      {{
-                        scope.row.studentList ? scope.row.studentList.length : 0
-                      }}
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="操作" width="200px">
-                  <template slot-scope="scope">
-                    <el-button type="text" @click="cancleCom(scope.row)"
-                      >取消</el-button
-                    >
-                    <el-button
-                      type="text"
-                      @click="showStudentList(scope.row)"
-                      :disabled="scope.row.id == radio"
-                      >添加学生</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
+                <!--    -->
+                <template slot-scope="scope">
+                  <div>
+                    {{
+                      scope.row.studentList ? scope.row.studentList.length : 0
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作" width="200px">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="cancleCom(scope.row)"
+                    >取消</el-button
+                  >
+                  <el-button
+                    type="text"
+                    @click="showStudentList(scope.row)"
+                    :disabled="scope.row.id == radio"
+                    >添加学生</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
             <!-- </el-radio-group> -->
           </div>
           <el-button
@@ -131,20 +136,18 @@
       masterClassGroupId:'',
       classGroupStudents:[] -->
       <calenderStudentList
-      ref='calenderStudentList'
+        ref="calenderStudentList"
         v-if="calenderStudentVisible"
         :classList="dataList"
         :studentIds="studentIds"
         :masterClassGroupId="masterClassGroupId"
         :classGroupStudents="classGroupStudents"
         :mergeInfo="mergeInfo"
-        @refresh='refresh'
+        @refresh="refresh"
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="calenderStudentVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitInfo"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitInfo">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -181,14 +184,13 @@ export default {
   },
   methods: {
     cancleCom(row) {
-      if(row.id== this.radio){
-        this.radio = ''
+      if (row.id == this.radio) {
+        this.radio = "";
       }
       this.$emit("cancleCompound", row);
     },
     clearCom() {
       this.$emit("clearCom");
-
     },
     async submitClass() {
       if (!this.radio) {
@@ -212,7 +214,7 @@ export default {
           flag = true;
         }
 
-        if (com.id != this.radio&&com.studentList?.length>0) {
+        if (com.id != this.radio && com.studentList?.length > 0) {
           this.classGroupStudents.push({
             [com.id]: com.studentList.map((stu) => stu.userId).join(","),
           });
@@ -250,12 +252,12 @@ export default {
       // 试着请求
     },
     getList() {
-       this.$emit("getList");
+      this.$emit("getList");
     },
-    refresh(){
+    refresh() {
       this.calenderStudentVisible = false;
-      this.clearCom()
-      this.getList()
+      this.clearCom();
+      this.getList();
     },
     closeReset() {
       this.clearCom();
@@ -293,9 +295,9 @@ export default {
         }
       });
     },
-    submitInfo(){
-      this.$refs.calenderStudentList.submit()
-    }
+    submitInfo() {
+      this.$refs.calenderStudentList.submit();
+    },
   },
   watch: {
     compoundList(val) {
@@ -346,7 +348,7 @@ export default {
 /deep/.el-divider--horizontal {
   margin: 0 !important;
 }
-.topWrap{
+.topWrap {
   margin: 10px 0;
   padding: 0 20px 0 0;
 }

+ 5 - 4
src/views/teamDetail/componentCourse/compoundClass.vue

@@ -25,6 +25,10 @@
                 :value="item.id"
                 :label="item.name"
               >
+                <span style="float: left">{{ item.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  String(item.id)
+                }}</span>
               </el-option>
             </el-select>
           </el-form-item>
@@ -80,10 +84,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="助教老师"
-            prop="assistant"
-          >
+          <el-form-item label="助教老师" prop="assistant">
             <!-- :multiple="true" -->
             <remote-search
               :commit="'setTeachers'"

+ 57 - 25
src/views/teamDetail/teamClassList.vue

@@ -3,7 +3,12 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      班级列表 <filter-search :keys="['lessThenThreeHighOnline']" @reload="getList" :moreKeys="['organId']"/>
+      班级列表
+      <filter-search
+        :keys="['lessThenThreeHighOnline']"
+        @reload="getList"
+        :moreKeys="['organId']"
+      />
     </h2>
     <div class="m-core">
       <save-form
@@ -42,7 +47,11 @@
         <el-form-item>
           <el-select
             v-model.trim="searchForm.groupType"
-            @change="()=>{searchForm.type=''}"
+            @change="
+              () => {
+                searchForm.type = '';
+              }
+            "
             filterable
             placeholder="课程组类型"
           >
@@ -60,7 +69,7 @@
             v-model.trim="searchForm.type"
             filterable
             clearable
-            :disabled='searchForm.groupType!="MUSIC"'
+            :disabled="searchForm.groupType != 'MUSIC'"
             placeholder="班级类型"
           >
             <el-option
@@ -74,7 +83,12 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
-          <el-button  type="primary"   v-permission="'export/classGroup'"  @click='exportClassGroup'>导出</el-button>
+          <el-button
+            type="primary"
+            v-permission="'export/classGroup'"
+            @click="exportClassGroup"
+            >导出</el-button
+          >
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -83,11 +97,20 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
         >
-          <el-table-column align="center" prop="musicGroupId" label="乐团&课程组编号">
+          <el-table-column
+            align="center"
+            prop="musicGroupId"
+            label="乐团&课程组编号"
+          >
             <template slot-scope="scope">
               <copy-text>{{ scope.row.musicGroupId }}</copy-text>
             </template>
           </el-table-column>
+          <!-- <el-table-column align="center" prop="musicGroupId" label="课程编号">
+            <template slot-scope="scope">
+              <copy-text>{{ scope.row.id }}</copy-text>
+            </template>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="musicGroupName"
@@ -153,7 +176,12 @@
               <div>{{ scope.row.totalClassTimes }}</div>
             </template>
           </el-table-column>
-          <el-table-column fixed="right" width="160px" align="center" label="操作">
+          <el-table-column
+            fixed="right"
+            width="160px"
+            align="center"
+            label="操作"
+          >
             <!--    -->
             <template slot-scope="scope">
               <el-button
@@ -161,7 +189,7 @@
                 @click="addCompound(scope.row)"
                 v-if="
                   scope.row.type != 'MUSIC_NETWORK' &&
-                   scope.row.groupType== 'MUSIC'&&
+                  scope.row.groupType == 'MUSIC' &&
                   !isAddCom(scope.row) &&
                   permission('classGroup/spanGroupMergeClassSplitClassAffirm')
                 "
@@ -182,9 +210,9 @@
                   permission('classGroup/delSingle?page=teamCLassList') &&
                   scope.row.groupType === 'MUSIC' &&
                   (scope.row.studentNum == '0' ||
-                  scope.row.totalClassTimes == '0')
+                    scope.row.totalClassTimes == '0')
                 "
-                  @click="removeClass(scope)"
+                @click="removeClass(scope)"
                 >删除</el-button
               >
             </template>
@@ -221,7 +249,7 @@ import { getClassGroupPage, removeSingleClass } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
 import classCompound from "./componentClass/classCompound";
 import { Export } from "@/utils/downLoadFile";
-import qs from 'qs'
+import qs from "qs";
 export default {
   components: { pagination, classCompound },
   data() {
@@ -251,12 +279,12 @@ export default {
   created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
-    const { query } = this.$route
+    const { query } = this.$route;
     if (query.type) {
-      this.searchForm.type = query.type
+      this.searchForm.type = query.type;
     }
     if (query.organId) {
-      this.searchForm.organIdList = [Number(query.organId)]
+      this.searchForm.organIdList = [Number(query.organId)];
     }
     // 获取分部
     this.$store.dispatch("setBranchs");
@@ -289,17 +317,17 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
-      this.searchForm.groupType = 'MUSIC'
+      this.searchForm.groupType = "MUSIC";
       this.search();
     },
     async removeClass(scope) {
       try {
-        await this.$confirm('是否确定删除该班级?', '提示', {
-          type: 'warning'
-        })
-        await removeSingleClass({ classGroupId: scope.row.id })
-        this.$message.success('删除成功')
-        this.getList()
+        await this.$confirm("是否确定删除该班级?", "提示", {
+          type: "warning",
+        });
+        await removeSingleClass({ classGroupId: scope.row.id });
+        this.$message.success("删除成功");
+        this.getList();
       } catch (error) {}
     },
     addCompound(row) {
@@ -363,18 +391,22 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
-    exportClassGroup(){
-        let params = this.searchForm;
+    exportClassGroup() {
+      let params = this.searchForm;
       Export(
         this,
         {
-            method: 'post',
+          method: "post",
           url: "/api-web/export/classGroup",
-           params:qs.stringify({...params, organIdList: this.searchForm.organIdList.join(","), lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,})
+          params: qs.stringify({
+            ...params,
+            organIdList: this.searchForm.organIdList.join(","),
+            lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,
+          }),
         },
         "是否确认导出报表?"
       );
-    }
+    },
   },
 };
 </script>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio