复审/检查记录

src/main/java/com/izouma/wenlvju/domain/regulation/Complain.java

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -21,6 +22,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Entity
+@Where(clause = "del = 0")
 @ApiModel(value = "咨询投诉")
 public class Complain extends BaseEntity {
     @ApiModelProperty(value = "记录人")

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.izouma.wenlvju.domain.performance.Performance;
 import com.izouma.wenlvju.domain.performance.ProgrammeScore;
 import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.enums.PerformanceStatus;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.performance.PerformanceRepo;
 import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
@@ -36,6 +37,11 @@ public class ProgrammeScoreService {
         LocalDateTime now = LocalDateTime.now();
         if (ObjectUtil.isNull(programmeScore)) {
             Performance performance = performanceRepo.findById(performanceId).orElseThrow(new BusinessException("无活动"));
+            // 改状态
+            if (!PerformanceStatus.RATE.equals(performance.getStatus())) {
+                performance.setStatus(PerformanceStatus.RATE);
+                performanceRepo.save(performance);
+            }
             programmeScore = ProgrammeScore.builder()
                     .expertId(userId)
                     .programmeId(programmeId)
@@ -67,7 +73,7 @@ public class ProgrammeScoreService {
         Object avgObj = programmeScoreRepo.avgScore(programmeId);
         if (ObjectUtil.isNotNull(avgObj)) {
             Double avg = Convert.convert(Double.class, avgObj);
-            if (programmeScore.getAuditTimes()>1){
+            if (programmeScore.getAuditTimes() > 1) {
                 programmeRepo.reviewScore(avg, programmeId);
                 return;
             }

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

@@ -799,6 +799,10 @@ public class ProgrammeService {
      */
     public void review(Long performanceId, int pass, Long userId) {
         List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatus(performanceId, ProgrammeStatus.SUBMIT);
+        long count = programmes.stream().filter(programme -> ObjectUtil.isNull(programme.getScore())).count();
+        if (count > 0) {
+            throw new BusinessException("有节目未评分");
+        }
         programmes.sort(Comparator.comparingDouble(Programme::getScore));
         List<Programme> eliminate = programmes.subList(pass, programmes.size());
         List<RateAudit> rateAudits = new ArrayList<>();

src/main/vue/src/components/RecordLog.vue

@@ -31,7 +31,7 @@
                         <el-card shadow="hover" :body-style="{ padding: '20px' }">
                             <div v-if="!item.del">
                                 <el-form-item prop="content" label="其他">
-                                    <el-input :rows="5" type="textarea" v-model="item.content"></el-input>
+                                    <el-input :rows="2" type="textarea" v-model="item.content"></el-input>
                                 </el-form-item>
                                 <el-form-item prop="file" label="作证材料">
                                     <!-- <file-upload v-model="item.file"></file-upload> -->

src/main/vue/src/components/ReviewLog.vue

@@ -35,7 +35,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
-                    <el-button @click="onSave" :loading="saving" type="success">设置</el-button>
+                    <el-button @click="publish" :loading="saving" type="success">发布</el-button>
                     <el-button @click="closeDialog">取消</el-button>
                 </el-form-item>
             </el-form>
@@ -118,6 +118,32 @@ export default {
                     this.$message.error(e.error);
                 });
         },
+        publish() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.$confirm('发布后将不能在修改, 确认发布吗?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.formData.auditTimes += 1;
+                        this.formData.status = 'UNDER_REVIEW';
+
+                        this.$http
+                            .post('/programme/review', { performanceId: this.id, pass: this.pass })
+                            .then(res => {
+                                this.submit();
+                            })
+                            .catch(e => {
+                                console.log(e);
+                                this.$message.error(e.error);
+                            });
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
         count(val) {
             let pass = (this.total * val) / 100;
             this.pass = Math.round(pass);

src/main/vue/src/views/performance/PerformanceList.vue

@@ -49,6 +49,8 @@
                         <span v-if="row.status == 'UNDER_REVIEW'">审核中</span>
                         <span v-else-if="row.status == 'ARRANGE'">分组中</span>
                         <span v-else-if="row.status == 'ARRANGE_JUDGE'">分配评委中</span>
+                        <span v-else-if="row.status == 'SIGN_IN'">签到中</span>
+                        <span v-else-if="row.status == 'RATE'">评分中</span>
                     </el-link>
                 </template>
             </el-table-column>

src/main/vue/src/views/performance/PerformanceListShow.vue

@@ -27,10 +27,15 @@
                     <el-link
                         style="font-size: 13px"
                         :underline="false"
-                        type="info"
+                        type="warning"
                         v-else-if="currentTime > row.endDate"
-                        >已结束</el-link
                     >
+                        <span v-if="row.status == 'UNDER_REVIEW'">审核中</span>
+                        <span v-else-if="row.status == 'ARRANGE'">分组中</span>
+                        <span v-else-if="row.status == 'ARRANGE_JUDGE'">分配评委中</span>
+                        <span v-else-if="row.status == 'SIGN_IN'">签到中</span>
+                        <span v-else-if="row.status == 'RATE'">评分中</span>
+                    </el-link>
                     <el-link
                         style="font-size: 13px"
                         :underline="false"

src/main/vue/src/views/performance/ProgScoreAdminList.vue

@@ -99,10 +99,12 @@
             <el-table-column label="操作" align="left" fixed="right" min-width="150">
                 <template slot-scope="{ row, $index }">
                     <el-button @click="playVideo(row, $index)" size="mini" plain type="primary">查看作品</el-button>
-                    <el-button @click="row.second = true" size="mini" plain type="warning" v-if="!row.second"
-                        >修改</el-button
-                    >
-                    <el-button @click="row.second = false" size="mini" plain type="danger" v-else>取消</el-button>
+                    <div v-if="performance.status == 'RATE'">
+                        <el-button @click="row.second = true" size="mini" plain type="warning" v-if="!row.second"
+                            >修改</el-button
+                        >
+                        <el-button @click="row.second = false" size="mini" plain type="danger" v-else>取消</el-button>
+                    </div>
                 </template>
             </el-table-column>
         </el-table>
@@ -128,10 +130,18 @@
             </el-pagination>
         </div>
 
-        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
-            <video :src="programme.video" controls style="height: 85%; max-width: 85%; margin: 0 auto">
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="60%">
+            <video
+                :src="programme.video"
+                controls
+                style="height: 600px; width: 85%; margin: 0 auto"
+                v-if="programme.video"
+            >
                 您的浏览器不支持 video 标签。
             </video>
+            <div style="height: 85%; width: 85%;margin: 0 auto">
+                <img style="height: 100%; width: 100%; " :src="programme.annex" alt="" v-if="programme.annex" />
+            </div>
             <el-card shadow="never" style="width: 85%; margin: 10px auto">
                 <el-form :form="programme">
                     <el-form-item label="分数">
@@ -150,18 +160,24 @@
                         </el-input-number>
                     </el-form-item>
                     <el-form-item>
-                        <el-button size="mini" v-if="!programme.second" @click="programme.second = true" type="warning"
-                            >修改</el-button
-                        >
-                        <el-button size="mini" v-else @click="saveRow(programme)" type="primary">保存</el-button>
-                        <el-button
-                            @click="programme.second = false"
-                            size="mini"
-                            plain
-                            type="danger"
-                            v-if="programme.second"
-                            >取消</el-button
-                        >
+                        <div v-if="performance.status == 'RATE'">
+                            <el-button
+                                size="mini"
+                                v-if="!programme.second"
+                                @click="programme.second = true"
+                                type="warning"
+                                >修改</el-button
+                            >
+                            <el-button size="mini" v-else @click="saveRow(programme)" type="primary">保存</el-button>
+                            <el-button
+                                @click="programme.second = false"
+                                size="mini"
+                                plain
+                                type="danger"
+                                v-if="programme.second"
+                                >取消</el-button
+                            >
+                        </div>
                         <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
                         <el-button
                             size="mini"
@@ -169,6 +185,7 @@
                             :disabled="(page - 1) * pageSize + index == totalElements - 1"
                             >下一个</el-button
                         >
+                        <el-button @click="showViedo = false" size="mini">关闭</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>

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

@@ -340,7 +340,8 @@ export default {
             programmeStatusOptions: [
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
-                { label: '初选未通过', value: 'AUDIT_FAILED' }
+                { label: '初选未通过', value: 'AUDIT_FAILED' },
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
             ]
         };
     },
@@ -499,6 +500,11 @@ export default {
             if (this.performanceId) {
                 data.query.performanceId = this.performanceId;
             }
+            if (this.$route.query.review) {
+                data.query.programmeStatus = 'SUBMIT';
+            } else {
+                data.query.programmeStatus = '';
+            }
             return data;
         },
         toggleMultipleMode(multipleMode) {

src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -135,10 +135,17 @@
         </div>
 
         <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="60%">
-            <video :src="programme.video" controls style="height: 85%; max-width: 85%; margin: 0 auto">
+            <video
+                :src="programme.video"
+                controls
+                style="height: 600px; width: 85%; margin: 0 auto"
+                v-if="programme.video"
+            >
                 您的浏览器不支持 video 标签。
             </video>
-            <img style="height: 100%; max-width: 100%" :src="programme.annex" alt="" />
+            <div style="height: 85%; width: 85%;margin: 0 auto">
+                <img style="height: 100%; width: 100%; " :src="programme.annex" alt="" v-if="programme.annex" />
+            </div>
             <el-card shadow="never" style="width: 85%; margin: 10px auto">
                 <el-form :form="programme">
                     <el-form-item label="分数">
@@ -153,7 +160,6 @@
                             :step="1"
                             :controls="true"
                             controls-position="both"
-                            @change="saveScore(row)"
                         >
                         </el-input-number>
                     </el-form-item>
@@ -162,15 +168,17 @@
                         <el-input
                             v-else
                             size="mini"
-                            @change="saveScore(row)"
                             v-model="programme.remark"
                             placeholder="请输入备注"
                             style="width: 200px"
                             clearable
                         ></el-input>
                     </el-form-item>
+
                     <el-form-item>
-                        <el-button size="mini" v-if="!programme.second">保存</el-button>
+                        <el-button size="mini" v-if="!programme.second" @click="saveScore(programme)" type="primary"
+                            >保存</el-button
+                        >
                         <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
                         <el-button
                             size="mini"
@@ -178,6 +186,7 @@
                             :disabled="(page - 1) * pageSize + index == totalElements - 1"
                             >下一个</el-button
                         >
+                        <el-button @click="showViedo = false" size="mini">关闭</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
@@ -374,6 +383,7 @@ export default {
                 .then(res => {
                     this.$message.success('评分成功');
                     this.getData();
+                    this.programme = res;
                 })
                 .catch(e => {
                     this.$message.error(e.error);

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

@@ -0,0 +1,745 @@
+<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-select
+                                v-model="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-col>
+                    <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-row>
+                <el-row>
+                    <el-col :span="8"
+                        ><el-form-item label="考级点名称">
+                            <el-input placeholder="考级点名称" v-model="search" clearable></el-input> </el-form-item
+                    ></el-col>
+
+                    <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-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>
+                <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 }">
+                    <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
+                    <el-button
+                        type="warning"
+                        @click="playImg(row)"
+                        v-if="
+                            row.specialty == '中国画' ||
+                                row.specialty == '美术' ||
+                                row.specialty == '西画' ||
+                                row.specialty == '书法' ||
+                                row.specialty == '漫画' ||
+                                row.specialty == '手工技艺' ||
+                                row.specialty == '摄影' ||
+                                row.specialty == '篆刻' ||
+                                row.specialty == '人物' ||
+                                row.specialty == '山水' ||
+                                row.specialty == '花鸟' ||
+                                row.specialty == '素描' ||
+                                row.specialty == '速写' ||
+                                row.specialty == '水粉画' ||
+                                row.specialty == '水彩画' ||
+                                row.specialty == '油画' ||
+                                row.specialty == '软笔书法' ||
+                                row.specialty == '硬笔书法' ||
+                                row.specialty == '剪纸' ||
+                                row.specialty == '泥塑' ||
+                                row.specialty == '年画' ||
+                                row.specialty == '皮影制作' ||
+                                row.specialty == '陶艺' ||
+                                row.specialty == '染织' ||
+                                row.specialty == '版画'
+                        "
+                        size="mini"
+                        plain
+                        >浏览图片</el-button
+                    >
+                    <el-button type="warning" @click="playVideo(row)" v-else 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> -->
+                    <!-- <el-button @click="deleteRow(row)" type="danger" 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="videoUrl"
+                controlsList="nodownload noremote footbar"
+                controls
+                style="height: 600px; width: 100%"
+                oncontextmenu="return false;"
+                ref="video"
+                v-if="showViedo"
+            >
+                您的浏览器不支持 video 标签。
+            </video>
+        </el-dialog>
+        <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>
+</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],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/programme/backAll',
+            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' }
+            ]
+        };
+    },
+    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: 'createdAt,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;
+            }
+            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: 'createdAt,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.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;
+            }
+
+            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://wljtest.izouma.com/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
+        },
+        clearSearch() {
+            // this.competitionGroup = '';
+            // this.levelSettingId = '';
+            // this.gradingOrganizationId = '';
+            // this.organizationId = '';
+            // this.specialtyId = '';
+            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 if (row.annex) {
+                this.showImg = true;
+                this.annex = row.annex;
+            } 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);
+                });
+        }
+    }
+};
+</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>

