mo 4 年之前
父節點
當前提交
acf7811415

文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


文件差異過大導致無法顯示
+ 1 - 0
dist/static/css/chunk-0d6166b6.818dec56.css


+ 5 - 1
dist/static/css/chunk-235c3a5e.d702ff33.css

@@ -1 +1,5 @@
-.btns[data-v-58fe83c2]{text-align:right}.files[data-v-58fe83c2]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-58fe83c2]{position:absolute;right:20px;bottom:10px}.remark[data-v-70bd8f06]{display:inline;overflow:hidden;white-space:pre}
+<<<<<<< HEAD:dist/static/css/chunk-235c3a5e.d702ff33.css
+.btns[data-v-58fe83c2]{text-align:right}.files[data-v-58fe83c2]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-58fe83c2]{position:absolute;right:20px;bottom:10px}.remark[data-v-70bd8f06]{display:inline;overflow:hidden;white-space:pre}
+=======
+.btns[data-v-34185f26]{text-align:right}.files[data-v-34185f26]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-34185f26]{position:absolute;right:20px;bottom:10px}.remark[data-v-70bd8f06]{display:inline;overflow:hidden;white-space:pre}
+>>>>>>> master:dist/static/css/chunk-4d0948bc.5e8f1b84.css

文件差異過大導致無法顯示
+ 1 - 0
dist/static/css/chunk-3cc499b9.d6e3fc4d.css


+ 5 - 0
dist/static/css/chunk-4d0948bc.5e8f1b84.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-235c3a5e.d702ff33.css
+.btns[data-v-58fe83c2]{text-align:right}.files[data-v-58fe83c2]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-58fe83c2]{position:absolute;right:20px;bottom:10px}.remark[data-v-70bd8f06]{display:inline;overflow:hidden;white-space:pre}
+=======
+.btns[data-v-34185f26]{text-align:right}.files[data-v-34185f26]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-34185f26]{position:absolute;right:20px;bottom:10px}.remark[data-v-70bd8f06]{display:inline;overflow:hidden;white-space:pre}
+>>>>>>> master:dist/static/css/chunk-4d0948bc.5e8f1b84.css

文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/chunk-5ddab6e4.47accd94.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/chunk-76030ac2.5accdb8e.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/css/chunk-f5c9e59e.31caa19f.css


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.d0e6ccdb.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-0d6166b6.baffc74c.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-1c72db0f.fd211460.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-3cc499b9.b1c025dd.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-4d0948bc.903fa261.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-f5c9e59e.49b9f50d.js


+ 29 - 1
src/views/accompaniment/modals/form.vue

@@ -74,6 +74,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item
+              :prop="`sysMusicScoreAccompaniments.${index}.isShowFingering`"
+              label="指法展示"
+              :rules="[{required: true, message: '请选择是否展示指法'}]"
+            >
+              <el-select style="width: 100%!important;" v-model="song.isShowFingering" placeholder="请选择是否展示指法">
+                <el-option
+                  :value="true"
+                  label="是"
+                ></el-option>
+                <el-option
+                  :value="false"
+                  label="否"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              :prop="`sysMusicScoreAccompaniments.${index}.memo`"
+              label="描述"
+            >
+              <el-input placeholder="请输入描述" v-model="song.memo"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
               label="mp3文件"
               :prop="`sysMusicScoreAccompaniments.${index}.mp3Url`"
             >
@@ -127,7 +153,9 @@ export default {
             subjectId: '',
             speed: '',
             mp3Url: '',
-            xmlUrl: ''
+            xmlUrl: '',
+            isShowFingering: null,
+            mome: '',
           },
         ],
         delExamSongAccompanimentIds: []

+ 5 - 4
src/views/teamDetail/components/modals/select-student.vue

@@ -79,9 +79,9 @@
         </el-col>
         <!-- :offset="showName ? 4 : 0" -->
         <el-col :span="10" >
-          <el-form-item label="声部" style="margin-right: 0;" >
+          <el-form-item label="声部" style="margin-right: 0;" prop="sound"  :rules="(isOnlyChangeUser||activeType == 'MUSIC_NETWORK')?null:[{ required: true, message: '请选择声部',trigger: 'blur' }]">
             <el-select
-              v-model="sound"
+              v-model="form.sound"
               style="width: 100%"
               clearable
               multiple
@@ -142,8 +142,8 @@ export default {
     data() {
       return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
         .filter(item => {
-          if (this.sound.length) {
-            return this.sound.includes(item.actualSubjectId) || this.seleched.includes(item.userId)
+          if (this.form.sound.length) {
+            return this.form.sound.includes(item.actualSubjectId) || this.seleched.includes(item.userId)
           }
           return true
         })
@@ -170,6 +170,7 @@ export default {
         name: '',
         coreTeacher: '',
         assistant: '',
+         sound: []
       },
       seleched: [],
     };

+ 6 - 4
src/views/teamDetail/components/resetClass.vue

@@ -461,14 +461,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item 辜经理和焕焕狗要求不要可选声部
+        <!-- 恢复可报名声部 因为建班和加学生分开所以又要添加可报名声部(焕焕狗乱吠) -->
+        <el-form-item
           label="可报名声部"
           prop="memo"
           :rules="[
             { required: true, message: '请选择可报名声部', trigger: 'blur' },
           ]"
           v-if="
-            newClassForm.type == 'HIGH' || newClassForm.type == 'HIGH_ONLINE'
+            newClassForm.type == 'HIGH'
           "
         >
           <el-select
@@ -485,7 +486,7 @@
               :value="item.id"
             ></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item
           label="网络教室声部"
           prop="subjectId"
@@ -925,7 +926,7 @@ export default {
         name: data?.name,
         musicGroupId: this.teamid,
         subjectIdList:
-          data?.soundList.length > 0 ? data?.soundList.join(",") : null,
+          data?.sound.length > 0 ? data?.sound.join(",") : null,
         teacherMapperList: formatClassGroupTeacherMapperList(
           data.coreTeacher,
           data.assistant
@@ -934,6 +935,7 @@ export default {
       };
     },
     async submitClass(data) {
+
       const list = this.getSubmitData(data, { onlyCreateClassGroup: true });
       let obj = this.getClassDate(data);
       if (this.activeType == "MUSIC_NETWORK") {

部分文件因文件數量過多而無法顯示