Главная Обзор Помощь
Вход
licailing
/
wenlvju
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge branch 'test' of licailing/wenlvju into master

licailing 4 лет назад
Родитель
8e11cdb301 b0495c4752
Сommit
f6442fbcaf
22 измененных файлов с 946 добавлено и 181 удалено
Единый вид Показать статистику Diff
  1. BIN
      img.pdf
  2. 1 1
      src/main/h5/public/index.html
  3. 2 2
      src/main/h5/src/plugins/http.js
  4. 29 2
      src/main/h5/src/views/Home.vue
  5. 16 16
      src/main/h5/src/views/TrainingInstitution.vue
  6. 3 0
      src/main/java/com/izouma/wenlvju/domain/TrainingInstitution.java
  7. 3 11
      src/main/java/com/izouma/wenlvju/dto/ProgrammeShowDTO.java
  8. 2 0
      src/main/java/com/izouma/wenlvju/dto/RateDTO.java
  9. 2 2
      src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java
  10. 26 4
      src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java
  11. 6 0
      src/main/java/com/izouma/wenlvju/web/TrainingInstitutionController.java
  12. 9 0
      src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java
  13. 10 0
      src/main/vue/src/router.js
  14. 3 3
      src/main/vue/src/views/TrainingInstitutionEdit.vue
  15. 753 0
      src/main/vue/src/views/performance/ProgrammeGOList.vue
  16. 59 29
      src/main/vue/src/views/performance/ProgrammeList.vue
  17. 2 6
      src/main/vue/src/views/performance/ProgrammeScoreList.vue
  18. 7 24
      src/main/vue/src/views/rate/RateDistrictList.vue
  19. 2 30
      src/main/vue/src/views/rate/RateDistrictListDone.vue
  20. 10 24
      src/main/vue/src/views/rate/RateDistrictListPending.vue
  21. 1 1
      src/test/java/com/izouma/wenlvju/service/sms/NjwlSmsServiceTest.java
  22. 0 26
      src/test/java/com/izouma/wenlvju/service/storage/AliStorageServiceTest.java

BIN
img.pdf
Просмотреть файл


+ 1 - 1
src/main/h5/public/index.html
Просмотреть файл 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-    <title><%= htmlWebpackPlugin.options.title %></title>
 
+    <title>宁艺通</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <noscript>
 
     <noscript>

+ 2 - 2
src/main/h5/src/plugins/http.js
Просмотреть файл 

@@ -4,8 +4,8 @@ import qs from "qs";
 
 let baseUrl = "http://localhost:8080";
 
 let baseUrl = "http://localhost:8080";
 
 switch (process.env.NODE_ENV) {
 
 switch (process.env.NODE_ENV) {
 
   case "development":
 
   case "development":
 
-    // baseUrl = "https://wljtest.izouma.com";
 
-    baseUrl = 'http://localhost:8080';
 
+    baseUrl = "http://yskj.njlyw.cn:8081";
 
+    // baseUrl = 'http://localhost:8080';
 
     break;
 
     break;
 
   case "test":
 
   case "test":
 
     baseUrl = "http://localhost:8080";
 
     baseUrl = "http://localhost:8080";

+ 29 - 2
src/main/h5/src/views/Home.vue
Просмотреть файл 

@@ -19,6 +19,13 @@
 
     <div style="margin-top:20px" v-if="info.video">
 
     <div style="margin-top:20px" v-if="info.video">
 
       <video-upload v-model="info2" class="width"></video-upload>
 
       <video-upload v-model="info2" class="width"></video-upload>
 
     </div>
 
     </div>
 
+    <div style="margin-top:20px" v-else-if="info.annex">
 
+      <img
 
+        style="width:100px;height:100px;margin-left:17px"
 
+        :src="info.annex"
 
+        alt=""
 
+      />
 
+    </div>
 
     <div class="base">
 
     <div class="base">
 
       <div class="base-info">
 
       <div class="base-info">
 
         <div class="base-info-item">
 
         <div class="base-info-item">
 
@@ -29,9 +36,29 @@
 
           <div class="text1">专业</div>
 
           <div class="text1">专业</div>
 
           <div class="text2">{{ info.specialty }}</div>
 
           <div class="text2">{{ info.specialty }}</div>
 
         </div>
 
         </div>
 
+        <div class="base-info-item">
 
+          <div class="text1">节目状态</div>
 
+          <div class="text2" v-if="info.programmeStatus == 'SUBMIT'">
 
+            审核中
 
+          </div>
 
+          <div class="text2" v-else-if="info.programmeStatus == 'AUDIT_FAILED'">
 
+            考级机构审核未通过
 
+          </div>
 
+          <div
 
+            class="text2"
 
+            v-else-if="info.programmeStatus == 'REVIEW_FAILED'"
 
+          >
 
+            审核未通过
 
+          </div>
 
+          <div class="text2" v-else>未提交</div>
 
+        </div>
 
+      </div>
 
+      <div class="base-info">
 
+        <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
+        <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
         <div v-for="(time, index) in info.participants" :key="index">
 
         <div v-for="(time, index) in info.participants" :key="index">
 
           <div class="base-info-item">
 
           <div class="base-info-item">
 
-            <div class="text1">参演时间</div>
 
+            <div class="text1">出生日期</div>
 
             <div class="text2">
 
             <div class="text2">
 
               {{ time.birthday }}
 
               {{ time.birthday }}
 
             </div>
 
             </div>
 
@@ -89,7 +116,7 @@
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div> -->
 
       </div> -->
 
-      <div class="base-info">
 
+      <div class="base-info" v-if="info.score">
 
         <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
         <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
         <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
         <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
 
         <div class="score">
 
         <div class="score">

+ 16 - 16
src/main/h5/src/views/TrainingInstitution.vue
Просмотреть файл 

@@ -417,15 +417,7 @@ export default {
 
     let data = JSON.parse(
 
     let data = JSON.parse(
 
       window.localStorage.getItem("trainingInstitution") || "{}"
 
       window.localStorage.getItem("trainingInstitution") || "{}"
 
     );
 
     );
 
-    if (data.specialty) {
 
-      data.specialty = data.specialty.split(",");
 
-      data.specialty.forEach((item, index) => {
 
-        if (!this.specialtyOptions.includes(item)) {
 
-          data.specialty[index] = "其他";
 
-          this.extra = item;
 
-        }
 
-      });
 
-    }
 
+    data.specialty = this.setSpecialty(data.specialty);
 
     this.form = data;
 
     this.form = data;
 
   },
 
   },
 
   computed: {
 
   computed: {
 
@@ -461,6 +453,20 @@ export default {
 
           }, 500);
 
           }, 500);
 
         });
 
         });
 
     },
 
     },
 
