licailing 4 лет назад
Родитель
Сommit
b5c257617e

+ 2 - 0
src/main/java/com/izouma/wenlvju/dto/ProgrammeResultDTO.java

@@ -43,6 +43,8 @@ public class ProgrammeResultDTO {
     @ExcelIgnore
     @ExcelIgnore
     private String annex;
     private String annex;
 
 
+    @ExcelIgnore
+    private Double score;
 
 
     @ExcelIgnore
     @ExcelIgnore
     private Long awardId;
     private Long awardId;

+ 8 - 2
src/main/vue/src/views/performance/ProgrammeResultList.vue

@@ -152,6 +152,7 @@
             </el-table-column>
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="160"> </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 prop="examPoint" label="考级点" min-width="160"> </el-table-column>
+            <el-table-column prop="score" label="分数" min-width="70" v-if="display"> </el-table-column>
             <el-table-column prop="award" label="获奖情况" min-width="120">
             <el-table-column prop="award" label="获奖情况" min-width="120">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
                     <span v-if="!row.second">{{ row.award }}</span>
                     <span v-if="!row.second">{{ row.award }}</span>
@@ -167,7 +168,12 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="left" fixed="right" :min-width="display ? 235 : 100">
             <el-table-column label="操作" align="left" fixed="right" :min-width="display ? 235 : 100">
                 <template slot-scope="{ row, $index }">
                 <template slot-scope="{ row, $index }">
-                    <el-button @click="playVideo(row, $index)" size="mini" plain type="primary" style="margin-right:5px"
+                    <el-button
+                        @click="playVideo(row, $index)"
+                        size="mini"
+                        plain
+                        type="primary"
+                        style="margin-right:10px"
                         >查看作品</el-button
                         >查看作品</el-button
                     >
                     >
                     <span v-if="performance.status == 'RATE' && display">
                     <span v-if="performance.status == 'RATE' && display">
@@ -175,7 +181,7 @@
                             >修改</el-button
                             >修改</el-button
                         >
                         >
                         <span v-else>
                         <span v-else>
-                            <el-button @click="saveRow(row)" size="mini" plain type="primary">保存</el-button>
+                            <el-button @click="saveRow(row)" size="mini" plain type="success">保存</el-button>
                             <el-button @click="row.second = false" size="mini" plain type="danger">取消</el-button>
                             <el-button @click="row.second = false" size="mini" plain type="danger">取消</el-button>
                         </span>
                         </span>
                     </span>
                     </span>