Merge branch '07/06musicArchives' of http://git.dayaedu.com/yonge/dy-admin-manager into 07/06musicArchives

src/views/photo-detail/index.vue

@@ -29,7 +29,7 @@
         </div>
       </el-alert>
       <el-checkbox-group v-model="checked">
-        <draggable :list="list" :disabled="!editing" style="display: flex;">
+        <draggable :list="list" :disabled="!editing" style="display: flex;flex-wrap: wrap;">
           <div
             v-for="(item) in list"
             :key="item.url"
@@ -126,7 +126,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.$route)
     this.FetchList()
   },
   methods: {
@@ -267,16 +266,16 @@ export default {
   padding: 0 15px;
 }
 .ctrl-bar-view{
-  opacity: 0;
-  visibility: hidden;
+  // opacity: 0;
+  // visibility: hidden;
   transition: all .3s;
 }
-.img-container:hover{
-  .ctrl-bar-view{
-    opacity: 1;
-    visibility: visible;
-  }
-}
+// .img-container:hover{
+//   .ctrl-bar-view{
+//     opacity: 1;
+//     visibility: visible;
+//   }
+// }
 .el-icon-view,
 .el-icon-picture-outline-round{
   font-size: 14px;

src/views/resetTeaming/components/archicesComponents/performance.vue

@@ -109,6 +109,7 @@
         <div class="name">{{item.name}}</div>
       </el-tooltip>
     </div>
+    <empty v-if="photos.length == 0"/>
     <el-dialog
       :title="detail ? '修改展演信息' : '添加展演信息'"
       :visible.sync="formVisible"
@@ -185,7 +186,8 @@ export default {
     async FetchList() {
       try {
         const res = await musicGroupPerformanceQueryPage({
-          page: this.rules.page
+          page: this.rules.page,
+          musicGroupId: this.$route.query.id,
         })
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;

src/views/resetTeaming/components/training-photos/index.vue

@@ -127,7 +127,12 @@ export default {
     },
     async setSort() {
       try {
-        await photoAlbumUpdate(this.list.map((item, index) => ({
+        const times = Object.values(this.times)
+        let list = []
+        for (const item of times) {
+          list = list.concat(item.list)
+        }
+        await photoAlbumUpdate(list.map((item, index) => ({
           ...item,
           order: index
         })))