+    setSpecialty(specialty) {
 
+      if (specialty) {
 
+        specialty = specialty.split(",");
 
+        specialty.forEach((item, index) => {
 
+          if (!this.specialtyOptions.includes(item)) {
 
+            specialty[index] = "其他";
 
+            this.extra = item;
 
+          }
 
+        });
 
+        return specialty;
 
+      } else {
 
+        return [];
 
+      }
 
+    },
 
     byUscc() {
 
     byUscc() {
 
       this.$refs.form.validate().then(() => {
 
       this.$refs.form.validate().then(() => {
 
         this.$toast.loading({
 
         this.$toast.loading({
 
@@ -474,13 +480,7 @@ export default {
 
             `/trainingInstitution/byUscc?name=${this.form.name}&uscc=${this.form.uscc}`
 
             `/trainingInstitution/byUscc?name=${this.form.name}&uscc=${this.form.uscc}`
 
           )
 
           )
 
           .then(res => {
 
           .then(res => {
 
-            res.specialty = res.specialty.split(",");
 
-            res.specialty.forEach((item, index) => {
 
-              if (!this.specialtyOptions.includes(item)) {
 
-                res.specialty[index] = "其他";
 
-                this.extra = item;
 
-              }
 
-            });
 
+            res.specialty = this.setSpecialty(res.specialty);
 
             this.$toast.clear();
 
             this.$toast.clear();
 
             this.form = { ...res, ...this.form };
 
             this.form = { ...res, ...this.form };
 
             if (!this.form.engagedInTraining) {
 
             if (!this.form.engagedInTraining) {

+ 3 - 0
src/main/java/com/izouma/wenlvju/domain/TrainingInstitution.java
Просмотреть файл 

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 
 import javax.persistence.Column;
 
 import javax.persistence.Entity;
 
 import javax.persistence.Entity;
 
 import java.math.BigDecimal;
 
 import java.math.BigDecimal;
 
+import java.time.LocalDateTime;
 
 
 
 @Data
 
 @Data
 
 @AllArgsConstructor
 
 @AllArgsConstructor
 
@@ -146,4 +147,6 @@ public class TrainingInstitution extends BaseEntity {
 
     private String remark;
 
     private String remark;
 
 
 
     private boolean submit;
 
     private boolean submit;
 
+
 
+    private LocalDateTime firstWrite;
 
 }
 
 }

+ 3 - 11
src/main/java/com/izouma/wenlvju/dto/ProgrammeShowDTO.java
Просмотреть файл 

@@ -1,24 +1,14 @@
 
 package com.izouma.wenlvju.dto;
 
 package com.izouma.wenlvju.dto;
 
 
 
 import cn.hutool.core.bean.BeanUtil;
 
 import cn.hutool.core.bean.BeanUtil;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 
-import com.izouma.wenlvju.annotations.EnumFormat;
 
-import com.izouma.wenlvju.domain.performance.Participant;
 
 import com.izouma.wenlvju.domain.performance.Programme;
 
 import com.izouma.wenlvju.domain.performance.Programme;
 
 import com.izouma.wenlvju.enums.CompetitionGroup;
 
 import com.izouma.wenlvju.enums.CompetitionGroup;
 
-import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
 
-import com.izouma.wenlvju.utils.excel.LocalDateConverter;
 
-import io.swagger.annotations.ApiModel;
 
+import com.izouma.wenlvju.enums.ProgrammeStatus;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.AllArgsConstructor;
 
 import lombok.AllArgsConstructor;
 
-import lombok.Builder;
 
 import lombok.Data;
 
 import lombok.Data;
 
 import lombok.NoArgsConstructor;
 
 import lombok.NoArgsConstructor;
 
 
 
-import javax.persistence.EnumType;
 
-import javax.persistence.Enumerated;
 
-import java.time.LocalDate;
 
 import java.util.List;
 
 import java.util.List;
 
 
 
 @Data
 
 @Data
 
@@ -70,6 +60,8 @@ public class ProgrammeShowDTO {
 
 
 
     private String annex;
 
     private String annex;
 
 
 
+    private ProgrammeStatus programmeStatus;
 
+
 
     private List<ParticipantDTO> participants;
 
     private List<ParticipantDTO> participants;
 
 
 
     public ProgrammeShowDTO(Programme programme) {
 
     public ProgrammeShowDTO(Programme programme) {

+ 2 - 0
src/main/java/com/izouma/wenlvju/dto/RateDTO.java
Просмотреть файл 

@@ -88,6 +88,8 @@ public class RateDTO {
 
     @ApiModelProperty(value = "等级")
 
     @ApiModelProperty(value = "等级")
 
     private String grade;
 
     private String grade;
 
 
 
+    private int sort;
 
+
 
     @ExcelIgnore
 
     @ExcelIgnore
 
     @ApiModelProperty(value = "驳回时间")
 
     @ApiModelProperty(value = "驳回时间")
 
     private LocalDateTime rejectedAt;
 
     private LocalDateTime rejectedAt;

+ 2 - 2
src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java
Просмотреть файл 

@@ -88,9 +88,9 @@ public class TrainingInstitutionService {
 
     }
 
     }
 
 
 
     public TrainingInstitution byUscc(String name, String uscc) {
 
     public TrainingInstitution byUscc(String name, String uscc) {
 
-        TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc);
 
+        TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc.trim());
 
         if (ObjectUtil.isNotNull(byUscc)) {
 
         if (ObjectUtil.isNotNull(byUscc)) {
 
-            if (byUscc.getName().equals(name)) {
 
+            if (byUscc.getName().equals(name.trim())) {
 
                 return byUscc;
 
                 return byUscc;
 
             }
 
             }
 
         }
 
         }

+ 26 - 4
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java
Просмотреть файл 

@@ -127,6 +127,28 @@ public class ProgrammeService {
 
         return record;
 
         return record;
 
     }
 
     }
 
 
 
+    public Page<Programme> all2(PageQuery pageQuery) {
 
+        Map<String, Object> query = pageQuery.getQuery();
 
+        Object code = query.get("code");
 
+        String artCode = null;
 
+        if (ObjectUtil.isNotNull(code)) {
 
+            artCode = Convert.convert(String.class, code);
 
+            query.remove("code");
 
+        }
 
+
 
+        List<ArtType> artTypes = artTypeRepo.findAll();
 
+
 
+        String finalArtCode = artCode;
 
+        return programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
 
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
 
+            if (StrUtil.isNotBlank(finalArtCode)) {
 
+                and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
 
+            }
 
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
 
+
 
+        }), JpaUtils.toPageRequest(pageQuery));
 
+    }
 
+
 
 
 
     public Page<ProgrammeDTO> backAll(PageQuery pageQuery) {
 
     public Page<ProgrammeDTO> backAll(PageQuery pageQuery) {
 
         Map<String, Object> query = pageQuery.getQuery();
 
         Map<String, Object> query = pageQuery.getQuery();
 
@@ -140,7 +162,7 @@ public class ProgrammeService {
 
         List<ArtType> artTypes = artTypeRepo.findAll();
 
         List<ArtType> artTypes = artTypeRepo.findAll();
 
 
 
         String finalArtCode = artCode;
 
         String finalArtCode = artCode;
 
-        Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
 
+        Page<Programme> all =  programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
 
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
 
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
 
             if (StrUtil.isNotBlank(finalArtCode)) {
 
             if (StrUtil.isNotBlank(finalArtCode)) {
 
                 and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
 
                 and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
 
@@ -605,19 +627,19 @@ public class ProgrammeService {
 
             List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndReviewArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
 
             List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndReviewArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
 
             if (CollUtil.isNotEmpty(programmes)) {
 
             if (CollUtil.isNotEmpty(programmes)) {
 
                 this.sort(programmes);
 
                 this.sort(programmes);
 
-                return this.toShowDTOList(programmes, performance.getName());
 
+                return this.toShowDTOList(programmes);
 
             }
 
             }
 
             return null;
 
             return null;
 
         }
 
         }
 
         List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
 
         List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
 
         if (CollUtil.isNotEmpty(programmes)) {
 
         if (CollUtil.isNotEmpty(programmes)) {
 
             this.sort(programmes);
 
             this.sort(programmes);
 
-            return this.toShowDTOList(programmes, performance.getName());
 
+            return this.toShowDTOList(programmes);
 
         }
 
         }
 
         return null;
 
         return null;
 
     }
 
     }
 
 
 
-    private List<ProgrammeShowDTO> toShowDTOList(List<Programme> programmes, String name) {
 
+    public List<ProgrammeShowDTO> toShowDTOList(List<Programme> programmes) {
 
         Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(3, 4))
 
         Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(3, 4))
 
                 .stream()
 
                 .stream()
 
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));
 
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));

+ 6 - 0
src/main/java/com/izouma/wenlvju/web/TrainingInstitutionController.java
Просмотреть файл 

@@ -1,5 +1,6 @@
 
 package com.izouma.wenlvju.web;
 
 package com.izouma.wenlvju.web;
 
 
 
+import cn.hutool.core.util.ObjectUtil;
 
 import com.izouma.wenlvju.domain.TrainingInstitution;
 
 import com.izouma.wenlvju.domain.TrainingInstitution;
 
 import com.izouma.wenlvju.dto.PageQuery;
 
 import com.izouma.wenlvju.dto.PageQuery;
 
 import com.izouma.wenlvju.dto.TrainingInstitutionDTO;
 
 import com.izouma.wenlvju.dto.TrainingInstitutionDTO;
 
@@ -15,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 
 
 import javax.servlet.http.HttpServletResponse;
 
 import javax.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
+import java.time.LocalDateTime;
 
 import java.util.List;
 
 import java.util.List;
 
 import java.util.stream.Collectors;
 
 import java.util.stream.Collectors;
 
 
 
@@ -32,7 +34,11 @@ public class TrainingInstitutionController extends BaseController {
 
             TrainingInstitution orig = trainingInstitutionRepo.findById(record.getId())
 
             TrainingInstitution orig = trainingInstitutionRepo.findById(record.getId())
 
                     .orElseThrow(new BusinessException("无记录"));
 
                     .orElseThrow(new BusinessException("无记录"));
 
             ObjUtils.merge(orig, record);
 
             ObjUtils.merge(orig, record);
 
+
 
             orig.setSubmit(true);
 
             orig.setSubmit(true);
 
+            if (ObjectUtil.isNull(orig.getFirstWrite())) {
 
+                orig.setFirstWrite(LocalDateTime.now());
 
+            }
 
             return trainingInstitutionRepo.save(orig);
 
             return trainingInstitutionRepo.save(orig);
 
         }
 
         }
 
         return trainingInstitutionRepo.save(record);
 
         return trainingInstitutionRepo.save(record);

+ 9 - 0
src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java
Просмотреть файл 

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 
 import lombok.AllArgsConstructor;
 
 import lombok.AllArgsConstructor;
 
 import lombok.extern.slf4j.Slf4j;
 
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.data.domain.Page;
 
 import org.springframework.data.domain.Page;
 
+import org.springframework.data.domain.PageImpl;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.multipart.MultipartFile;
 
 import org.springframework.web.multipart.MultipartFile;
 
@@ -185,6 +186,14 @@ public class ProgrammeController extends BaseController {
 
         return programmeService.toShowDTO(programme);
 
         return programmeService.toShowDTO(programme);
 
     }
 
     }
 
 
 
+    @PostMapping("/showAll")
 
+    @ApiOperation("考级机构查看节目信息")
 
+    public Page<ProgrammeShowDTO> showAll(@RequestBody PageQuery pageQuery) {
 
+        Page<Programme> all = programmeService.all2(pageQuery);
 
+        return new PageImpl<>(programmeService.toShowDTOList(all.getContent()), all.getPageable()
 
+                , all.getTotalElements());
 
+    }
 
+
 
     @ApiOperation("获取手机号/token")
 
     @ApiOperation("获取手机号/token")
 
     @PostMapping("/getAuth")
 
     @PostMapping("/getAuth")
 
     public Map<String, String> getAuth(@RequestParam Long id, @RequestParam String phone) {
 
     public Map<String, String> getAuth(@RequestParam Long id, @RequestParam String phone) {

+ 10 - 0
src/main/vue/src/router.js
Просмотреть файл 

@@ -799,6 +799,16 @@ const router = new Router({
 
                     meta: {
 
                     meta: {
 
                         title: '培训机构'
 
                         title: '培训机构'
 
                     }
 
                     }
 
+                },
 
+                /**初审 */
 
+                {
 
+                    path: '/programmeGOList',
 
+                    name: 'ProgrammegoList',
 
+                    component: () =>
 
+                        import(/* webpackChunkName: "programmeList" */ '@/views/performance/ProgrammeGOList.vue'),
 
+                    meta: {
 
+                        title: '节目列表'
 
+                    }
 
                 }
 
                 }
 
                 /**INSERT_LOCATION**/
 
                 /**INSERT_LOCATION**/
 
             ]
 
             ]

+ 3 - 3
src/main/vue/src/views/TrainingInstitutionEdit.vue
Просмотреть файл 

@@ -12,8 +12,8 @@
 
             <el-form-item prop="name" label="企业名称">
 
             <el-form-item prop="name" label="企业名称">
 
                 <el-input v-model="formData.name"></el-input>
 
                 <el-input v-model="formData.name"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
-            <el-form-item prop="usscc" label="注册号">
 
-                <el-input v-model="formData.usscc"></el-input>
 
+            <el-form-item prop="uscc" label="注册号">
 
+                <el-input v-model="formData.uscc"></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
             <el-form-item prop="businessScope" label="经营范围">
 
             <el-form-item prop="businessScope" label="经营范围">
 
                 <el-input type="textarea" v-model="formData.businessScope"></el-input>
 
                 <el-input type="textarea" v-model="formData.businessScope"></el-input>
 
@@ -88,7 +88,7 @@
 
                 <el-input-number type="number" v-model="formData.traineesPerYearNum"></el-input-number>
 
                 <el-input-number type="number" v-model="formData.traineesPerYearNum"></el-input-number>
 
             </el-form-item>
 
             </el-form-item>
 
             <el-form-item prop="examPoint" label="是否是艺术水平考级考点">
 
             <el-form-item prop="examPoint" label="是否是艺术水平考级考点">
 
-                <el-input v-model="formData.examPoint"></el-input>
 
+                <!-- <el-input v-model="formData.examPoint"></el-input> -->
 
             </el-form-item>
 
             </el-form-item>
 
             <el-form-item prop="gradingOrganization" label="艺术水平考级机构名称">
 
             <el-form-item prop="gradingOrganization" label="艺术水平考级机构名称">
 
                 <el-input v-model="formData.gradingOrganization"></el-input>
 
                 <el-input v-model="formData.gradingOrganization"></el-input>

+ 753 - 0
src/main/vue/src/views/performance/ProgrammeGOList.vue
Просмотреть файл 

@@ -0,0 +1,753 @@
 
+<template>
 
+    <div class="list-view">
 
+        <div class="filters-container">
 
+            <el-form :model="form" inline size="mini" label-width="100px">
 
+                <el-row>
 
+                    <el-col :span="8">
 
+                        <el-form-item label="参赛专业">
 
+                            <el-cascader
 
+                                ref="artCascader"
 
+                                style="width: 100%"
 
+                                v-model="form.specialtyId"
 
+                                :props="optionProps"
 
+                                :options="artTypes"
 
+                                :show-all-levels="false"
 
+                                placeholder="请选择专业"
 
+                                clearable
 
+                            >
 
+                            </el-cascader>
 
+                        </el-form-item>
 
+                    </el-col>
 
+                </el-row>
 
+                <el-collapse-transition>
 
+                    <div v-show="showMore">
 
+                        <el-row>
 
+                            <el-col :span="8">
 
+                                <el-form-item label="考级机构名称">
 
+                                    <el-select
 
+                                        v-model="form.gradingOrganizationId"
 
+                                        clearable
 
+                                        filterable
 
+                                        placeholder="考级机构"
 
+                                        style="width: 100%"
 
+                                    >
 
+                                        <el-option
 
+                                            v-for="item in gradingOrganizationIdOptions"
 
+                                            :key="item.value"
 
+                                            :label="item.label"
 
+                                            :value="item.value"
 
+                                        >
 
+                                        </el-option>
 
+                                    </el-select>
 
+                                </el-form-item>
 
+                            </el-col>
 
+                            <el-col :span="8">
 
+                                <el-form-item label="承办单位名称">
 
+                                    <el-select
 
+                                        v-model="form.organizationId"
 
+                                        clearable
 
+                                        filterable
 
+                                        placeholder="承办单位"
 
+                                        style="width: 100%"
 
+                                    >
 
+                                        <el-option
 
+                                            v-for="item in organizationIdOptions"
 
+                                            :key="item.value"
 
+                                            :label="item.label"
 
+                                            :value="item.value"
 
+                                        >
 
+                                        </el-option>
 
+                                    </el-select>
 
+                                </el-form-item>
 
+                            </el-col>
 
+
 
+                            <el-col :span="8"
 
+                                ><el-form-item label="考级点名称">
 
+                                    <el-input
 
+                                        placeholder="考级点名称"
 
+                                        v-model="search"
 
+                                        clearable
 
+                                    ></el-input> </el-form-item
 
+                            ></el-col>
 
+                        </el-row>
 
+                        <el-row>
 
+                            <el-col :span="8">
 
+                                <el-form-item label="节目名称">
 
+                                    <el-input placeholder="节目名称" v-model="form.name" clearable></el-input>
 
+                                </el-form-item>
 
+                            </el-col>
 
+                            <el-col :span="8"
 
+                                ><el-form-item label="参赛组别">
 
+                                    <el-select
 
+                                        v-model="form.competitionGroup"
 
+                                        clearable
 
+                                        filterable
 
+                                        placeholder="参赛组别"
 
+                                    >
 
+                                        <el-option
 
+                                            v-for="item in competitionGroupOptions"
 
+                                            :key="item.value"
 
+                                            :label="item.label"
 
+                                            :value="item.value"
 
+                                        >
 
+                                        </el-option>
 
+                                    </el-select> </el-form-item
 
+                            ></el-col>
 
+
 
+                            <el-col :span="8"
 
+                                ><el-form-item label="参赛级别" v-if="form.competitionGroup">
 
+                                    <el-select
 
+                                        v-model="form.levelSettingId"
 
+                                        clearable
 
+                                        filterable
 
+                                        placeholder="参赛级别"
 
+                                        style="width: 100%"
 
+                                        v-if="form.competitionGroup == 'SINGLE'"
 
+                                    >
 
+                                        <el-option
 
+                                            v-for="item in levelSingleOptions"
 
+                                            :key="item.value"
 
+                                            :label="item.label"
 
+                                            :value="item.value"
 
+                                        >
 
+                                            <span style="float: left">{{ item.label }}</span>
 
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{
 
+                                                item.desc
 
+                                            }}</span>
 
+                                        </el-option>
 
+                                    </el-select>
 
+                                    <el-select
 
+                                        v-model="form.levelSettingId"
 
+                                        clearable
 
+                                        filterable
 
+                                        placeholder="请选择"
 
+                                        style="width: 100%"
 
+                                        v-else
 
+                                    >
 
+                                        <el-option
 
+                                            v-for="item in levelCollectiveOptions"
 
+                                            :key="item.value"
 
+                                            :label="item.label"
 
+                                            :value="item.value"
 
+                                        >
 
+                                            <span style="float: left">{{ item.label }}</span>
 
+                                            <span style="float: right; color: #8492a6; font-size: 13px">{{
 
+                                                item.desc
 
+                                            }}</span>
 
+                                        </el-option>
 
+                                    </el-select>
 
+                                </el-form-item></el-col
 
+                            >
 
+                        </el-row>
 
+                    </div>
 
+                </el-collapse-transition>
 
+                <div style="width:100%;textAlign:center;margin-bottom:10px;">
 
+                    <el-button
 
+                        class="more"
 
+                        round
 
+                        type="primary"
 
+                        :plain="!showMore"
 
+                        :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
 
+                        @click="showMore = !showMore"
 
+                        size="mini"
 
+                        >{{ showMore ? '隐藏查询区域' : '显示查询区域' }}</el-button
 
+                    >
 
+                </div>
 
+                <el-form-item>
 
+                    <el-button @click="getData" type="primary" icon="el-icon-search">查询 </el-button>
 
+                    <el-button @click="clearSearch" type="primary">清空 </el-button>
 
+                    <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus">添加 </el-button> -->
 
+                    <el-button
 
+                        @click="download"
 
+                        type="primary"
 
+                        icon="el-icon-download"
 
+                        :loading="downloading"
 
+                        :disabled="totalElements < 1"
 
+                        >导出
 
+                    </el-button>
 
+                </el-form-item>
 
+            </el-form>
 
+        </div>
 
+        <el-table
 
+            :data="tableData"
 
+            row-key="id"
 
+            ref="table"
 
+            empty-text="加载中..."
 
+            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="节目编号" width="80" fixed="left"> </el-table-column>
 
+            <el-table-column prop="name" label="节目名称" fixed="left"> </el-table-column>
 
+            <el-table-column prop="specialty" label="参赛专业"> </el-table-column>
 
+            <el-table-column
 
+                prop="competitionGroup"
 
+                label="参赛组别"
 
+                :formatter="competitionGroupFormatter"
 
+                min-width="70"
 
+            >
 
+            </el-table-column>
 
+            <el-table-column prop="level" label="参赛级别" min-width="70"> </el-table-column>
 
+            <!-- <el-table-column prop="durationOfWork" label="作品时长" min-width="70"> </el-table-column> -->
 
+            <el-table-column prop="quantity" label="参赛人数" min-width="70"> </el-table-column>
 
+            <el-table-column prop="contact" label="联系人" min-width="68"> </el-table-column>
 
+            <el-table-column prop="phone" label="联系电话" min-width="95"> </el-table-column>
 
+            <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
 
+            </el-table-column>
 
+            <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
 
+            <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column>
 
+            <el-table-column
 
+                prop="programmeStatus"
 
+                label="节目状态"
 
+                min-width="180"
 
+                :formatter="programmeStatusFormatter"
 
+            ></el-table-column>
 
+            <el-table-column label="操作" align="left" fixed="right" min-width="260">
 
+                <template slot-scope="{ row, $index }">
 
+                    <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
 
+                    <el-button type="warning" @click="playVideo(row, $index)" size="mini" plain>查看作品</el-button>
 
+                    <el-button
 
+                        @click="audit(row, 'AUDIT_FAILED')"
 
+                        type="danger"
 
+                        size="mini"
 
+                        plain
 
+                        v-if="row.programmeStatus == 'SUBMIT' && performance.auditTimes == 0"
 
+                        >不通过</el-button
 
+                    >
 
+                    <el-button
 
+                        @click="audit(row, 'SUBMIT')"
 
+                        type="info"
 
+                        size="mini"
 
+                        plain
 
+                        v-if="row.programmeStatus == 'AUDIT_FAILED' && performance.auditTimes == 0"
 
+                        >撤回</el-button
 
+                    >
 
+                    <!-- <el-button @click="showCode(row)" type="primary" 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>
 
+
 
+        <el-dialog title="二维码" :visible.sync="dialogCode" width="400px" center>
 
+            <div style="margin-left: 70px;">
 
+                <qrcode-vue :value="dialogUrl" :size="200" level="H" />
 
+            </div>
 
+        </el-dialog>
 
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
 
+            <video
 
+                :src="programme.video"
 
+                controls
 
+                style="max-height: 600px; max-width: 100%; margin: 0 auto"
 
+                v-if="programme.video"
 
+            >
 
+                您的浏览器不支持 video 标签。
 
+            </video>
 
+            <!-- <div style="width: 85%; height:600px;margin: 0 auto" v-if="programme.annex"> -->
 
+            <img style="max-height:600px; max-width: 100%; " :src="programme.annex" alt="" v-if="programme.annex" />
 
+            <!-- </div> -->
 
+            <div style="margin: 10px">
 
+                <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
 
+                <el-button size="mini" @click="move(1)" :disabled="(page - 1) * pageSize + index == totalElements - 1"
 
+                    >下一个</el-button
 
+                >
 
+                <el-button @click="showViedo = false" size="mini">关闭</el-button>
 
+            </div>
 
+        </el-dialog>
 
+        <programme-log :dialogVisible="isShow" @close="isShow = false" ref="public"></programme-log>
 
+    </div>
 
+</template>
 
+<script>
 
+import delChild from '@/mixins/delChild';
 
+import { mapState } from 'vuex';
 
+import pageableTable from '@/mixins/pageableTable';
 
+import QrcodeVue from 'qrcode.vue';
 
+import ProgrammeLog from '@/components/ProgrammeLog.vue';
 
+export default {
 
+    name: 'ProgrammeList',
 
+    mixins: [pageableTable, delChild],
 
+    props: ['review'],
 
+    data() {
 
+        return {
 
+            multipleMode: false,
 
+            search: '',
 
+            url: '/programme/showAll',
 
+            downloading: false,
 
+            competitionGroupOptions: [
 
+                { label: '个人', value: 'SINGLE' },
 
+                { label: '集体', value: 'COLLECTIVE' }
 
+            ],
 
+            form: {},
 
+            levelSingleOptions: [],
 
+            levelCollectiveOptions: [],
 
+            dialogUrl: '',
 
+            dialogCode: false,
 
+            isShow: false,
 
+            gradingOrganizationIdOptions: [],
 
+            organizationIdOptions: [],
 
+            performanceId: '',
 
+            performances: [],
 
+            performance: {},
 
+            artTypes: [],
 
+            optionProps: {
 
+                value: 'id',
 
+                label: 'name',
 
+                children: 'children',
 
+                multiple: false,
 
+                emitPath: false,
 
+                checkStrictly: true,
 
+                expandTrigger: 'hover'
 
+            },
 
+            showViedo: false,
 
+            showImg: false,
 
+            videoUrl: '',
 
+            annex: '',
 
+            programmeStatusOptions: [
 
+                { label: '未提交', value: 'INITIAL' },
 
+                { label: '已提交', value: 'SUBMIT' },
 
+                { label: '初选未通过', value: 'AUDIT_FAILED' },
 
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
 
+            ],
 
+            showMore: false,
 
+            programme: {},
 
+            index: 0
 
+        };
 
+    },
 
+    created() {
 
+        if (this.$route.query.pid) {
 
+            this.performanceId = Number(this.$route.query.pid);
 
+        }
 
+        this.$http
 
+            .post('/setting/byFlag', { flag: 3 })
 
+            .then(res => {
 
+                if (res.length > 0) {
 
+                    res.forEach(item => {
 
+                        this.levelSingleOptions.push({
 
+                            label: item.name,
 
+                            value: item.id,
 
+                            desc: item.code
 
+                        });
 
+                    });
 
+                }
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+                this.$message.error(e.error);
 
+            });
 
+        this.$http
 
+            .post('/setting/byFlag', { flag: 4 })
 
+            .then(res => {
 
+                if (res.length > 0) {
 
+                    res.forEach(item => {
 
+                        this.levelCollectiveOptions.push({
 
+                            label: item.name,
 
+                            value: item.id,
 
+                            desc: item.code
 
+                        });
 
+                    });
 
+                }
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+                this.$message.error(e.error);
 
+            });
 
+        this.$http
 
+            .post('/gradingOrganization/all', { size: 1000, query: { del: false } }, { body: 'json' })
 
+            .then(res => {
 
+                if (res.content.length > 0) {
 
+                    res.content.forEach(item => {
 
+                        this.gradingOrganizationIdOptions.push({
 
+                            label: item.name,
 
+                            value: item.id
 
+                        });
 
+                    });
 
+                }
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+                this.$message.error(e.error);
 
+            });
 
+        this.$http
 
+            .post('/organization/all', { size: 1000, query: { del: false } }, { body: 'json' })
 
+            .then(res => {
 
+                if (res.content.length > 0) {
 
+                    res.content.forEach(item => {
 
+                        this.organizationIdOptions.push({
 
+                            label: item.name,
 
+                            value: item.id
 
+                        });
 
+                    });
 
+                }
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+                this.$message.error(e.error);
 
+            });
 
+        this.$http
 
+            .post(
 
+                '/performance/all',
 
+                {
 
+                    size: 1000,
 
+                    sort: 'year,desc',
 
+                    query: {
 
+                        publish: true
 
+                    }
 
+                },
 
+                { body: 'json' }
 
+            )
 
+            .then(res => {
 
+                if (res.content.length > 0) {
 
+                    res.content.forEach(item => {
 
+                        this.performances.push({
 
+                            label: item.name,
 
+                            value: item.id
 
+                        });
 
+                    });
 
+                    this.performanceId = res.content[0].id;
 
+                    this.performance = res.content[0];
 
+                    this.getData();
 
+                }
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+                this.$message.error(e.error);
 
+            });
 
+        this.$http
 
+            .post('/artType/allList')
 
+            .then(res => {
 
+                this.artTypes = this.delChild(res);
 
+            })
 
+            .catch(e => {
 
+                console.log(e);
 
+            });
 
+    },
 
+    components: {
 
+        QrcodeVue,
 
+        ProgrammeLog
 
+    },
 
+    computed: {
 
+        selection() {
 
+            return this.$refs.table.selection.map(i => i.id);
 
+        }
 
+    },
 
+    methods: {
 
+        programmeStatusFormatter(row, column, cellValue, index) {
 
+            let selectedOption = this.programmeStatusOptions.find(i => i.value === cellValue);
 
+            if (selectedOption) {
 
+                return selectedOption.label;
 
+            }
 
+            return '';
 
+        },
 
+        competitionGroupFormatter(row, column, cellValue, index) {
 
+            let selectedOption = this.competitionGroupOptions.find(i => i.value === cellValue);
 
+            if (selectedOption) {
 
+                return selectedOption.label;
 
+            }
 
+            return '';
 
+        },
 
+        beforeGetData() {
 
+            let data = {
 
+                sort: 'programmeStatus,desc',
 
+                query: {}
 
+            };
 
+            if (this.form.competitionGroup) {
 
+                data.query.competitionGroup = this.form.competitionGroup;
 
+            }
 
+            if (this.form.levelSettingId) {
 
+                data.query.levelSettingId = this.form.levelSettingId;
 
+            }
 
+            if (this.form.gradingOrganizationId) {
 
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
 
+            }
 
+            if (this.form.organizationId) {
 
+                data.query.organizationId = this.form.organizationId;
 
+            }
 
+            if (this.form.specialtyId) {
 
+                data.query.code = this.getCode(this.form.specialtyId);
 
+            }
 
+            if (this.performanceId) {
 
+                data.query.performanceId = this.performanceId;
 
+            }
 
+            if (this.review) {
 
+                data.query.programmeStatus = 'SUBMIT';
 
+            }
 
+            if (this.form.name) {
 
+                data.query.name = this.form.name;
 
+            }
 
+            if (this.form.programmeStatus) {
 
+                data.query.programmeStatus = this.form.programmeStatus;
 
+            }
 
+            return data;
 
+        },
 
+        toggleMultipleMode(multipleMode) {
 
+            this.multipleMode = multipleMode;
 
+            if (!multipleMode) {
 
+                this.$refs.table.clearSelection();
 
+            }
 
+        },
 
+        addRow() {
 
+            this.$router.push({
 
+                path: '/programmeEdit',
 
+                query: {
 
+                    ...this.$route.query
 
+                }
 
+            });
 
+        },
 
+        showRow(row) {
 
+            this.isShow = true;
 
+            this.$refs.public.dataApi(row.id);
 
+        },
 
+        download() {
 
+            this.downloading = true;
 
+
 
+            let data = {
 
+                sort: 'programmeStatus,desc',
 
+                size: 1000,
 
+                query: {}
 
+            };
 
+            if (this.form.competitionGroup) {
 
+                data.query.competitionGroup = this.form.competitionGroup;
 
+            }
 
+            if (this.form.levelSettingId) {
 
+                data.query.levelSettingId = this.form.levelSettingId;
 
+            }
 
+            if (this.form.gradingOrganizationId) {
 
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
 
+            }
 
+            if (this.organizationId) {
 
+                data.query.form.organizationId = this.form.organizationId;
 
+            }
 
+            if (this.form.specialtyId) {
 
+                data.query.code = this.getCode(this.form.specialtyId);
 
+            }
 
+            if (this.performanceId) {
 
+                data.query.performanceId = this.performanceId;
 
+            }
 
+            if (this.form.name) {
 
+                data.query.name = this.form.name;
 
+            }
 
+            if (this.form.programmeStatus) {
 
+                data.query.programmeStatus = this.form.programmeStatus;
 
+            }
 
+
 
+            this.$axios
 
+                .get('/programme/excel', {
 
+                    responseType: 'blob',
 
+                    params: data
 
+                })
 
+                .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(`/programme/del/${row.id}`);
 
+                })
 
+                .then(() => {
 
+                    this.$message.success('删除成功');
 
+                    this.getData();
 
+                })
 
+                .catch(e => {
 
+                    if (e !== 'cancel') {
 
+                        this.$message.error(e.error);
 
+                    }
 
+                });
 
+        },
 
+        showCode(row) {
 
+            this.dialogCode = true;
 
+            this.dialogUrl =
 
+                'http://yskj.njlyw.cn:8081/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
 
+        },
 
+        clearSearch() {
 
+            this.form = {};
 
+            this.getData();
 
+        },
 
+        getCode(value) {
 
+            return this.forTree(this.artTypes, value).code;
 
+        },
 
+        forTree(list, value) {
 
+            var result = null;
 
+            if (!list) {
 
+                return;
 
+            }
 
+            for (var i in list) {
 
+                if (result !== null) {
 
+                    break;
 
+                }
 
+                var item = list[i];
 
+                if (item.id == value) {
 
+                    result = item;
 
+                    break;
 
+                } else if (item.children && item.children.length > 0) {
 
+                    result = this.forTree(item.children, value);
 
+                }
 
+            }
 
+            return result;
 
+        },
 
+        // closeEvent() {
 
+        //     document.exitPictureInPicture();
 
+        // },
 
+        // playVideo(row) {
 
+        //     if (row.video) {
 
+        //         this.showViedo = true;
 
+        //         this.videoUrl = row.video;
 
+        //     } else {
 
+        //         this.$message.success('暂无视频');
 
+        //     }
 
+        // },
 
+        playImg(row) {
 
+            if (row.annex) {
 
+                this.showImg = true;
 
+                this.annex = row.annex;
 
+            } else {
 
+                this.$message.success('暂无图片');
 
+            }
 
+        },
 
+        audit(row, status) {
 
+            this.$set(row, 'loading', true);
 
+            let str = '确认该节目未通过初选？',
 
+                remark = '未通过考级机构初选。';
 
+            if (status == 'SUBMIT') {
 
+                str = '确认撤回，撤回后可参加后续的审核。';
 
+                remark = '撤消未通过考级机构初选。';
 
+            }
 
+            this.$confirm(str, '提示', {
 
+                confirmButtonText: '确认',
 
+                cancelButtonText: '取消',
 
+                type: 'warning'
 
+            })
 
+                .then(() => {
 
+                    this.$http
 
+                        .post('/programme/firstAudit', {
 
+                            id: row.id,
 
+                            status: status,
 
+                            remark: remark
 
+                        })
 
+                        .then(res => {
 
+                            this.$set(row, 'loading', false);
 
+                            this.$message.success('操作成功');
 
+                            this.getData();
 
+                        })
 
+                        .catch(e => {
 
+                            console.log(e);
 
+                            this.$set(row, 'loading', false);
 
+                            this.$message.error(e.error);
 
+                        });
 
+                })
 
+                .catch(() => {
 
+                    this.$message({
 
+                        type: 'info',
 
+                        message: '已取消'
 
+                    });
 
+                    this.$set(row, 'loading', false);
 
+                });
 
+        },
 
+        playVideo(row, index) {
 
+            this.index = index;
 
+            this.showViedo = true;
 
+            this.programme = row;
 
+        },
 
+        move(direction) {
 
+            const end = direction + this.index;
 
+            this.programme = { ...this.tableData[end] };
 
+            this.index = end;
 
+        }
 
+    }
 
+};
 
+</script>
 
+<style lang="less" scoped>
 
+.right {
 
+    float: right;
 
+}
 
+/deep/.el-form-item--mini.el-form-item,
 
+.el-form-item--small.el-form-item {
 
+    margin-bottom: 10px;
 
+}
 
+.videoDialog {
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+    .el-dialog {
 
+        max-width: 900px;
 
+        margin-top: 0px;
 
+
 
+        .close {
 
+            position: absolute;
 
+            right: 0px;
 
+            top: -42px;
 
+            width: 71px;
 
+            height: 32px;
 
+            background: #00000015;
 
+
 
+            font-size: 12px;
 
+            color: #fdffff;
 
+            line-height: 32px;
 
+            text-align: center;
 
+            cursor: pointer;
 
+
 
+            &:hover {
 
+                background: #00000055;
 
+            }
 
+        }
 
+    }
 
+    .el-dialog__header {
 
+        display: none;
 
+    }
 
+
 
+    .el-dialog__body {
 
+        padding: 0;
 
+
 
+        video {
 
+            display: block;
 
+            height: auto;
 
+            width: 100%;
 
+            outline: none;
 
+        }
 
+    }
 
+}
 
+</style>

+ 59 - 29
src/main/vue/src/views/performance/ProgrammeList.vue
Просмотреть файл 

@@ -236,9 +236,9 @@
 
                 :formatter="programmeStatusFormatter"
 
                 :formatter="programmeStatusFormatter"
 
             ></el-table-column>
 
             ></el-table-column>
 
             <el-table-column label="操作" align="left" fixed="right" min-width="260">
 
             <el-table-column label="操作" align="left" fixed="right" min-width="260">
 
-                <template slot-scope="{ row }">
 
+                <template slot-scope="{ row, $index }">
 
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
 
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
 
-                    <el-button
 
+                    <!-- <el-button
 
                         type="warning"
 
                         type="warning"
 
                         @click="playImg(row)"
 
                         @click="playImg(row)"
 
                         v-if="
 
                         v-if="
 
@@ -271,8 +271,8 @@
 
                         size="mini"
 
                         size="mini"
 
                         plain
 
                         plain
 
                         >浏览图片</el-button
 
                         >浏览图片</el-button
 
-                    >
 
-                    <el-button type="warning" @click="playVideo(row)" v-else size="mini" plain>浏览视频</el-button>
 
+                    > -->
 
+                    <el-button type="warning" @click="playVideo(row, $index)" size="mini" plain>查看作品</el-button>
 
                     <el-button
 
                     <el-button
 
                         @click="audit(row, 'AUDIT_FAILED')"
 
                         @click="audit(row, 'AUDIT_FAILED')"
 
                         type="danger"
 
                         type="danger"
 
@@ -290,7 +290,6 @@
 
                         >撤回</el-button
 
                         >撤回</el-button
 
                     >
 
                     >
 
                     <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button> -->
 
                     <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button> -->
 
-                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
 
                 </template>
 
                 </template>
 
             </el-table-column>
 
             </el-table-column>
 
         </el-table>
 
         </el-table>
 
@@ -322,23 +321,47 @@
 
             </div>
 
             </div>
 
         </el-dialog>
 
         </el-dialog>
 
 
 
+        <!-- <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
 
+            <video
 
+                :src="programme.video"
 
+                controls
 
+                style="height: 600px; width: 85%; margin: 0 auto"
 
+                v-if="programme.video"
 
+            >
 
+                您的浏览器不支持 video 标签。
 
+            </video>
 
+            <div style="width: 85%; height:600px;margin: 0 auto" v-if="programme.annex">
 
+                <img style="max-height:100%; max-width: 100%; " :src="programme.annex" alt="" />
 
+            </div>
 
+            <div style="margin: 10px 10px">
 
+                <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
 
+                <el-button size="mini" @click="move(1)" :disabled="(page - 1) * pageSize + index == totalElements - 1"
 
+                    >下一个</el-button
 
+                >
 
+                <el-button @click="showViedo = false" size="mini">关闭</el-button>
 
+            </div>
 
+        </el-dialog> -->
 
         <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
 
         <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
 
             <video
 
             <video
 
-                :src="videoUrl"
 
-                controlsList="nodownload noremote footbar"
 
+                :src="programme.video"
 
                 controls
 
                 controls
 
-                style="height: 600px; width: 100%"
 
-                oncontextmenu="return false;"
 
-                ref="video"
 
-                v-if="showViedo"
 
+                style="max-height: 600px; max-width: 100%; margin: 0 auto"
 
+                v-if="programme.video"
 
             >
 
             >
 
                 您的浏览器不支持 video 标签。
 
                 您的浏览器不支持 video 标签。
 
             </video>
 
             </video>
 
+            <!-- <div style="width: 85%; height:600px;margin: 0 auto" v-if="programme.annex"> -->
 
+            <img style="max-height:600px; max-width: 100%; " :src="programme.annex" alt="" v-if="programme.annex" />
 
+            <!-- </div> -->
 
+            <div style="margin: 10px">
 
+                <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
 
+                <el-button size="mini" @click="move(1)" :disabled="(page - 1) * pageSize + index == totalElements - 1"
 
+                    >下一个</el-button
 
+                >
 
+                <el-button @click="showViedo = false" size="mini">关闭</el-button>
 
+            </div>
 
         </el-dialog>
 
         </el-dialog>
 
         <programme-log :dialogVisible="isShow" @close="isShow = false" ref="public"></programme-log>
 
         <programme-log :dialogVisible="isShow" @close="isShow = false" ref="public"></programme-log>
 
-        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showImg" width="35%">
 
-            <img style="height: 100%; width: 100%;" :src="annex" alt="" />
 
-        </el-dialog>
 
     </div>
 
     </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
@@ -392,7 +415,9 @@ export default {
 
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
 
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
 
                 { label: '审核未通过', value: 'REVIEW_FAILED' }
 
                 { label: '审核未通过', value: 'REVIEW_FAILED' }
 
             ],
 
             ],
 
-            showMore: false
 
+            showMore: false,
 
+            programme: {},
 
+            index: 0
 
         };
 
         };
 
     },
 
     },
 
     created() {
 
     created() {
 
@@ -661,14 +686,9 @@ export default {
 
         showCode(row) {
 
         showCode(row) {
 
             this.dialogCode = true;
 
             this.dialogCode = true;
 
             this.dialogUrl =
 
             this.dialogUrl =
 
-                'http://wljtest.izouma.com/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
 
+                'http://yskj.njlyw.cn:8081/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
 
         },
 
         },
 
         clearSearch() {
 
         clearSearch() {
 
-            // this.competitionGroup = '';
 
-            // this.levelSettingId = '';
 
-            // this.gradingOrganizationId = '';
 
-            // this.organizationId = '';
 
-            // this.specialtyId = '';
 
             this.form = {};
 
             this.form = {};
 
             this.getData();
 
             this.getData();
 
         },
 
         },
 
@@ -697,14 +717,14 @@ export default {
 
         // closeEvent() {
 
         // closeEvent() {
 
         //     document.exitPictureInPicture();
 
         //     document.exitPictureInPicture();
 
         // },
 
         // },
 
-        playVideo(row) {
 
-            if (row.video) {
 
-                this.showViedo = true;
 
-                this.videoUrl = row.video;
 
-            } else {
 
-                this.$message.success('暂无视频');
 
-            }
 
-        },
 
+        // playVideo(row) {
 
+        //     if (row.video) {
 
+        //         this.showViedo = true;
 
+        //         this.videoUrl = row.video;
 
+        //     } else {
 
+        //         this.$message.success('暂无视频');
 
+        //     }
 
+        // },
 
         playImg(row) {
 
         playImg(row) {
 
             if (row.annex) {
 
             if (row.annex) {
 
                 this.showImg = true;
 
                 this.showImg = true;
 
@@ -751,6 +771,16 @@ export default {
 
                     });
 
                     });
 
                     this.$set(row, 'loading', false);
 
                     this.$set(row, 'loading', false);
 
                 });
 
                 });
 
+        },
 
+        playVideo(row, index) {
 
+            this.index = index;
 
+            this.showViedo = true;
 
+            this.programme = row;
 
+        },
 
+        move(direction) {
 
+            const end = direction + this.index;
 
+            this.programme = { ...this.tableData[end] };
 
+            this.index = end;
 
         }
 
         }
 
     }
 
     }
 
 };
 
 };

