展示

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

@@ -180,15 +180,44 @@
             </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 label="操作" align="left" fixed="right" min-width="240">
+            <el-table-column label="操作" align="left" fixed="right" min-width="200">
                 <template slot-scope="{ row }">
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
-                    <el-button type="warning" @click="playVideo(row)" v-if="row.video" size="mini" plain
-                        >浏览视频</el-button
-                    >
-                    <el-button type="warning" @click="playImg(row)" v-if="!row.video" size="mini" plain
+                    <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="showCode(row)" type="primary" size="mini" plain>通过</el-button>
                     <el-button @click="showCode(row)" type="danger" size="mini" plain>拒绝</el-button> -->
                     <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button> -->

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -192,12 +192,10 @@
                 </template></el-table-column
             >
             <!-- <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column> -->
-            <el-table-column label="操作" align="center" fixed="right" min-width="340">
+            <el-table-column label="操作" align="center" fixed="right" min-width="270">
                 <template slot-scope="{ row }">
-                    <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
-                    <el-button type="success" @click="editRow(row)" size="mini" plain v-if="row.status == 0"
-                        >编辑</el-button
-                    >
+                    <el-button @click="showRow(row)" size="mini" plain v-if="row.status == 0">查看</el-button>
+                    <el-button type="success" @click="editRow(row)" size="mini" plain v-else>编辑</el-button>
                     <el-button
                         type="warning"
                         @click="playImg(row)"