mo 3 years ago
parent
commit
85f9b25172

+ 1 - 1
src/views/accompaniment/index.vue

@@ -233,7 +233,7 @@
     <el-dialog
     <el-dialog
       :title="title"
       :title="title"
       :visible.sync="visible"
       :visible.sync="visible"
-      width="700px"
+      width="740px"
       v-if="visible"
       v-if="visible"
     >
     >
       <submit-form
       <submit-form

+ 6 - 6
src/views/accompaniment/modals/form.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div>
   <div>
-    <el-form ref="form" :model="form" label-width="130px">
+    <el-form ref="form" :model="form" label-width="150px">
       <el-form-item
       <el-form-item
         prop="sysMusicScore.name"
         prop="sysMusicScore.name"
         label="曲名"
         label="曲名"
@@ -94,7 +94,7 @@
         <el-input placeholder="请输入排序" v-model="form.sysMusicScore.order" />
         <el-input placeholder="请输入排序" v-model="form.sysMusicScore.order" />
       </el-form-item>
       </el-form-item>
       <el-form-item
       <el-form-item
-        label="原音"
+        label="原音(不含节拍器)"
         prop="sysMusicScore.url"
         prop="sysMusicScore.url"
         :rules="[
         :rules="[
           {
           {
@@ -110,12 +110,12 @@
         />
         />
       </el-form-item>
       </el-form-item>
       <el-form-item
       <el-form-item
-        label="原音(节拍器)"
+        label="原音(节拍器)"
         prop="sysMusicScore.metronomeUrl"
         prop="sysMusicScore.metronomeUrl"
         :rules="[
         :rules="[
           {
           {
             required: form.isOpenMetronome ? true : false,
             required: form.isOpenMetronome ? true : false,
-            message: '原音(节拍器)',
+            message: '原音(节拍器)',
           },
           },
         ]"
         ]"
       >
       >
@@ -192,7 +192,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item
             <el-form-item
-              label="mp3文件"
+              label="伴奏(不含节拍器)"
               :prop="`sysMusicScoreAccompaniments.${index}.mp3Url`"
               :prop="`sysMusicScoreAccompaniments.${index}.mp3Url`"
             >
             >
               <singe-file-upload
               <singe-file-upload
@@ -204,7 +204,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item
             <el-form-item
-              label="mp3文件(节拍器)"
+              label="伴奏(含节拍器)"
               :prop="`sysMusicScoreAccompaniments.${index}.metronomeUrl`"
               :prop="`sysMusicScoreAccompaniments.${index}.metronomeUrl`"
             >
             >
               <singe-file-upload
               <singe-file-upload

+ 13 - 8
src/views/teachManager/modals/addTeach.vue

@@ -226,11 +226,11 @@ export default {
       const children = parent.data.sysMusicScoreCategoriesList || parent.data;
       const children = parent.data.sysMusicScoreCategoriesList || parent.data;
 
 
       const index = children.findIndex((d) => {
       const index = children.findIndex((d) => {
-        this.form.delCategoriesIds.push(data.id)
-       return d.id === data.id;
+        this.form.delCategoriesIds.push(data.id);
+        return d.id === data.id;
       });
       });
       children.splice(index, 1);
       children.splice(index, 1);
-      this.form.delCategoriesIds=[... new Set(this.form.delCategoriesIds)]
+      this.form.delCategoriesIds = [...new Set(this.form.delCategoriesIds)];
     },
     },
     editItem(data) {
     editItem(data) {
       this.$prompt("请输入修改的教材曲目名称", "提示", {
       this.$prompt("请输入修改的教材曲目名称", "提示", {
@@ -268,11 +268,11 @@ export default {
     addSubmit() {
     addSubmit() {
       this.$refs.form.validate(async (flag) => {
       this.$refs.form.validate(async (flag) => {
         if (flag) {
         if (flag) {
-          let { organId,delCategoriesIds, ...rest } = this.form;
+          let { organId, delCategoriesIds, ...rest } = this.form;
           let obj = {
           let obj = {
             ...rest,
             ...rest,
             organId: organId.join(","),
             organId: organId.join(","),
-            delCategoriesIds:delCategoriesIds.join(',')
+            delCategoriesIds: delCategoriesIds.join(","),
           };
           };
           try {
           try {
             if (this.activeRow?.id) {
             if (this.activeRow?.id) {
@@ -297,11 +297,16 @@ export default {
       this.$refs.uploadImg.$refs.upload.submit();
       this.$refs.uploadImg.$refs.upload.submit();
     },
     },
     allowDrop(draggingNode, dropNode, type) {
     allowDrop(draggingNode, dropNode, type) {
-      if (dropNode.level == 1) {
-        return true;
+      let flag = true
+      // console.log(type, dropNode, draggingNode);
+      if (draggingNode.childNodes.length > 0 && type == "inner") {
+        flag = false;
       } else {
       } else {
-        return false;
+        if (dropNode.level != 1) {
+         flag = false;
+        }
       }
       }
+      return flag
     },
     },
   },
   },
   computed: {},
   computed: {},