+ 2 - 6
src/main/vue/src/views/performance/ProgrammeScoreList.vue
Просмотреть файл 

@@ -464,12 +464,8 @@ export default {
 
         },
 
         },
 
         playVideo(row, index) {
 
         playVideo(row, index) {
 
             this.index = index;
 
             this.index = index;
 
-            if (row.video) {
 
-                this.showViedo = true;
 
-                this.programme = row;
 
-            } else {
 
-                this.$message.success('暂无视频');
 
-            }
 
+            this.showViedo = true;
 
+            this.programme = row;
 
         },
 
         },
 
         move(direction) {
 
         move(direction) {
 
             const end = direction + this.index;
 
             const end = direction + this.index;

+ 7 - 24
src/main/vue/src/views/rate/RateDistrictList.vue
Просмотреть файл 

@@ -280,25 +280,6 @@
 
             >
 
             >
 
             </el-pagination>
 
             </el-pagination>
 
         </div>
 
         </div>
 
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
-            <div style="height: 150px;width:330px;margin:2px auto">
 
-                <label style="margin-right: 10px">退回缘由</label>
 
-                <el-select
 
-                    v-model="reason"
 
-                    filterable
 
-                    allow-create
 
-                    default-first-option
 
-                    clearable
 
-                    placeholder="请选择缘由"
 
-                    style="width: 70%"
 
-                >
 
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
 
-                </el-select>
 
-                <div style="margin: 45px 0 0 240px">
 
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
 
-                </div>
 
-            </div>
 
-        </el-dialog> -->
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
                 <el-input
 
                 <el-input
 
@@ -354,7 +335,7 @@ export default {
 
         },
 
         },
 
         ...mapState(['userInfo']),
 
         ...mapState(['userInfo']),
 
         moreWidth() {
 
         moreWidth() {
 
-            let larges = ['FIRST_REVIEW_COMPLETED', 'FIRST_REVIEW_COMPLETED', 'ACCEPT'];
 
+            let larges = ['FIRST_REVIEW_COMPLETED', 'FIRST_REVIEW_COMPLETED', 'ACCEPT', 'REVIEW_DENY'];
 
             let mendus = ['SUBMIT_PAPER_MATERIALS'];
 
             let mendus = ['SUBMIT_PAPER_MATERIALS'];
 
 
 
             let list = [...this.tableData];
 
             let list = [...this.tableData];
 
@@ -363,9 +344,8 @@ export default {
 
                 if (larges.includes(list[i].status)) {
 
                 if (larges.includes(list[i].status)) {
 
                     size = 300;
 
                     size = 300;
 
                     break;
 
                     break;
 
-                }
 
-                if (mendus.includes(list[i].status)) {
 
-                    size = 200;
 
+                } else if (mendus.includes(list[i].status)) {
 
+                    size = 220;
 
                     continue;
 
                     continue;
 
                 }
 
                 }
 
             }
 
             }
 
@@ -393,7 +373,10 @@ export default {
 
             return '';
 
             return '';
 
         },
 
         },
 
         beforeGetData() {
 
         beforeGetData() {
 
-            let data = { sort: 'createdAt,desc', query: { submit: true, district: this.userInfo.district } };
 
+            let data = {
 
+                sort: 'sort,desc;score,desc;',
 
+                query: { submit: true, district: this.userInfo.district }
 
+            };
 
             if (this.search) {
 
             if (this.search) {
 
                 data.search = this.search;
 
                 data.search = this.search;
 
             }
 
             }

+ 2 - 30
src/main/vue/src/views/rate/RateDistrictListDone.vue
Просмотреть файл 

@@ -178,14 +178,6 @@
 
                     >
 
                     >
 
                         退回申请
 
                         退回申请
 
                     </el-button>
 
                     </el-button>
 
-                    <!-- <el-button
 
-                        @click="supervision(row.id)"
 
-                        type="success"
 
-                        size="mini"
 
-                        plain
 
-                        v-if="(row.status === 'ASSIGN_EXPERT') & display"
 
-                        >分配专家组</el-button
 
-                    > -->
 
                     <el-button
 
                     <el-button
 
                         v-if="row.status === 'SUBMIT_PAPER_MATERIALS'"
 
                         v-if="row.status === 'SUBMIT_PAPER_MATERIALS'"
 
                         type="success"
 
                         type="success"
 
@@ -220,25 +212,6 @@
 
             >
 
             >
 
             </el-pagination>
 
             </el-pagination>
 
         </div>
 
         </div>
 
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
-            <div style="height: 150px;width:330px;margin:2px auto">
 
-                <label style="margin-right: 10px">退回缘由</label>
 
-                <el-select
 
-                    v-model="reason"
 
-                    filterable
 
-                    allow-create
 
-                    default-first-option
 
-                    clearable
 
-                    placeholder="请选择缘由"
 
-                    style="width: 70%"
 
-                >
 
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
 
-                </el-select>
 
-                <div style="margin: 45px 0 0 240px">
 
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
 
-                </div>
 
-            </div>
 
-        </el-dialog> -->
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
                 <el-input
 
                 <el-input
 
@@ -305,7 +278,7 @@ export default {
 
                     break;
 
                     break;
 
                 }
 
                 }
 
                 if (mendus.includes(list[i].status)) {
 
                 if (mendus.includes(list[i].status)) {
 
-                    size = 200;
 
+                    size = 220;
 
                     continue;
 
                     continue;
 
                 }
 
                 }
 
             }
 
             }
 