src/main/vue/src/views/record/RecordRegulationHistory.vue

@@ -55,9 +55,8 @@
             row-class-name="table-row"
             cell-class-name="table-cell"
             :height="tableHeight"
-            @expand-change="expand"
         >
-            <el-table-column type="expand">
+            <!-- <el-table-column type="expand">
                 <template slot-scope="props">
                     <el-card v-if="checkMap.has(props.row.id)">
                         <div v-if="checkMap.get(props.row.id).length === 0">
@@ -86,7 +85,6 @@
                                     >
                                     </el-image>
                                 </div>
-                                <!-- content -->
                             </el-timeline-item>
                         </el-timeline>
                         <div style="margin-left: 26px">
@@ -97,7 +95,7 @@
                         </div>
                     </el-card>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="examinationName" label="考级活动名称" min-width="150"> </el-table-column>
             <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="160">
@@ -112,7 +110,7 @@
             <el-table-column label="操作" align="right" fixed="right" min-width="260">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" size="mini" plain>查看</el-button>
-                    <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</el-button>
+                    <el-button @click="openDrawer(row)" type="warning" size="mini" plain>检查记录</el-button>
                     <el-button size="mini" type="primary" plain>考场监控</el-button>
                 </template>
             </el-table-column>
@@ -138,11 +136,70 @@
             >
             </el-pagination>
         </div>
