licailing пре 4 година
родитељ
комит
f9171e7b2b

+ 1 - 1
src/main/h5/src/views/TrainingInstitution.vue

@@ -387,7 +387,7 @@
       </template>
     </van-form>
 
-    <van-divider> 技术客服:18205083565</van-divider>
+    <van-divider> 技术客服:19951988293</van-divider>
   </div>
 </template>
 

+ 28 - 13
src/main/java/com/izouma/wenlvju/dto/ProgrammeShowDTO.java

@@ -1,67 +1,82 @@
 package com.izouma.wenlvju.dto;
 
 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.Programme;
 import com.izouma.wenlvju.enums.CompetitionGroup;
 import com.izouma.wenlvju.enums.ProgrammeStatus;
+import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class ProgrammeShowDTO {
+    @ExcelProperty(value = "节目编号")
     private Long id;
 
-    @ApiModelProperty(value = "活动名称")
+    @ExcelIgnore
     private String performance;
 
-    @ApiModelProperty(value = "节目名称")
+    @ExcelProperty(value = "节目名称")
     private String name;
 
-    @ApiModelProperty(value = "参赛专业")
+    @ExcelProperty(value = "参赛专业")
     private String specialty;
 
-    @ApiModelProperty(value = "参赛组别")
+    @EnumFormat(value = CompetitionGroup.class,
+            fromExcel = {"个人", "集体"},
+            toJavaEnum = {"SINGLE", "COLLECTIVE"})
+    @ExcelProperty(value = "参赛组别", converter = EnumExcelConverter.class)
+    @Enumerated(EnumType.STRING)
     private CompetitionGroup competitionGroup;
 
-    @ApiModelProperty(value = "参赛级别")
+    @ExcelProperty(value = "参赛级别")
     private String level;
 
-    @ApiModelProperty(value = "作品时长")
+    @ExcelProperty(value = "作品时长")
     private int durationOfWork;
 
-    @ApiModelProperty(value = "指导老师")
+    @ExcelProperty(value = "指导老师")
     private String instructor;
 
-    @ApiModelProperty(value = "考级机构")
+    @ExcelProperty(value = "考级机构")
     private String gradingOrganization;
 
-    @ApiModelProperty(value = "承办单位")
+    @ExcelProperty(value = "承办单位")
     private String organization;
 
-    @ApiModelProperty(value = "考级点")
+    @ExcelProperty(value = "考级点")
     private String examPoint;
 
-    @ApiModelProperty(value = "联系人")
+    @ExcelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "参赛人数")
+    @ExcelProperty(value = "参赛人数")
     private int quantity;
 
-    @ApiModelProperty(value = "评分")
+    @ExcelProperty(value = "评分")
     private Double score;
 
+    @ExcelIgnore
     private String video;
 
+    @ExcelIgnore
     private String annex;
 
+    @ExcelIgnore
     private ProgrammeStatus programmeStatus;
 
