节目

src/main/java/com/izouma/wenlvju/domain/performance/Participant.java

@@ -0,0 +1,24 @@
+package com.izouma.wenlvju.domain.performance;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "参演人员")
+public class Participant {
+    private String name;
+
+    private String sex;
+
+    private LocalDate birthday;
+
+    private String img;
+
+    private String phone;
+}

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -0,0 +1,57 @@
+package com.izouma.wenlvju.domain.performance;
+
+import com.izouma.wenlvju.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "活动安排")
+public class Programme extends BaseEntity {
+    @ApiModelProperty(value = "节目名称")
+    private String name;
+
+    @ApiModelProperty(value = "参赛专业")
+    private Long specialtyId;
+
+    @ApiModelProperty(value = "参赛组别")
+    private String group;
+
+    @ApiModelProperty(value = "参赛级别")
+    private Long levelSettingId;
+
+    @ApiModelProperty(value = "作品时长")
+    private int durationOfWork;
+
+    @ApiModelProperty(value = "参赛人数")
+    private int quantity;
+
+    @ApiModelProperty(value = "联系人")
+    private String contact;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "考级机构")
+    private Long gradingOrganizationId;
+
+    @ApiModelProperty(value = "承办单位")
+    private Long organizationId;
+
+    @ApiModelProperty(value = "考级点")
+    private String examPoint;
+
+    @ApiModelProperty(value = "节目视频")
+    private String video;
+}

src/main/java/com/izouma/wenlvju/enums/Group.java

@@ -0,0 +1,12 @@
+package com.izouma.wenlvju.enums;
+
+public enum Group {
+    /*
+    单人
+     */
+    SINGLE,
+    /*
+    集体
+     */
+    COLLECTIVE
+}

src/main/vue/src/views/Settings.vue

@@ -31,7 +31,7 @@
                             >
                                 <el-input v-model="menu.name"></el-input>
                             </el-form-item>
-                            <el-form-item label="代码" prop="code">
+                            <el-form-item label="备注" prop="code">
                                 <el-input v-model="menu.code"></el-input>
                             </el-form-item>
                         </el-form>

src/main/vue/src/views/performance/PerformanceEdit.vue

@@ -4,7 +4,7 @@
             :model="formData"
             :rules="rules"
             ref="form"
-            label-width="90px"
+            label-width="100px"
             label-position="right"
             size="small"
             style="max-width: 700px;"
@@ -17,7 +17,7 @@
                     <el-option v-for="item in years" :key="item" :label="item" :value="item"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="报名时间">
+            <el-form-item label="报名起始时间">
                 <el-date-picker
                     v-model="dateRange"
                     type="daterange"

src/main/vue/src/views/performance/PerformanceList.vue

@@ -59,19 +59,18 @@
             <el-table-column label="推送节目数量"></el-table-column>
             <el-table-column label="操作" align="right" fixed="right" min-width="130">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="success" size="mini" plain>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>
                         查看
                     </el-button>
-                    <el-dropdown @command="handleCommand">
-                        <el-button size="mini" plain style="margin-left:10px">更多</el-button>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item :command="`/performanceEdit?id=${row.id}`" :disabled="row.publish"
-                                >编辑</el-dropdown-item
-                            >
-                            <el-dropdown-item :disabled="row.publish">发布</el-dropdown-item>
-                            <el-dropdown-item :disabled="!row.publish">撤销</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
+                    <el-button @click="editRow(row)" type="success" size="mini" plain>
+                        编辑
+                    </el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain v-if="!row.publish">
+                        发布
+                    </el-button>
+                    <el-button @click="editRow(row)" type="warning" size="mini" plain v-if="row.publish">
+                        撤销
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>