-        <record-logs ref="dataRef" :dialogVisibles="isShow" @close="isShow = false"></record-logs>
+        <record-log ref="dataRefs" :dialogVisible="isShow" @close="isShow = false"></record-log>
+        <record-logs ref="dataRef" :dialogVisibles="isShows" @close="isShows = false"></record-logs>
+        <el-drawer title="检查记录" :visible.sync="drawer" size="40%" :with-header="false">
+            <div v-if="lists.length <= 0" style="padding:100px 0; font-size: 14px; color: #4a4646">
+                <div style="text-align:center">暂无数据</div>
+            </div>
+            <div style="margin: 30px" v-else>
+                <el-timeline-item :timestamp="item.createdAt" placement="top" v-for="item in lists" :key="item.id">
+                    <div style="font-size: 14px; color: #4a4646">
+                        {{ tipsType[item.type] }}
+                    </div>
+                    <div style="margin-top:5px">
+                        <!-- {{ item.value ? '是' : '否' }} -->
+                        <el-radio-group v-model="item.value" disabled>
+                            <el-radio :label="true">是</el-radio>
+                            <el-radio :label="false">否</el-radio>
+                        </el-radio-group>
+                    </div>
+
+                    <div style="margin-top:5px">
+                        <el-image
+                            v-for="(img, index) in item.img"
+                            :key="index"
+                            :src="img"
+                            style="width:60px;height:60px;margin-right:3px"
+                            :preview-src-list="item.img"
+                        >
+                        </el-image>
+                    </div>
+                </el-timeline-item>
+                <el-timeline reverse>
+                    <el-timeline-item
+                        :timestamp="item.createdAt"
+                        placement="top"
+                        v-for="item in checkMap.get(row.id)"
+                        :key="item.id"
+                    >
+                        <div style="font-size: 14px; color: #4a4646">
+                            {{ item.content }}
+                        </div>
+                        <div style="margin-top:5px">
+                            <el-image
+                                v-for="(img, index) in item.file"
+                                :key="index"
+                                :src="img"
+                                fit="fill"
+                                :lazy="true"
+                                style="width:60px;height:60px;margin-right:3px"
+                                :preview-src-list="item.file"
+                            >
+                            </el-image>
+                        </div>
+                    </el-timeline-item>
+                </el-timeline>
+                <div>
+                    <el-button @click="saveRow(row)" size="mini" plain>编辑</el-button>
+                </div>
+            </div>
+        </el-drawer>
     </div>
 </template>
 <script>
 import pageableTable from '@/mixins/pageableTable';
