统计

src/main/vue/src/components/select/SpecialtyCascader.vue

@@ -0,0 +1,67 @@
+<template>
+    <el-cascader
+        :props="props"
+        filterable
+        v-model="chooseValue"
+        @change="changeSelect"
+        ref="cascader"
+        placeholder="请选择专业"
+        :options="options"
+    ></el-cascader>
+</template>
+
+<script>
+import delChild from '@/mixins/delChild';
+export default {
+    mixins: [delChild],
+    props: {
+        code: {
+            type: String,
+            default: '01'
+        }
+        // value: {
+        //     type: [Number, String],
+        //     default: ''
+        // }
+    },
+    data() {
+        return {
+            options: [],
+            props: {
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                expandTrigger: 'hover'
+            },
+            chooseValue: [],
+            emiting: false
+        };
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.getList();
+        });
+    },
+    methods: {
+        getList() {
+            this.$http
+                .post('/artType/allNotExtra')
+                .then(res => {
+                    this.options = this.delChild(res);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        changeSelect(val) {
+            this.$emit('input', val);
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped></style>

src/main/vue/src/components/select/SpecialtySelect.vue

@@ -1,53 +0,0 @@
-<template>
-    <el-select :value="value" :placeholder="请选择专业" clearable filterable @change="changeSelect" class="filter-item">
-        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-    </el-select>
-</template>
-
-<script>
-export default {
-    props: {
-        value: {
-            type: [Number, String],
-            default: ''
-        },
-        flag: {
-            type: Number,
-            default: 1
-        }
-    },
-    data() {
-        return {
-            options: []
-        };
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.getList();
-        });
-    },
-    methods: {
-        getList() {
-            this.$http
-                .post('/artType/allNotExtend')
-                .then(res => {
-                    this.options = res.map(item => {
-                        return {
-                            label: item.name,
-                            value: item.id
-                        };
-                    });
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.$message.error(e.error);
-                });
-        },
-        changeSelect(val) {
-            this.$emit('input', val);
-        }
-    }
-};
-</script>
-
-<style lang="less" scoped></style>

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

@@ -280,40 +280,6 @@
             <el-table-column label="操作" align="left" fixed="right" min-width="260">
                 <template slot-scope="{ row, $index }">
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
-                    <!-- <el-button
-                        type="warning"
-                        @click="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, $index)" size="mini" plain>查看作品</el-button>
                     <el-button
                         @click="audit(row, 'AUDIT_FAILED')"
@@ -422,7 +388,6 @@
 </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';
@@ -689,6 +654,9 @@ export default {
             if (this.form.name) {
                 data.query.name = this.form.name;
             }
+            if (this.form.id) {
+                data.query.id = this.form.id;
+            }
             if (this.form.programmeStatus) {
                 data.query.programmeStatus = this.form.programmeStatus;
             }
@@ -696,39 +664,7 @@ export default {
         },
         download() {
             this.downloading = true;
-
-            let data = {
-                sort: 'programmeStatus,desc',
-                size: 10000,
-                query: {}
-            };
-            if (this.form.competitionGroup) {
-                data.query.competitionGroup = this.form.competitionGroup;
-            }
-            if (this.form.levelSettingId) {
-                data.query.levelSettingId = this.form.levelSettingId;
-            }
-            if (this.form.gradingOrganizationId) {
-                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
-            }
-            if (this.organizationId) {
-                data.query.form.organizationId = this.form.organizationId;
-            }
-            if (this.form.specialtyId) {
-                data.query.code = this.getCode(this.form.specialtyId);
-            }
-            if (this.performanceId) {
-                data.query.performanceId = this.performanceId;
-            }
-            if (this.form.name) {
-                data.query.name = this.form.name;
-            }
-            if (this.form.id) {
-                data.query.id = this.form.id;
-            }
-            if (this.form.programmeStatus) {
-                data.query.programmeStatus = this.form.programmeStatus;
-            }
+            let data = this.getParmers();
 
             this.$axios
                 .get('/programme/excel', {
@@ -832,17 +768,6 @@ export default {
             }
             return result;
         },
-        // closeEvent() {
-        //     document.exitPictureInPicture();
-        // },
-        // playVideo(row) {
-        //     if (row.video) {
-        //         this.showViedo = true;
-        //         this.videoUrl = row.video;
-        //     } else {
-        //         this.$message.success('暂无视频');
-        //     }
-        // },
         playImg(row) {
             if (row.annex) {
                 this.showImg = true;