+    @ExcelIgnore
     private List<ParticipantDTO> participants;
 
     public ProgrammeShowDTO(Programme programme) {

+ 2 - 0
src/main/java/com/izouma/wenlvju/security/WebSecurityConfig.java

@@ -71,6 +71,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/district/NJ").permitAll()
                 .antMatchers("/setting/byFlag").permitAll()
                 .antMatchers("/programme/getShow/**").permitAll()
+                .antMatchers("/programme/excelGO").permitAll()
+                .antMatchers("/programme/showAll").permitAll()
                 .antMatchers("/programme/getAuth").permitAll()
                 .antMatchers("/programme/getScore/**").permitAll()
                 .antMatchers("/organization/byName").permitAll()

+ 7 - 0
src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -96,6 +96,13 @@ public class ProgrammeController extends BaseController {
         ExcelUtils.export(response, data);
     }
 
+    @GetMapping("/excelGO")
+    @ResponseBody
+    public void excelGO(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ProgrammeShowDTO> data = this.showAll(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
     @GetMapping(value = "/excelTemp", produces = "application/vnd.ms-excel;charset=utf-8")
     public void excelTemp(HttpServletResponse response) throws IOException {
 //        ExcelUtils.export1(response, ProgrammeDTO.class);

+ 328 - 0
src/main/vue/src/components/ProgrammeLog1.vue

@@ -0,0 +1,328 @@
+<template>
+    <el-dialog
+        v-loading="saving"
+        @close="closeDialog"
+        title="节目详情"
+        center
+        :visible.sync="dialogVisible"
+        width="800px"
+    >
+        <div class="edit-view">
+            <el-form
+                :model="formData"
+                :rules="rules"
+                ref="form"
+                label-width="80px"
+                label-position="right"
+                size="small"
+                style="max-width: 700px;"
+            >
+                <el-timeline>
+                    <el-timeline-item placement="top" size="normal" timestamp="节目信息">
+                        <el-card shadow="hover" :body-style="{ padding: '20px' }">
+                            <el-form-item prop="name" label="节目名称">
+                                <el-input v-model="formData.name" class="width" readonly></el-input>
+                            </el-form-item>
+                            <el-form-item prop="specialtyId" label="参赛专业">
+                                <el-input v-model="formData.specialty" class="width" readonly></el-input>
+                            </el-form-item>
+                            <el-form-item prop="competitionGroup" label="参赛组别">
+                                <el-select
+                                    v-model="formData.competitionGroup"
+                                    class="width"
+                                    clearable
+                                    filterable
+                                    placeholder="请选择"
+                                    disabled
+                                >
+                                    <el-option
+                                        v-for="(item, index) in competitionGroupOptions"
+                                        :key="index"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    >
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item prop="levelSettingId" label="参赛级别" v-if="formData.competitionGroup">
+                                <el-input v-model="formData.level" class="width" readonly></el-input>
+                            </el-form-item>
+                            <el-form-item
+                                prop="durationOfWork"
+                                label="作品时长"
+                                v-if="
+                                    formData.specialtyId !== 187 &&
+                                        formData.specialtyId !== 188 &&
+                                        formData.specialtyId !== 189 &&
+                                        formData.specialtyId !== 190 &&
+                                        formData.specialtyId !== 191 &&
+                                        formData.specialtyId !== 192 &&
+                                        formData.specialtyId !== 193 &&
+                                        formData.specialtyId !== 194 &&
+                                        formData.specialtyId !== 589 &&
+                                        formData.specialtyId !== 590 &&
+                                        formData.specialtyId !== 591 &&
+                                        formData.specialtyId !== 592 &&
+                                        formData.specialtyId !== 593 &&
+                                        formData.specialtyId !== 594 &&
+                                        formData.specialtyId !== 595 &&
+                                        formData.specialtyId !== 596 &&
+                                        formData.specialtyId !== 597 &&
+                                        formData.specialtyId !== 598 &&
+                                        formData.specialtyId !== 599 &&
+                                        formData.specialtyId !== 600 &&
+                                        formData.specialtyId !== 601 &&
+                                        formData.specialtyId !== 602 &&
+                                        formData.specialtyId !== 603 &&
+                                        formData.specialtyId !== 604 &&
+                                        formData.specialtyId !== 605
+                                "
+                            >
+                                <el-input v-model="formData.durationOfWork" class="width" readonly></el-input>
+                            </el-form-item>
+                            <el-form-item prop="instructor" label="指导老师">
+                                <el-input v-model="formData.instructor" class="width" readonly></el-input>
+                            </el-form-item>
+                            <div
+                                v-if="
+                                    formData.specialty == '中国画' ||
+                                        formData.specialty == '美术' ||
+                                        formData.specialty == '西画' ||
+                                        formData.specialty == '书法' ||
+                                        formData.specialty == '漫画' ||
+                                        formData.specialty == '手工技艺' ||
+                                        formData.specialty == '摄影' ||
+                                        formData.specialty == '篆刻' ||
+                                        formData.specialty == '人物' ||
+                                        formData.specialty == '山水' ||
+                                        formData.specialty == '花鸟' ||
+                                        formData.specialty == '素描' ||
+                                        formData.specialty == '速写' ||
+                                        formData.specialty == '水粉画' ||
+                                        formData.specialty == '水彩画' ||
+                                        formData.specialty == '油画' ||
+                                        formData.specialty == '软笔书法' ||
+                                        formData.specialty == '硬笔书法' ||
+                                        formData.specialty == '剪纸' ||
+                                        formData.specialty == '泥塑' ||
+                                        formData.specialty == '年画' ||
+                                        formData.specialty == '皮影制作' ||
+                                        formData.specialty == '陶艺' ||
+                                        formData.specialty == '染织' ||
+                                        formData.specialty == '版画'
+                                "
+                            >
+                                <el-form-item prop="annex" v-if="formData.annex" label="作品图片">
+                                    <img class="imgBox" :src="formData.annex" alt="" />
+                                </el-form-item>
+                            </div>
+                            <div v-else>
+                                <el-form-item prop="video" label="作品视频" v-if="formData.video">
+                                    <video-upload v-model="videos" class="width" :readonly="true"></video-upload>
+                                </el-form-item>
+                            </div>
+                        </el-card>
+                    </el-timeline-item>
+                    <el-collapse-transition>
+                        <div v-show="showMore">
+                            <el-timeline-item placement="top" size="normal" timestamp="单位信息">
+                                <el-card shadow="hover" :body-style="{ padding: '20px' }">
+                                    <el-form-item prop="gradingOrganizationId" label="考级机构">
+                                        <el-input
+                                            v-model="formData.gradingOrganization"
+                                            class="width"
+                                            readonly
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item prop="organizationId" label="承办单位">
+                                        <el-input v-model="formData.organization" class="width" readonly></el-input>
+                                    </el-form-item>
+                                    <el-form-item prop="examPoint" label="考级点">
+                                        <el-input v-model="formData.examPoint" class="width" readonly></el-input>
+                                    </el-form-item>
+                                    <el-form-item prop="contact" label="联系人">
+                                        <el-input v-model="formData.contact" class="width" readonly></el-input>
+                                    </el-form-item>
+                                    <el-form-item prop="phone" label="联系电话">
+                                        <el-input v-model="formData.phone" class="width" readonly></el-input>
+                                    </el-form-item>
+                                </el-card>
+                            </el-timeline-item>
+
+                            <el-timeline-item placement="top" size="normal" timestamp="参演人员">
+                                <el-card shadow="hover" :body-style="{ padding: '20px' }">
+                                    <el-table
+                                        :data="participants"
+                                        ref="table"
+                                        header-row-class-name="table-header-row"
+                                        header-cell-class-name="table-header-cell"
+                                        row-class-name="table-row"
+                                        cell-class-name="table-cell"
+                                    >
+                                        <el-table-column prop="img" label="证件照">
+                                            <template slot-scope="{ row }">
+                                                <el-image
+                                                    style="width: 30px; height: 30px;"
+                                                    :src="row.img"
+                                                    fit="cover"
+                                                    :preview-src-list="[row.img]"
+                                                ></el-image>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column prop="name" label="姓名" min-width="80"> </el-table-column>
+                                        <el-table-column prop="birthday" label="出生年月" min-width="100">
+                                        </el-table-column>
+                                        <el-table-column prop="sex" label="性别" min-width="70"> </el-table-column>
+                                        <el-table-column prop="phone" label="联系方式" min-width="100">
+                                        </el-table-column>
+                                        <el-table-column prop="certificate" label="考级证书">
+                                            <template slot-scope="{ row }">
+                                                <el-image
+                                                    style="width: 30px; height: 30px;"
+                                                    :src="row.certificate"
+                                                    fit="cover"
+                                                    :preview-src-list="[row.certificate]"
+                                                ></el-image>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column prop="idNo" label="身份证号" min-width="100">
+                                        </el-table-column>
+                                    </el-table>
+                                </el-card>
+                            </el-timeline-item>
+                        </div>
+                    </el-collapse-transition>
+                    <div style="width:100%;textAlign:center">
+                        <el-button
+                            class="more"
+                            round
+                            type="primary"
+                            :plain="!showMore"
+                            :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
+                            @click="showMore = !showMore"
+                        ></el-button>
+                    </div>
+                </el-timeline>
+                <!-- <el-form-item> </el-form-item> -->
+            </el-form>
+            <!-- <div class="btn">
+                <el-button @click="$router.go(-1)">返回</el-button>
+            </div> -->
+        </div>
+    </el-dialog>
+</template>
+<script>
+import delChild from '@/mixins/delChild';
+import { mapState } from 'vuex';
+export default {
+    name: 'ProgrammeShow',
+    mixins: [delChild],
+    props: ['dialogVisible'],
+    created() {},
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            show: false,
+            showMore: false,
+            videos: {},
+            level: '',
+            rules: {
+                phone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            competitionGroupOptions: [
+                { label: '个人', value: 'SINGLE' },
+                { label: '集体', value: 'COLLECTIVE' }
+            ],
+            levelSingleOptions: [],
+            levelCollectiveOptions: [],
+            gradingOrganizationIdOptions: [],
+            organizationIdOptions: [],
+            artTypes: [],
+            optionProps: {
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                expandTrigger: 'hover'
+            },
+            participants: [],
+            programmeId: ''
+        };
+    },
+    methods: {
+        dataApi(id) {
+            if (id) {
+                this.$http
+                    .get('programme/getShow/' + id)
+                    .then(res => {
+                        this.formData = res;
+                        this.participants = res.participants;
+                        // console.log(res);
+                        this.videos = {
+                            src: res.video
+                        };
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        closeDialog() {
+            this.$emit('close');
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.edit-view {
+    padding: 0 0;
+    background-color: transparent;
+}
+.width {
+    width: 260px;
+}
+// /deep/ .el-timeline-item {
+//     padding-bottom: 35px;
+// }
+.imgBox {
+    width: 178px;
+    height: 178px;
+    border-radius: 4px;
+}
+.btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    background: #ffffff;
+    height: 50px;
+    line-height: 50px;
+    z-index: 999;
+    margin-left: -20px;
+    padding-left: 20px;
+}
+/deep/.el-input.is-disabled .el-input__inner {
+    background-color: #ffffff;
+    color: #606266;
+}
+/deep/.el-timeline-item__timestamp {
+    color: #0561d9;
+    line-height: 1;
+    font-size: 14px;
+}
+/deep/.el-timeline-item__node {
+    background-color: #5b9bed;
+}
+/deep/.el-timeline-item__tail {
+    border-left: 2px solid #7cace9;
+}
+</style>

+ 60 - 97
src/main/vue/src/views/performance/ProgrammeGOList.vue

@@ -18,49 +18,48 @@
                             </el-cascader>
                         </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-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
@@ -69,8 +68,6 @@
                                         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>
@@ -93,7 +90,8 @@
                                         </el-option>
                                     </el-select> </el-form-item
                             ></el-col>
-
+                        </el-row>
+                        <el-row>
                             <el-col :span="8"
                                 ><el-form-item label="参赛级别" v-if="form.competitionGroup">
                                     <el-select
@@ -194,50 +192,35 @@
             <!-- <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">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
+            <el-table-column prop="organization" label="承办单位" min-width="160">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
+            <el-table-column prop="examPoint" label="考级点" min-width="160">
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
             </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"
+                min-width="100"
                 :formatter="programmeStatusFormatter"
             ></el-table-column>
-            <el-table-column label="操作" align="left" fixed="right" min-width="260">
+            <el-table-column label="操作" align="left" fixed="right" min-width="180">
                 <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"
@@ -250,12 +233,6 @@
             >
             </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"
@@ -283,8 +260,7 @@
 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';
+import ProgrammeLog from '@/components/ProgrammeLog1.vue';
 export default {
     name: 'ProgrammeList',
     mixins: [pageableTable, delChild],
@@ -444,7 +420,6 @@ export default {
             });
     },
     components: {
-        QrcodeVue,
         ProgrammeLog
     },
     computed: {
@@ -490,15 +465,9 @@ export default {
             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) {
@@ -525,7 +494,9 @@ export default {
             let data = {
                 sort: 'programmeStatus,desc',
                 size: 1000,
-                query: {}
+                query: {
+                    programmeStatus: 'SUBMIT'
+                }
             };
             if (this.form.competitionGroup) {
                 data.query.competitionGroup = this.form.competitionGroup;
@@ -548,12 +519,9 @@ export default {
             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', {
+                .get('/programme/excelGO', {
                     responseType: 'blob',
                     params: data
                 })
@@ -598,11 +566,6 @@ export default {
                     }
                 });
         },
-        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();

+ 3 - 3
src/main/vue/src/views/performance/ProgrammeList.vue

@@ -225,14 +225,14 @@
             <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 prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="130">
             </el-table-column>
-            <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
+            <el-table-column prop="organization" label="承办单位" min-width="170"> </el-table-column>
             <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column>
             <el-table-column
                 prop="programmeStatus"
                 label="节目状态"
-                min-width="180"
+                min-width="90"
                 :formatter="programmeStatusFormatter"
             ></el-table-column>
             <el-table-column label="操作" align="left" fixed="right" min-width="260">