+import RecordLog from '../../components/RecordLog';
 import RecordLogs from '../../components/RecordLogs';
 import format from 'date-fns/format';
 import startOfDay from 'date-fns/startOfDay';
@@ -152,7 +209,7 @@ import { th } from 'date-fns/locale';
 export default {
     name: 'RecordRegulationHistory',
     mixins: [pageableTable],
-    components: { RecordLogs },
+    components: { RecordLogs, RecordLog },
     created() {
         this.$http
             .get('/district/NJ')
@@ -182,7 +239,11 @@ export default {
             organizer: '',
             dateRange: '',
             currentTime: '',
-            checkMap: new Map()
+            checkMap: new Map(),
+            drawer: false,
+            row: {},
+            lists: [],
+            isShows: false
         };
     },
     computed: {
@@ -235,19 +296,15 @@ export default {
             });
         },
         editRow(row) {
-            this.isShow = true;
+            this.isShows = true;
             this.$refs.dataRef.init(row.id);
         },
         checkRow(row) {
             this.$refs.table.toggleRowExpansion(row, true);
         },
         saveRow(row) {
-            this.$router.push({
-                path: '/recordCheck',
-                query: {
-                    rid: row.id
-                }
-            });
+            this.isShow = true;
+            this.$refs.dataRefs.init(row.id);
         },
         download() {
             this.downloading = true;
@@ -354,6 +411,26 @@ export default {
                 .then(() => {
                     this.checkMap = new Map(checks);
                 });
+            this.$http
+                .post(
+                    'recordExpertAudit/all',
+                    {
+                        size: 20,
+                        query: {
+                            recordId: row.id
+                        }
+                    },
+                    { body: 'json' }
+                )
+                .then(res => {
+                    this.lists = res.content;
+                    // this.empty = res.empty;
+                });
+        },
+        openDrawer(row) {
+            this.drawer = true;
+            this.row = row;
+            this.expand(row);
         }
     }
 };
