节目编排

src/main/java/com/izouma/wenlvju/domain/performance/Arrange.java

@@ -0,0 +1,56 @@
+package com.izouma.wenlvju.domain.performance;
+
+import com.izouma.wenlvju.converter.LongArrayConverter;
+import com.izouma.wenlvju.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "节目分组")
+public class Arrange extends BaseEntity {
+    private Long performanceId;
+
+    @ApiModelProperty(value = "活动地点")
+    private String address;
+
+    @ApiModelProperty(value = "活动日期")
+    private LocalDate date;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime startTime;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime endTime;
+
+    @Convert(converter = LongArrayConverter.class)
+    private List<Long> specialtyId;
+
+    @ApiModelProperty(value = "单个节目时长")
+    private int duration;
+
+    @ApiModelProperty(value = "节目数量")
+    private int quantity;
+
+    @ApiModelProperty(value = "编导姓名")
+    private String writerDirector;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+}

src/main/java/com/izouma/wenlvju/domain/performance/Performance.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Column;
 import javax.persistence.Convert;
@@ -22,6 +23,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Entity
+@Where(clause = "del = 0")
 @ApiModel(value = "展演管理")
 public class Performance extends BaseEntity {
     @ApiModelProperty(value = "名称")

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -1,9 +1,11 @@
 package com.izouma.wenlvju.domain.performance;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.converter.VideoObjectConverter;
 import com.izouma.wenlvju.domain.BaseEntity;
 import com.izouma.wenlvju.domain.VideoObject;
+import com.izouma.wenlvju.dto.ProgrammeDTO;
 import com.izouma.wenlvju.enums.CompetitionGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +16,6 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
-import java.util.Map;
 
 @Data
 @AllArgsConstructor
@@ -67,4 +68,8 @@ public class Programme extends BaseEntity {
     @ApiModelProperty(value = "节目视频")
     private VideoObject video;
 
+    public Programme(ProgrammeDTO dto) {
+        BeanUtil.copyProperties(dto, this);
+    }
+
 }

src/main/java/com/izouma/wenlvju/dto/ArrangeDTO.java

@@ -0,0 +1,44 @@
+package com.izouma.wenlvju.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+@Data
+public class ArrangeDTO {
+    private Long performanceId;
+
+    private String address;
+
+    @ApiModelProperty(value = "活动日期")
+    private LocalDate startDate;
+
+    private LocalDate endDate;
+
+    private boolean morning;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime morningStartTime;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime morningEndTime;
+
+    private boolean afternoon;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime afternoonStartTime;
+
+    @ApiModelProperty(value = "时间安排")
+    private LocalTime afternoonEndTime;
+
+    @ApiModelProperty(value = "节目时长")
+    private int duration;
+
+    @ApiModelProperty(value = "分组节目数量")
+    private int quantity;
+
+    private List<Long> specialtyId;
+}

src/main/java/com/izouma/wenlvju/dto/ProgrammeDTO.java

@@ -23,23 +23,17 @@ import javax.persistence.Enumerated;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel(value = "节目安排")
+@ApiModel(value = "Programme")
 public class ProgrammeDTO extends BaseRowModel {
     @ExcelIgnore
     private Long id;
 
-    @ExcelIgnore
-    private Long performanceId;
-
     @ExcelProperty(value = "活动名称")
-    private String performanceName;
+    private String performance;
 
     @ExcelProperty(value = "节目名称")
     private String name;
 
-    @ExcelIgnore
-    private Long specialtyId;
-
     @ExcelProperty(value = "参赛专业")
     private String specialty;
 
@@ -51,9 +45,6 @@ public class ProgrammeDTO extends BaseRowModel {
     @ApiModelProperty(value = "参赛组别")
     private CompetitionGroup competitionGroup;
 
-    @ExcelIgnore
-    private Long levelSettingId;
-
     @ExcelProperty(value = "参赛级别")
     private String level;
 
@@ -69,15 +60,9 @@ public class ProgrammeDTO extends BaseRowModel {
     @ExcelProperty(value = "联系电话")
     private String phone;
 
-    @ExcelIgnore
-    private Long gradingOrganizationId;
-
     @ExcelProperty(value = "考级机构")
     private String gradingOrganization;
 
-    @ExcelIgnore
-    private Long organizationId;
-
     @ExcelProperty(value = "承办单位")
     private String organization;
 
@@ -90,6 +75,18 @@ public class ProgrammeDTO extends BaseRowModel {
     @ExcelProperty(value = "参赛人数")
     private long quantity;
 
+//    @ExcelProperty(value = "参赛人员姓名")
+//    private String participantName;
+//
+//    @ExcelProperty(value = "参赛人员性别")
+//    private String participantSex;
+//
+//    @ExcelProperty(value = "参赛人员出生年月")
+//    private LocalDate participantBirthday;
+//
+//    @ExcelProperty(value = "参赛人员联系方式")
+//    private String participantPhone;
+
     public ProgrammeDTO(Programme programme) {
         BeanUtil.copyProperties(programme, this);
     }

src/main/java/com/izouma/wenlvju/repo/ArtTypeRepo.java

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface ArtTypeRepo extends JpaRepository<ArtType, Long>, JpaSpecificationExecutor<ArtType> {
     @Query("update ArtType t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<ArtType> findAllByParentIsNull();
 }

src/main/java/com/izouma/wenlvju/repo/performance/ArrangeRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo.performance;
+
+import com.izouma.wenlvju.domain.performance.Arrange;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ArrangeRepo extends JpaRepository<Arrange, Long>, JpaSpecificationExecutor<Arrange> {
+    @Query("update Arrange t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/service/performance/ArrangeService.java

@@ -0,0 +1,76 @@
+package com.izouma.wenlvju.service.performance;
+
+import com.izouma.wenlvju.domain.performance.Arrange;
+import com.izouma.wenlvju.dto.ArrangeDTO;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.performance.ArrangeRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.Period;
+
+@Service
+@AllArgsConstructor
+public class ArrangeService {
+
+    private ArrangeRepo arrangeRepo;
+
+    public Page<Arrange> all(PageQuery pageQuery) {
+        return arrangeRepo.findAll(JpaUtils.toSpecification(pageQuery, Arrange.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    /*
+    分组
+     */
+    public void group(ArrangeDTO dto) {
+        long total = 0;
+        int days = Period.between(dto.getStartDate(), dto.getEndDate()).getDays();
+        for (int i = 0; i <= days; i++) {
+            if (dto.isMorning()) {
+                total += Duration.between(dto.getMorningStartTime(), dto.getMorningEndTime()).toMinutes();
+            }
+            if (dto.isAfternoon()) {
+                total += Duration.between(dto.getAfternoonStartTime(), dto.getAfternoonEndTime()).toMinutes();
+            }
+        }
+
+        int time = dto.getQuantity() * dto.getDuration();
+        // 分组数量 = 总时长/节目数量*单个节目时长+10
+        int group = (int) Math.ceil((double) total / (time + 10));
+
+        LocalDate date = dto.getStartDate();
+        LocalTime startTime = dto.getMorningStartTime();
+        for (int i = 0; i < group; i++) {
+            LocalTime endTime = startTime.plusMinutes(time);
+//            if (!endTime.isBefore(dto.getMorningEndTime())) {
+//                if (Duration.between(dto.getMorningEndTime(), endTime).toMinutes() > dto.getDuration()) {
+//
+//                }
+//            }
+            Arrange arrange = Arrange.builder()
+                    .address(dto.getAddress())
+                    .duration(dto.getDuration())
+                    .performanceId(dto.getPerformanceId())
+                    .quantity(dto.getQuantity())
+                    .date(date)
+                    .startTime(startTime)
+                    .endTime(endTime)
+                    .duration(dto.getDuration())
+                    .build();
+            arrangeRepo.save(arrange);
+
+            startTime = endTime.plusMinutes(10);
+            if (startTime.isAfter(dto.getMorningEndTime()) && startTime.isBefore(dto.getAfternoonStartTime())) {
+                startTime = dto.getAfternoonStartTime();
+            } else if (startTime.isAfter(dto.getAfternoonEndTime())) {
+                date = date.plusDays(1);
+                startTime = dto.getMorningStartTime();
+            }
+        }
+    }
+}

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -9,15 +9,18 @@ import com.izouma.wenlvju.domain.GradingOrganization;
 import com.izouma.wenlvju.domain.Organization;
 import com.izouma.wenlvju.domain.Setting;
 import com.izouma.wenlvju.domain.performance.Participant;
+import com.izouma.wenlvju.domain.performance.Performance;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.ProgrammeDTO;
+import com.izouma.wenlvju.enums.CompetitionGroup;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ArtTypeRepo;
 import com.izouma.wenlvju.repo.GradingOrganizationRepo;
 import com.izouma.wenlvju.repo.OrganizationRepo;
 import com.izouma.wenlvju.repo.SettingRepo;
 import com.izouma.wenlvju.repo.performance.ParticipantRepo;
+import com.izouma.wenlvju.repo.performance.PerformanceRepo;
 import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
 import com.izouma.wenlvju.service.ArtTypeService;
 import com.izouma.wenlvju.utils.JpaUtils;
@@ -48,6 +51,7 @@ public class ProgrammeService {
     private ArtTypeRepo             artTypeRepo;
     private SettingRepo             settingRepo;
     private ArtTypeService          artTypeService;
+    private PerformanceRepo         performanceRepo;
 
     public Page<Programme> all(PageQuery pageQuery) {
         return programmeRepo.findAll(JpaUtils.toSpecification(pageQuery, Programme.class), JpaUtils.toPageRequest(pageQuery));
@@ -86,6 +90,10 @@ public class ProgrammeService {
             settingIds.add(programme.getLevelSettingId());
         });
 
+        Map<Long, String> performanceMap = performanceRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(Performance::getId, Performance::getName));
+
         Map<Long, String> organizationMap = organizationRepo.findAll()
                 .stream()
                 .collect(Collectors.toMap(Organization::getId, Organization::getName));
@@ -103,22 +111,25 @@ public class ProgrammeService {
                 .collect(Collectors.groupingBy(Participant::getProgrammeId, Collectors.counting()));
         return all.map(programme -> {
             if (participantMap.containsKey(programme.getId())) {
-                return toDTO(programme, organizationMap.get(programme.getOrganizationId()),
+                return toDTO(programme, performanceMap.get(programme.getPerformanceId()),
+                        organizationMap.get(programme.getOrganizationId()),
                         gradingOrganizationMap.get(programme.getGradingOrganizationId()),
                         artTypeMap.get(programme.getSpecialtyId()),
                         settingMap.get(programme.getLevelSettingId()),
                         participantMap.get(programme.getId()));
             }
-            return toDTO(programme, organizationMap.get(programme.getOrganizationId()),
+            return toDTO(programme, performanceMap.get(programme.getPerformanceId()),
+                    organizationMap.get(programme.getOrganizationId()),
                     gradingOrganizationMap.get(programme.getGradingOrganizationId()),
                     artTypeMap.get(programme.getSpecialtyId()),
                     settingMap.get(programme.getLevelSettingId()), 0);
         });
     }
 
-    public ProgrammeDTO toDTO(Programme programme, String organization, String gradingOrganization, String artType,
+    public ProgrammeDTO toDTO(Programme programme, String performance, String organization, String gradingOrganization, String artType,
                               String setting, long participant) {
         ProgrammeDTO dto = new ProgrammeDTO(programme);
+        dto.setPerformance(performance);
         dto.setOrganization(organization);
         dto.setGradingOrganization(gradingOrganization);
         dto.setSpecialty(artType);
@@ -128,11 +139,12 @@ public class ProgrammeService {
     }
 
     public List<ProgrammeDTO> toDTOList(List<Programme> programmes) {
-        List<Long> ids = new ArrayList<>();
 
-        programmes.forEach(programme -> {
-            ids.add(programme.getId());
-        });
+        List<Long> ids = programmes.stream().map(Programme::getId).collect(Collectors.toList());
+
+        Map<Long, String> performanceMap = performanceRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(Performance::getId, Performance::getName));
 
         Map<Long, String> organizationMap = organizationRepo.findAll()
                 .stream()
@@ -153,13 +165,15 @@ public class ProgrammeService {
 
         return programmes.stream().map(programme -> {
             if (participantMap.containsKey(programme.getId())) {
-                return toDTO(programme, organizationMap.get(programme.getOrganizationId()),
+                return toDTO(programme, performanceMap.get(programme.getPerformanceId()),
+                        organizationMap.get(programme.getOrganizationId()),
                         gradingOrganizationMap.get(programme.getGradingOrganizationId()),
                         artTypeMap.get(programme.getSpecialtyId()),
                         settingMap.get(programme.getLevelSettingId()),
                         participantMap.get(programme.getId()));
             }
-            return toDTO(programme, organizationMap.get(programme.getOrganizationId()),
+            return toDTO(programme, performanceMap.get(programme.getPerformanceId()),
+                    organizationMap.get(programme.getOrganizationId()),
                     gradingOrganizationMap.get(programme.getGradingOrganizationId()),
                     artTypeMap.get(programme.getSpecialtyId()),
                     settingMap.get(programme.getLevelSettingId()), 0);
@@ -168,7 +182,7 @@ public class ProgrammeService {
 
     @Transactional(rollbackOn = Exception.class)
     public void upload(InputStream is, Long userId) throws IOException {
-        organizationRepo.findByUserId(userId).orElseThrow(new BusinessException("无记录"));
+        Organization organization = organizationRepo.findByUserId(userId).orElseThrow(new BusinessException("无记录"));
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -182,6 +196,39 @@ public class ProgrammeService {
         InputStream indicatorStream = new ByteArrayInputStream(baos.toByteArray());
         List<ProgrammeDTO> dtos = ExcelUtils.readExcel(indicatorStream, ProgrammeDTO.class, 1, 1);
 
-        settingRepo.findAllByFlagIn(CollUtil.newArrayList(3, 4));
+        Map<String, Long> performanceMap = performanceRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(Performance::getName, Performance::getId));
+
+        Map<Integer, Map<String, Long>> mapMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(3, 4))
+                .stream()
+                .collect(Collectors.groupingBy(Setting::getFlag, Collectors.toMap(Setting::getName, Setting::getId)));
+
+        Map<String, Long> gradeMap = gradingOrganizationRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(GradingOrganization::getName, GradingOrganization::getId));
+
+        Map<String, Long> artTypeMap = artTypeRepo.findAll()
+                .stream()
+                .collect(Collectors.toMap(ArtType::getName, ArtType::getId));
+
+
+        List<Programme> programmes = new ArrayList<>();
+        dtos.forEach(dto -> {
+            Programme programme = new Programme(dto);
+            programme.setOrganizationId(organization.getId());
+            programme.setGradingOrganizationId(gradeMap.get(dto.getGradingOrganization()));
+            programme.setPerformanceId(performanceMap.get(dto.getPerformance()));
+            programme.setSpecialtyId(artTypeMap.get(dto.getSpecialty()));
+            if (dto.getCompetitionGroup().equals(CompetitionGroup.SINGLE)) {
+                programme.setLevelSettingId(mapMap.get(3).get(dto.getLevel()));
+            } else if (dto.getCompetitionGroup().equals(CompetitionGroup.COLLECTIVE)) {
+                programme.setLevelSettingId(mapMap.get(4).get(dto.getLevel()));
+            }
+
+            programmes.add(programme);
+        });
+
+        programmeRepo.saveAll(programmes);
     }
 }

src/main/java/com/izouma/wenlvju/web/ArtTypeController.java

@@ -63,5 +63,10 @@ public class ArtTypeController extends BaseController {
         List<ArtType> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PostMapping("/parent")
+    public List<ArtType> parent() {
+        return artTypeRepo.findAllByParentIsNull();
+    }
 }
 

src/main/java/com/izouma/wenlvju/web/performance/ArrangeController.java

@@ -0,0 +1,69 @@
+package com.izouma.wenlvju.web.performance;
+
+import com.izouma.wenlvju.dto.ArrangeDTO;
+import com.izouma.wenlvju.web.BaseController;
+import com.izouma.wenlvju.domain.performance.Arrange;
+import com.izouma.wenlvju.service.performance.ArrangeService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.performance.ArrangeRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/arrange")
+@AllArgsConstructor
+public class ArrangeController extends BaseController {
+    private ArrangeService arrangeService;
+    private ArrangeRepo    arrangeRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Arrange save(@RequestBody Arrange record) {
+        if (record.getId() != null) {
+            Arrange orig = arrangeRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return arrangeRepo.save(orig);
+        }
+        return arrangeRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Arrange> all(@RequestBody PageQuery pageQuery) {
+        return arrangeService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Arrange get(@PathVariable Long id) {
+        return arrangeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        arrangeRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Arrange> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/group")
+    public void group(@RequestBody ArrangeDTO record) {
+        arrangeService.group(record);
+    }
+}
+

src/main/resources/genjson/Arrange.json

@@ -0,0 +1 @@
+{"tableName":"Arrange","className":"Arrange","remark":"节目编排","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"address","modelName":"address","remark":"活动地点","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"date","modelName":"date","remark":"活动日期","showInList":true,"showInForm":true,"formType":"date"},{"name":"startTime","modelName":"startTime","remark":"时间安排","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"endTime","modelName":"endTime","remark":"时间安排","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"specialtyId","modelName":"specialtyId","remark":"参赛专业","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"duration","modelName":"duration","remark":"节目时长","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"quantity","modelName":"quantity","remark":"节目数量","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"writerDirector","modelName":"writerDirector","remark":"编导姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"联系电话","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.performance.Arrange","genPackage":"performance"}

src/main/vue/src/router.js

@@ -671,6 +671,24 @@ const router = new Router({
                     meta: {
                         title: '参演人员'
                     }
+                },
+                {
+                    path: '/arrangeEdit',
+                    name: 'ArrangeEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "arrangeEdit" */ '@/views/performance/ArrangeEdit.vue'),
+                    meta: {
+                        title: '节目编排编辑'
+                    }
+                },
+                {
+                    path: '/arrangeList',
+                    name: 'ArrangeList',
+                    component: () =>
+                        import(/* webpackChunkName: "arrangeList" */ '@/views/performance/ArrangeList.vue'),
+                    meta: {
+                        title: '节目编排'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/performance/ArrangeEdit.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="address" label="活动地点">
+                <el-input type="textarea" :rows="2" v-model="formData.address" readonly class="width"></el-input>
+            </el-form-item>
+            <el-form-item prop="date" label="活动日期">
+                <el-date-picker
+                    v-model="formData.date"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    readonly
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="startTime" label="时间安排">
+                <el-time-picker
+                    readonly
+                    v-model="timeRange"
+                    value-format="HH:mm:ss"
+                    is-range
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="选择时间范围"
+                >
+                </el-time-picker>
+            </el-form-item>
+            <el-form-item prop="specialtyId" label="参赛专业">
+                <!-- <el-input v-model="formData.specialtyId" class="width"></el-input> -->
+            </el-form-item>
+            <el-form-item prop="duration" label="节目时长">
+                <el-input-number type="number" v-model="formData.duration" class="input1" disabled></el-input-number>
+            </el-form-item>
+            <el-form-item prop="quantity" label="节目数量">
+                <el-input-number type="number" v-model="formData.quantity" class="input1" disabled></el-input-number>
+            </el-form-item>
+            <el-form-item prop="securityOwner" label="编导姓名">
+                <el-input
+                    v-model="formData.writerDirector"
+                    suffix-icon="el-icon-user-solid"
+                    class="input1"
+                    placeholder="编导姓名"
+                ></el-input>
+            </el-form-item>
+            <el-form-item prop="securityOwnerPhone" label="联系电话">
+                <el-input
+                    v-model="formData.phone"
+                    suffix-icon="el-icon-phone"
+                    class="input1"
+                    placeholder="联系电话"
+                ></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ArrangeEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('arrange/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                    this.timeRange = [res.startTime, res.endTime];
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            timeRange: ''
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/arrange/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/arrange/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.width {
+    width: 350px;
+}
+/deep/.el-input.is-disabled .el-input__inner {
+    background-color: #ffffff;
+    color: #606266;
+}
+</style>

src/main/vue/src/views/performance/ArrangeList.vue

@@ -0,0 +1,406 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button> -->
+            <el-form :model="form" :rules="rules" ref="form" inline label-width="100px">
+                <el-form-item label="活动名称">
+                    <el-select
+                        v-model="form.performanceId"
+                        clearable
+                        filterable
+                        placeholder="活动名称"
+                        style="width: 100%"
+                    >
+                        <el-option
+                            v-for="item in performances"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary">查看活动分组情况</el-button>
+                    <el-button type="primary">查看未分组情况情况</el-button>
+                </el-form-item>
+                <el-form-item label="活动日期">
+                    <el-date-picker
+                        v-model="dateRange"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="活动地点">
+                    <el-select v-model="form.address">
+                        <el-option
+                            v-for="(item, index) in addresses"
+                            :key="index"
+                            :value="item"
+                            :label="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="时间安排">
+                    <el-checkbox v-model="form.morning">上午</el-checkbox>
+                    <el-time-picker
+                        v-model="timeRange"
+                        format="HH:mm"
+                        value-format="HH:mm:ss"
+                        is-range
+                        range-separator="至"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围"
+                    >
+                    </el-time-picker>
+                    <el-checkbox v-model="form.afternoon">下午</el-checkbox>
+                    <el-time-picker
+                        v-model="afterTimeRange"
+                        format="HH:mm"
+                        value-format="HH:mm:ss"
+                        is-range
+                        range-separator="至"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        placeholder="选择时间范围"
+                    >
+                    </el-time-picker>
+                </el-form-item>
+                <el-form-item label="分组节目数量">
+                    <el-input-number type="number" v-model="form.quantity"></el-input-number>
+                </el-form-item>
+                <el-form-item label="单个节目时长">
+                    <el-input-number type="number" v-model="form.duration"></el-input-number>
+                </el-form-item>
+                <el-form-item label="参赛专业">
+                    <el-select v-model="form.specialtyId" multiple>
+                        <el-option
+                            v-for="item in artTypes"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary">清空</el-button>
+                    <el-button type="primary" @click="group">节目分组</el-button>
+                    <el-button type="primary">发布分组安排</el-button>
+                    <el-button type="primary">导出分组安排</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
+            <el-table-column prop="address" label="活动地点"> </el-table-column>
+            <el-table-column prop="date" label="活动日期"> </el-table-column>
+            <el-table-column label="时间安排" min-width="100">
+                <template slot-scope="{ row }"> {{ row.startTime }}-{{ row.endTime }} </template>
+            </el-table-column>
+            <el-table-column prop="quantity" label="节目数量"> </el-table-column>
+            <!-- <el-table-column prop="duration" label="节目时长"> </el-table-column> -->
+            <el-table-column prop="specialtyId" label="参赛专业"> </el-table-column>
+            <el-table-column prop="writerDirector" label="编导姓名"> </el-table-column>
+            <el-table-column prop="phone" label="联系电话"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="320">
+                <template slot-scope="{ row, $index }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(row)" size="mini" plain>查看节目</el-button>
+                    <!-- <el-button @click="editRow(row)" type="warning" size="mini" plain>上移</el-button>
+                    <el-button @click="editRow(row)" type="warning" size="mini" plain>下移</el-button> -->
+
+                    <el-button @click="move($index, -1)" :disabled="$index == 0" type="success" size="mini" plain
+                        >上移</el-button
+                    >
+                    <el-button
+                        @click="move($index, 1)"
+                        :disabled="(page - 1) * pageSize + $index == totalElements - 1"
+                        type="warning"
+                        size="mini"
+                        plain
+                        >下移</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ArrangeList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/arrange/all',
+            downloading: false,
+            form: {},
+            performances: [],
+            addresses: [],
+            timeRange: '',
+            dateRange: '',
+            afterTimeRange: '',
+            rules: {
+                performanceId: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
+                address: [{ required: true, message: '请选择活动地点', trigger: 'blur' }],
+                quantity: [{ required: true, message: '请输入分组节目数量', trigger: 'blur' }],
+                duration: [{ required: true, message: '请输入单个节目时长', trigger: 'blur' }]
+            },
+            artTypes: []
+        };
+    },
+    created() {
+        this.$http
+            .post('/performance/all', { size: 100, sort: 'year,desc' }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.performances.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post(
+                '/performanceSchedule/all',
+                { size: 100, query: { performanceId: this.form.performanceId } },
+                { body: 'json' }
+            )
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.addresses.push(item.address);
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/artType/parent')
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.artTypes.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return {
+                search: this.search,
+                sort: 'date,asc;startTime,asc'
+            };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/arrangeEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/arrangeEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/arrange/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/arrange/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        group() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.form };
+            data.startDate = this.dateRange[0];
+            data.endDate = this.dateRange[1];
+            data.morningStartTime = this.timeRange[0];
+            data.morningEndTime = this.timeRange[1];
+            data.afternoonStartTime = this.afterTimeRange[0];
+            data.afternoonEndTime = this.afterTimeRange[1];
+
+            this.saving = true;
+            this.$http
+                .post('/arrange/group', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        move(index, direction) {
+            const start = index;
+            const end = direction + index;
+            const startInfo = { ...this.tableData[start] };
+            const endInfo = { ...this.tableData[end] };
+            Promise.all([
+                this.$http.post(
+                    '/arrange/save',
+                    {
+                        ...startInfo,
+                        startTime: endInfo.startTime,
+                        endTime: endInfo.endTime
+                    },
+                    { body: 'json' }
+                ),
+                this.$http.post(
+                    '/arrange/save',
+                    {
+                        ...endInfo,
+                        startTime: startInfo.startTime,
+                        endTime: startInfo.endTime
+                    },
+                    { body: 'json' }
+                )
+            ])
+                .then(_ => {
+                    this.loading = false;
+                    this.getData();
+                    this.$message.success('成功');
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.loading = false;
+                    this.$message.error(e.error);
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -25,7 +25,7 @@
                     <el-col :span="8">
                         <el-form-item label="考级机构名称">
                             <el-select
-                                v-model="gradingOrganizationId"
+                                v-model="form.gradingOrganizationId"
                                 clearable
                                 filterable
                                 placeholder="考级机构"
@@ -44,7 +44,7 @@
                     <el-col :span="8">
                         <el-form-item label="承办单位名称">
                             <el-select
-                                v-model="organizationId"
+                                v-model="form.organizationId"
                                 clearable
                                 filterable
                                 placeholder="承办单位"
@@ -72,7 +72,7 @@
                             <el-cascader
                                 ref="artCascader"
                                 style="width: 100%"
-                                v-model="specialtyId"
+                                v-model="form.specialtyId"
                                 :props="optionProps"
                                 :options="artTypes"
                                 :show-all-levels="false"
@@ -84,7 +84,7 @@
                     </el-col>
                     <el-col :span="8"
                         ><el-form-item label="参赛组别">
-                            <el-select v-model="competitionGroup" clearable filterable placeholder="参赛组别">
+                            <el-select v-model="form.competitionGroup" clearable filterable placeholder="参赛组别">
                                 <el-option
                                     v-for="item in competitionGroupOptions"
                                     :key="item.value"
@@ -95,14 +95,14 @@
                             </el-select> </el-form-item
                     ></el-col>
                     <el-col :span="8"
-                        ><el-form-item label="参赛级别" v-if="competitionGroup">
+                        ><el-form-item label="参赛级别" v-if="form.competitionGroup">
                             <el-select
-                                v-model="levelSettingId"
+                                v-model="form.levelSettingId"
                                 clearable
                                 filterable
                                 placeholder="参赛级别"
                                 style="width: 100%"
-                                v-if="competitionGroup == 'SINGLE'"
+                                v-if="form.competitionGroup == 'SINGLE'"
                             >
                                 <el-option
                                     v-for="item in levelSingleOptions"
@@ -115,7 +115,7 @@
                                 </el-option>
                             </el-select>
                             <el-select
-                                v-model="levelSettingId"
+                                v-model="form.levelSettingId"
                                 clearable
                                 filterable
                                 placeholder="请选择"
@@ -180,7 +180,7 @@
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
             <el-table-column prop="examPoint" label="考级点"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="280">
+            <el-table-column label="操作" align="left" fixed="right" min-width="280">
                 <template slot-scope="{ row }">
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
                     <el-button
@@ -268,16 +268,12 @@ export default {
                 { label: '集体', value: 'COLLECTIVE' }
             ],
             form: {},
-            competitionGroup: '',
             levelSingleOptions: [],
             levelCollectiveOptions: [],
-            levelSettingId: '',
             dialogUrl: '',
             dialogCode: false,
             gradingOrganizationIdOptions: [],
             organizationIdOptions: [],
-            gradingOrganizationId: '',
-            organizationId: '',
             performanceId: '',
             performances: [],
             artTypes: [],
@@ -290,7 +286,6 @@ export default {
                 checkStrictly: true,
                 expandTrigger: 'hover'
             },
-            specialtyId: '',
             showViedo: false,
             videoUrl: ''
         };
@@ -411,23 +406,23 @@ export default {
                 sort: 'createdAt,desc',
                 query: {}
             };
-            if (this.competitionGroup) {
-                data.query.competitionGroup = this.competitionGroup;
+            if (this.form.competitionGroup) {
+                data.query.competitionGroup = this.form.competitionGroup;
             }
-            if (this.levelSettingId) {
-                data.query.levelSettingId = this.levelSettingId;
+            if (this.form.levelSettingId) {
+                data.query.levelSettingId = this.form.levelSettingId;
             }
-            if (this.gradingOrganizationId) {
-                data.query.gradingOrganizationId = this.gradingOrganizationId;
+            if (this.form.gradingOrganizationId) {
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
             }
-            if (this.organizationId) {
-                data.query.organizationId = this.organizationId;
+            if (this.form.organizationId) {
+                data.query.organizationId = this.form.organizationId;
             }
             if (this.performanceId) {
                 data.query.performanceId = this.performanceId;
             }
-            if (this.specialtyId) {
-                data.query.code = this.getCode(this.specialtyId);
+            if (this.form.specialtyId) {
+                data.query.code = this.getCode(this.form.specialtyId);
             }
             return data;
         },
@@ -460,20 +455,23 @@ export default {
                 sort: 'createdAt,desc',
                 query: {}
             };
-            if (this.competitionGroup) {
-                data.query.competitionGroup = this.competitionGroup;
+            if (this.form.competitionGroup) {
+                data.query.competitionGroup = this.form.competitionGroup;
             }
-            if (this.levelSettingId) {
-                data.query.levelSettingId = this.levelSettingId;
+            if (this.form.levelSettingId) {
+                data.query.levelSettingId = this.form.levelSettingId;
             }
-            if (this.gradingOrganizationId) {
-                data.query.gradingOrganizationId = this.gradingOrganizationId;
+            if (this.form.gradingOrganizationId) {
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
             }
             if (this.organizationId) {
-                data.query.organizationId = this.organizationId;
+                data.query.form.organizationId = this.form.organizationId;
+            }
+            if (this.form.specialtyId) {
+                data.query.code = this.getCode(this.form.specialtyId);
             }
-            if (this.specialtyId) {
-                data.query.code = this.getCode(this.specialtyId);
+            if (this.performanceId) {
+                data.query.performanceId = this.performanceId;
             }
 
             this.$axios
@@ -531,11 +529,12 @@ export default {
                 row.id;
         },
         clearSearch() {
-            this.competitionGroup = '';
-            this.levelSettingId = '';
-            this.gradingOrganizationId = '';
-            this.organizationId = '';
-            this.specialtyId = '';
+            // this.competitionGroup = '';
+            // this.levelSettingId = '';
+            // this.gradingOrganizationId = '';
+            // this.organizationId = '';
+            // this.specialtyId = '';
+            this.form = {};
             this.getData();
         },
         getCode(value) {

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -4,12 +4,12 @@
             <el-form :model="form" inline label-width="100px">
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="展演活动名称">
+                        <el-form-item label="活动名称">
                             <el-select
                                 v-model="performanceId"
                                 clearable
                                 filterable
-                                placeholder="展演活动名称"
+                                placeholder="活动名称"
                                 style="width: 100%"
                             >
                                 <el-option
@@ -130,7 +130,20 @@
                 <el-form-item>
                     <el-button @click="getData" type="primary" icon="el-icon-search">搜索 </el-button>
                     <el-button @click="addRow" type="primary" icon="el-icon-plus">添加 </el-button>
-                    <el-button @click="clearSearch" type="primary" icon="el-icon-upload2">批量导入 </el-button>
+                    <el-upload
+                        :action="uploadUrl"
+                        :before-upload="beforeUpload"
+                        :headers="headers"
+                        :show-file-list="false"
+                        ref="upload"
+                        :on-success="onSuccess"
+                        class="uploader"
+                        :on-error="onfail"
+                    >
+                        <el-button slot="trigger" size="small" type="primary" icon="el-icon-upload2"
+                            >批量上传</el-button
+                        >
+                    </el-upload>
                     <el-button
                         @click="download"
                         type="primary"
@@ -239,6 +252,7 @@ import delChild from '@/mixins/delChild';
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 import QrcodeVue from 'qrcode.vue';
+import resolveUrl from 'resolve-url';
 
 export default {
     name: 'ProgrammeOrgList',
@@ -278,10 +292,12 @@ export default {
             showViedo: false,
             videoUrl: '',
             name: '',
-            instructor: ''
+            instructor: '',
+            uploadUrl: ''
         };
     },
     created() {
+        this.uploadUrl = resolveUrl(this.$baseUrl, 'programme/upload');
         this.$http
             .post('/setting/byFlag', { flag: 3 })
             .then(res => {
@@ -336,7 +352,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .post('/performance/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .post('/performance/all', { size: 1000, sort: 'year,desc' }, { body: 'json' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -367,7 +383,12 @@ export default {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
         },
-        ...mapState(['organization'])
+        ...mapState(['organization']),
+        headers() {
+            return {
+                Authorization: 'Bearer ' + sessionStorage.getItem('token')
+            };
+        }
     },
     methods: {
         competitionGroupFormatter(row, column, cellValue, index) {
@@ -555,6 +576,23 @@ export default {
             this.showViedo = true;
             this.videoUrl = row.video;
             console.log(row.video);
+        },
+        upload() {},
+        onfail(e) {
+            console.log(e);
+            this.$message.error('失败');
+            this.getData();
+        },
+        onSuccess() {
+            this.$message.success('上传成功');
+            this.getData();
+        },
+        beforeUpload() {
+            return this.$confirm('确认要上传文件吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            });
         }
     }
 };
@@ -609,4 +647,8 @@ export default {
         }
     }
 }
+.uploader {
+    display: inline-block;
+    margin: 0 10px;
+}
 </style>