Merge branch 'Regulation' of licailing/wenlvju into master

src/main/vue/src/components/ProgrammeLog.vue

@@ -85,31 +85,31 @@
                             </el-form-item>
                             <div
                                 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
+                                    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="作品图片">
@@ -118,11 +118,7 @@
                             </div>
                             <div v-else>
                                 <el-form-item prop="video" label="作品视频" v-if="formData.video">
-                                    <video-upload
-                                        v-model="formData.video"
-                                        class="width"
-                                        :readonly="true"
-                                    ></video-upload>
+                                    <video-upload v-model="videos" class="width" :readonly="true"></video-upload>
                                 </el-form-item>
                             </div>
                         </el-card>
@@ -229,6 +225,7 @@ export default {
             formData: {},
             show: false,
             showMore: false,
+            videos: {},
             level: '',
             rules: {
                 phone: [
@@ -283,7 +280,10 @@ export default {
                     .get('programme/getByAdmin/' + id)
                     .then(res => {
                         this.formData = res;
-                        console.log(res);
+                        // console.log(res);
+                        this.videos = {
+                            src: res.video
+                        };
                         this.$http
                             .post('/participant/all', { size: 100, query: { programmeId: id } }, { body: 'json' })
                             .then(res => {

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

@@ -639,11 +639,8 @@ export default {
             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('暂无作品');
+                this.$message.success('暂无视频');
             }
         },
         playImg(row) {