@@ -376,4 +453,21 @@ export default {
     text-align: right;
     display: inline-block;
 }
+/deep/.el-timeline-item__timestamp {
+    // color: #0561d9;
+    color: #201e1e;
+    line-height: 1;
+    font-size: 14px;
+}
+/deep/.el-timeline-item__node {
+    // background-color: #5b9bed;
+    background-color: #9d9a9a;
+}
+/deep/.el-timeline-item__tail {
+    // border-left: 2px solid #7cace9;
+    border-left: 2px solid #9d9a9a;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #606266; // #409EFF;
+}
 </style>

src/main/vue/src/views/record/RecordRegulationList.vue

@@ -58,69 +58,7 @@
             row-class-name="table-row"
             cell-class-name="table-cell"
             :height="tableHeight"
-            @expand-change="expand"
         >
-            <el-table-column type="expand">
-                <template slot-scope="props">
-                    <el-card v-if="checkMap.has(props.row.id)">
-                        <div v-if="checkMap.get(props.row.id).length === 0">
-                            <div style="text-align:center">暂无数据</div>
-                        </div>
-                        <el-timeline reverse v-else>
-                            <el-timeline-item
-                                :timestamp="item.createdAt"
-                                placement="top"
-                                v-for="item in checkMap.get(props.row.id)"
-                                :key="item.id"
-                            >
-                                <div>
-                                    {{ item.content }}
-                                </div>
-                                <div style="margin-top:5px">
-                                    <el-image
-                                        v-for="(img, index) in item.file"
-                                        :key="index"
-                                        :src="img"
-                                        fit="fill"
-                                        :lazy="true"
-                                        style="width:60px;height:60px;margin-right:3px"
-                                        :preview-src-list="item.file"
-                                    >
-                                    </el-image>
-                                </div>
-                                <!-- content -->
-                            </el-timeline-item>
-                        </el-timeline>
-                        <el-timeline-item
-                            :timestamp="item.createdAt"
-                            placement="top"
-                            v-for="item in lists"
-                            :key="item.id"
-                        >
-                            <div>
-                                {{ tipsType[item.type] }}
-                            </div>
-                            <div style="margin-top:5px">
-                                {{ item.value ? '是' : '否' }}
-                            </div>
-
-                            <div style="margin-top:5px">
-                                <el-image
-                                    v-for="(img, index) in item.img"
-                                    :key="index"
-                                    :src="img"
-                                    style="width:60px;height:60px;margin-right:3px"
-                                    :preview-src-list="item.img"
-                                >
-                                </el-image>
-                            </div>
-                        </el-timeline-item>
-                        <div style="margin-left: 26px">
-                            <el-button @click="saveRow(props.row)" size="mini" plain>编辑</el-button>
-                        </div>
-                    </el-card>
-                </template>
-            </el-table-column>
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="examinationName" label="考级活动名称" min-width="150" sortable> </el-table-column>
             <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="170">
