Merge branch 'message' of licailing/wenlvju into master

src/main/java/com/izouma/wenlvju/Application.java

@@ -9,7 +9,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @EnableJpaAuditing
-@EnableSwagger2
+//@EnableSwagger2
 @EnableCaching
 @EnableScheduling
 public class Application {

src/main/vue/src/views/performance/ArrangeList.vue

@@ -42,12 +42,12 @@
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6" :offset="0">
-                                        <el-form-item class="flex" label="分组节目数量" prop="quantity">
+                                    <el-col :span="8" :offset="0">
+                                        <el-form-item label="分组节目数量" prop="quantity">
                                             <el-input-number type="number" v-model="form.quantity"></el-input-number>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
+                                    <el-col :span="12" :offset="0">
                                         <el-form-item label="时间安排" prop="morning" v-if="!online">
                                             <el-checkbox v-model="form.morning" disabled>上午</el-checkbox>
                                             <el-time-select
@@ -78,17 +78,9 @@
                                             </el-time-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6" :offset="0">
-                                        <el-form-item class="flex" label="单个节目时长" prop="duration" v-if="!online">
+                                    <el-col :span="12" :offset="0">
+                                        <el-form-item label="单个节目时长" prop="duration" v-if="!online">
                                             <el-input-number type="number" v-model="form.duration"></el-input-number>
-                                            <!-- <el-select v-model="form.duration" clearable>
-                                                <el-option
-                                                    v-for="item in times"
-                                                    :key="item"
-                                                    :label="item"
-                                                    :value="item"
-                                                ></el-option>
-                                            </el-select> -->
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12" :offset="0">
@@ -123,8 +115,8 @@
                                             </el-time-select>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="6" :offset="0">
-                                        <el-form-item label="参赛专业" class="flex" prop="specialtyId">
+                                    <el-col :span="12" :offset="0">
+                                        <el-form-item label="参赛专业" prop="specialtyId">
                                             <el-select v-model="form.specialtyId" multiple>
                                                 <el-option
                                                     v-for="item in artTypes"
@@ -143,26 +135,22 @@
                                             style="width: 467px"
                                             v-if="!online"
                                         >
-                                            <!-- <el-select v-model="form.address">
-                                                <el-option
-                                                    v-for="(item, index) in addresses"
-                                                    :key="index"
-                                                    :value="item.value"
-                                                    :label="item.value"
-                                                ></el-option>
-                                            </el-select> -->
                                             <el-input v-model="form.address"></el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12" :offset="0">
-                                        <el-form-item prop="selectedOnly" class="flex">
+                                        <el-form-item
+                                            prop="selectedOnly"
+                                            class="flex"
+                                            style="margin-left:30px;font-size:12px"
+                                        >
                                             <span style="color: #606266; font-size: 12px;"
                                                 >/**默认所有，可以选择多个*/</span
                                             >
-                                            <el-checkbox v-model="form.selectedOnly"
-                                                >仅限选择的专业</el-checkbox
-                                            ></el-form-item
-                                        >
+                                            <el-checkbox v-model="form.selectedOnly" style="margin-left:10px;">
+                                                <span style="color: #606266; font-size: 13px;">仅限选择的专业</span>
+                                            </el-checkbox>
+                                        </el-form-item>
                                     </el-col>
                                 </el-row>
 
@@ -755,4 +743,7 @@ export default {
         margin-left: 10px;
     }
 }
+/deep/.el-form--inline .el-form-item__content {
+    vertical-align: baseline;
+}
 </style>

src/main/vue/src/views/performance/ProgrammeShow.vue

@@ -7,7 +7,7 @@
             label-width="80px"
             label-position="right"
             size="small"
-            style="max-width: 700px;"
+            style="max-width: 800px;"
         >
             <el-timeline>
                 <el-timeline-item placement="top" size="normal" timestamp="节目信息">
@@ -224,7 +224,7 @@
                             row-class-name="table-row"
                             cell-class-name="table-cell"
                         >
-                            <el-table-column prop="img" label="证件照">
+                            <el-table-column prop="img" label="证件照" min-width="70">
                                 <template slot-scope="{ row }">
                                     <el-image
                                         style="width: 30px; height: 30px;"
@@ -234,9 +234,9 @@
                                     ></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="name" label="姓名" min-width="70"> </el-table-column>
+                            <el-table-column prop="birthday" label="出生年月" min-width="90"> </el-table-column>
+                            <el-table-column prop="sex" label="性别" min-width="45"> </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 }">
@@ -248,7 +248,23 @@
                                     ></el-image>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="idNo" label="身份证号" min-width="100"> </el-table-column>
+                            <el-table-column prop="idNo" label="身份证号" min-width="140"> </el-table-column>
+                            <el-table-column
+                                prop="awardImg"
+                                label="证书"
+                                min-width="70"
+                                v-if="formData.programmeStatus == 'SUBMIT' && formData.process == 3"
+                            >
+                                <template slot-scope="{ row }">
+                                    <el-image
+                                        style="width: 30px; height: 30px;"
+                                        :src="row.awardImg"
+                                        fit="cover"
+                                        :preview-src-list="[row.awardImg]"
+                                        v-if="showCrea(row.awardImg)"
+                                    ></el-image>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-card>
                 </el-timeline-item>
@@ -478,6 +494,9 @@ export default {
                     this.$message.success('删除成功');
                 })
                 .catch(e => {});
+        },
+        showCrea(src) {
+            return typeof src == 'undefined' || src.search('meritAward');
         }
     }
 };