@@ -341,7 +314,7 @@ export default {
 
             //     }
 
             //     }
 
             // };
 
             // };
 
             let data = {
 
             let data = {
 
-                sort: 'createdAt,desc',
 
+                sort: 'sort,desc;score,desc;',
 
                 query: {
 
                 query: {
 
                     submit: true,
 
                     submit: true,
 
                     district: this.userInfo.district,
 
                     district: this.userInfo.district,
 
@@ -350,7 +323,6 @@ export default {
 
                         'ASSIGN_EXPERT',
 
                         'ASSIGN_EXPERT',
 
                         'REVIEW_PENDING',
 
                         'REVIEW_PENDING',
 
                         'SUBMIT_GRADE',
 
                         'SUBMIT_GRADE',
 
-                        'SUBMIT_PAPER_MATERIALS',
 
                         'COLLECT_PAPER_MATERIALS',
 
                         'COLLECT_PAPER_MATERIALS',
 
                         'COMPLETE'
 
                         'COMPLETE'
 
                     ]
 
                     ]

+ 10 - 24
src/main/vue/src/views/rate/RateDistrictListPending.vue
Просмотреть файл 

@@ -212,25 +212,6 @@
 
             >
 
             >
 
             </el-pagination>
 
             </el-pagination>
 
         </div>
 
         </div>
 
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
-            <div style="height: 150px;width:330px;margin:2px auto">
 
-                <label style="margin-right: 10px">退回缘由</label>
 
-                <el-select
 
-                    v-model="reason"
 
-                    filterable
 
-                    allow-create
 
-                    default-first-option
 
-                    clearable
 
-                    placeholder="请选择缘由"
 
-                    style="width: 70%"
 
-                >
 
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
 
-                </el-select>
 
-                <div style="margin: 45px 0 0 240px">
 
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
 
-                </div>
 
-            </div>
 
-        </el-dialog> -->
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
             <div style="height: 150px;width:400px;margin:2px auto">
 
                 <el-input
 
                 <el-input
 
@@ -295,9 +276,8 @@ export default {
 
                 if (larges.includes(list[i].status)) {
 
                 if (larges.includes(list[i].status)) {
 
                     size = 300;
 
                     size = 300;
 
                     break;
 
                     break;
 
-                }
 
-                if (mendus.includes(list[i].status)) {
 
-                    size = 200;
 
+                } else if (mendus.includes(list[i].status)) {
 
+                    size = 220;
 
                     continue;
 
                     continue;
 
                 }
 
                 }
 
             }
 
             }
 
@@ -326,11 +306,17 @@ export default {
 
         },
 
         },
 
         beforeGetData() {
 
         beforeGetData() {
 
             let data = {
 
             let data = {
 
-                sort: 'createdAt,desc',
 
+                sort: 'sort,desc;score,desc;',
 
                 query: {
 
                 query: {
 
                     submit: true,
 
                     submit: true,
 
                     district: this.userInfo.district,
 
                     district: this.userInfo.district,
 
-                    status: ['FIRST_REVIEW_PENDING', 'ACCEPT', 'FIRST_REVIEW_COMPLETED', 'REVIEW_DENY']
 
+                    status: [
 
+                        'FIRST_REVIEW_PENDING',
 
+                        'ACCEPT',
 
+                        'FIRST_REVIEW_COMPLETED',
 
+                        'REVIEW_DENY',
 
+                        'SUBMIT_PAPER_MATERIALS'
 
+                    ]
 
                 }
 
                 }
 
             };
 
             };
 
             if (this.search) {
 
             if (this.search) {

+ 1 - 1
src/test/java/com/izouma/wenlvju/service/sms/NjwlSmsServiceTest.java
Просмотреть файл 

@@ -15,7 +15,7 @@ public class NjwlSmsServiceTest extends ApplicationTests {
 
         String body = "尊敬的调研对象：\n" +
 
         String body = "尊敬的调研对象：\n" +
 
                 "您好，为贯彻落实国家、省、市关于“双减”工作相关文件精神，了解和掌握我市文化艺术类校外培训机构相关情况，市文旅局决定开展全市文化艺术类校外培训机构网上问卷调查，如从事文化艺术类校外培训，请登录：http://wljtest.izouma.com/h5/trainingInstitution，填写调查问卷，如不从事文化艺术类校外培训，请忽略本条信息，谢谢。\n";
 
                 "您好，为贯彻落实国家、省、市关于“双减”工作相关文件精神，了解和掌握我市文化艺术类校外培训机构相关情况，市文旅局决定开展全市文化艺术类校外培训机构网上问卷调查，如从事文化艺术类校外培训，请登录：http://wljtest.izouma.com/h5/trainingInstitution，填写调查问卷，如不从事文化艺术类校外培训，请忽略本条信息，谢谢。\n";
 
         ;
 
         ;
 
-        njwlSmsService.sendSms("15150689190", body);
 
+        njwlSmsService.sendSms("19951988293", body);
 
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
 
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
 
     }
 
     }

+ 0 - 26
src/test/java/com/izouma/wenlvju/service/storage/AliStorageServiceTest.java
Просмотреть файл 

@@ -1,26 +0,0 @@
 
-package com.izouma.wenlvju.service.storage;
 
-
 
-import com.izouma.wenlvju.ApplicationTests;
 
-import com.izouma.wenlvju.domain.Rate;
 
-import com.izouma.wenlvju.exception.BusinessException;
 
-import com.izouma.wenlvju.repo.RateRepo;
 
-import org.junit.Test;
 
-import org.springframework.beans.factory.annotation.Autowired;
 
-
 
-
 
-public class AliStorageServiceTest extends ApplicationTests {
 
-
 
-    @Autowired
 
-    private AliStorageService aliStorageService;
 
-    @Autowired
 
-    private RateRepo          rateRepo;
 
-
 
-    @Test
 
-    public void rename() {
 
-        Rate wu = rateRepo.findById(12696L).orElseThrow(new BusinessException("wu"));
 
-        wu.getPrivacyPolicy().forEach(img -> {
 
-            img.lastIndexOf("/");
 
-        });
 
-//        aliStorageService.rename("application/2021-08-30-18-18-18DKdQtyCS.", "application/2021-08-30-18-18-18DKdQtyCS.jpg");
 
-    }
 
-}