@@ -135,7 +73,7 @@
             <el-table-column label="操作" align="right" fixed="right" min-width="260">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" size="mini" plain>查看</el-button>
-                    <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</el-button>
+                    <el-button @click="openDrawer(row)" type="warning" size="mini" plain>检查记录</el-button>
                     <el-button @click="openRoom(row)" type="primary" size="mini" plain>考场监控</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -164,6 +102,63 @@
         </div>
         <record-log ref="dataRefs" :dialogVisible="isShow" @close="isShow = false"></record-log>
         <record-logs ref="dataRef" :dialogVisibles="isShows" @close="isShows = false"></record-logs>
+        <el-drawer title="检查记录" :visible.sync="drawer" size="40%" :with-header="false">
+            <!-- <div v-if="checkMap.get(row.id).length === 0">
+                <div style="text-align:center">暂无数据</div>
+            </div> -->
+            <div style="margin: 30px">
+                <el-timeline-item :timestamp="item.createdAt" placement="top" v-for="item in lists" :key="item.id">
+                    <div style="font-size: 14px; color: #4a4646">
+                        {{ tipsType[item.type] }}
+                    </div>
+                    <div style="margin-top:5px">
+                        <!-- {{ item.value ? '是' : '否' }} -->
+                        <el-radio-group v-model="item.value" disabled>
+                            <el-radio :label="true">是</el-radio>
+                            <el-radio :label="false">否</el-radio>
+                        </el-radio-group>
+                    </div>
+
+                    <div style="margin-top:5px">
+                        <el-image
+                            v-for="(img, index) in item.img"
+                            :key="index"
+                            :src="img"
+                            style="width:60px;height:60px;margin-right:3px"
+                            :preview-src-list="item.img"
+                        >
+                        </el-image>
+                    </div>
+                </el-timeline-item>
+                <el-timeline reverse>
+                    <el-timeline-item
+                        :timestamp="item.createdAt"
+                        placement="top"
+                        v-for="item in checkMap.get(row.id)"
+                        :key="item.id"
+                    >
+                        <div style="font-size: 14px; color: #4a4646">
+                            {{ item.content }}
+                        </div>
+                        <div style="margin-top:5px">
+                            <el-image
+                                v-for="(img, index) in item.file"
+                                :key="index"
+                                :src="img"
+                                fit="fill"
+                                :lazy="true"
+                                style="width:60px;height:60px;margin-right:3px"
+                                :preview-src-list="item.file"
+                            >
+                            </el-image>
+                        </div>
+                    </el-timeline-item>
+                </el-timeline>
+                <div>
+                    <el-button @click="saveRow(row)" size="mini" plain>编辑</el-button>
+                </div>
+            </div>
+        </el-drawer>
     </div>
 </template>
 <script>
@@ -222,7 +217,9 @@ export default {
                 safetyt: '考点是否配备测量体温设施设备，并有专人值守',
                 safetys: '考级现场是否实施预约限流措施'
             },
-            checkMap: new Map()
+            checkMap: new Map(),
+            drawer: false,
+            row: {}
         };
     },
     computed: {
@@ -394,6 +391,7 @@ export default {
                 .post(
                     'recordExpertAudit/all',
                     {
+                        size: 20,
                         query: {
                             recordId: row.id
                         }
@@ -405,6 +403,11 @@ export default {
                     this.lists = res.content;
                     // this.empty = res.empty;
                 });
+        },
+        openDrawer(row) {
+            this.drawer = true;
+            this.row = row;
+            this.expand(row);
         }
     }
 };
@@ -427,4 +430,21 @@ export default {
     text-align: right;
     display: inline-block;
 }
+/deep/.el-timeline-item__timestamp {
+    // color: #0561d9;
+    color: #201e1e;
+    line-height: 1;
+    font-size: 14px;
+}
+/deep/.el-timeline-item__node {
+    // background-color: #5b9bed;
+    background-color: #9d9a9a;
+}
+/deep/.el-timeline-item__tail {
+    // border-left: 2px solid #7cace9;
+    border-left: 2px solid #9d9a9a;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #606266; // #409EFF;
+}
 </style>

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(300L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(281L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }