licailing 4 years ago
parent
commit
ff7f984ecc

+ 1 - 0
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeScoreService.java

@@ -51,6 +51,7 @@ public class ProgrammeScoreService {
                     programmeScore.setMark2At(programmeScore.getMarkAt());
                     programmeScore.setScore(score);
                     programmeScore.setMarkAt(now);
+                    programmeScore.setSecond(true);
                 }
             }
         }

+ 2 - 0
src/main/vue/src/main.js

@@ -17,6 +17,8 @@ import DistrictSelect from '@/components/DistrictSelect';
 import Formatters from '@/mixins/formatters';
 import 'normalize.css/normalize.css';
 import 'element-ui/lib/theme-chalk/index.css';
+// 修改 el-dialog 默认点击遮照为不关闭
+ElementUI.Dialog.props.closeOnClickModal.default = false;
 
 // import VueAMap from "vue-amap";
 // Vue.use(VueAMap);

+ 68 - 7
src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -46,7 +46,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item> -->
-                    <el-form-item label="评审专家"></el-form-item>
+                    <!-- <el-form-item label="评审专家"></el-form-item> -->
                 </el-row>
             </el-form>
         </div>
@@ -70,7 +70,7 @@
                 <template slot-scope="{ row }">{{ row.participant.join(',') }}</template>
             </el-table-column>
             <el-table-column prop="quantity" label="表演人数" min-width="70"> </el-table-column>
-            <el-table-column prop="signedIn" label="状态" :formatter="signedInFormatter"> </el-table-column>
+            <!-- <el-table-column prop="signedIn" label="状态" :formatter="signedInFormatter"> </el-table-column> -->
             <el-table-column prop="score" label="成绩"> </el-table-column>
             <el-table-column prop="myScore" label="评分" align="center" min-width="120">
                 <template slot-scope="{ row }">
@@ -92,7 +92,7 @@
             </el-table-column>
             <el-table-column prop="remark" label="备注" align="center" min-width="120">
                 <template slot-scope="{ row }">
-                    <span v-if="row.second">{{ row.myScore }}</span>
+                    <span v-if="row.second">{{ row.remark }}</span>
                     <el-input
                         v-else
                         size="mini"
@@ -103,11 +103,11 @@
                     ></el-input>
                 </template>
             </el-table-column>
-            <!-- <el-table-column label="操作" align="left" fixed="right" min-width="100">
+            <el-table-column label="操作" align="left" fixed="right" min-width="100">
                 <template slot-scope="{ row }">
-                    <el-button @click="showSign(row)" size="mini" plain type="primary">签到处理</el-button>
+                    <el-button @click="playVideo(row)" size="mini" plain type="primary">查看作品</el-button>
                 </template>
-            </el-table-column> -->
+            </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
             <!-- <div class="multiple-mode-wrapper">
@@ -130,6 +130,57 @@
             >
             </el-pagination>
         </div>
+
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
+            <video :src="programme.video" controls style="height: 80%; max-width: 80%; margin: 0 auto">
+                您的浏览器不支持 video 标签。
+            </video>
+            <el-form>
+                <el-form-item label="分数">
+                    <span v-if="programme.second">{{ programme.myScore }}</span>
+                    <el-input-number
+                        v-else
+                        v-model="programme.myScore"
+                        size="mini"
+                        label=""
+                        :min="0"
+                        :max="100"
+                        :step="1"
+                        :controls="true"
+                        controls-position="both"
+                        @change="saveScore(row)"
+                    >
+                    </el-input-number>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <span v-if="programme.second">{{ programme.remark }}</span>
+                    <el-input
+                        v-else
+                        size="mini"
+                        @change="saveScore(row)"
+                        v-model="programme.remark"
+                        placeholder="请输入备注"
+                        style="width: 200px"
+                        clearable
+                    ></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini">保存</el-button>
+                    <el-button size="mini">上一个</el-button>
+                    <el-button size="mini">下一个</el-button>
+                </el-form-item>
+            </el-form>
+            <!-- <video
+                :src="videoUrl"
+                controlsList="nodownload noremote footbar"
+                controls
+                style="height: 100%; max-width: 100%"
+                ref="video"
+                v-if="showViedo"
+            >
+                您的浏览器不支持 video 标签。
+            </video> -->
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -164,7 +215,9 @@ export default {
             morning: true,
             date: new Date(),
             columnKeys: ['arrangeName'],
-            addressList: []
+            addressList: [],
+            showViedo: false,
+            programme: {}
         };
     },
     created() {
@@ -377,6 +430,14 @@ export default {
                     };
                 }
             }
+        },
+        playVideo(row) {
+            if (row.video) {
+                this.showViedo = true;
+                this.programme = row;
+            } else {
+                this.$message.success('暂无视频');
+            }
         }
     }
 };