统计展示

src/main/java/com/izouma/wenlvju/service/regulation/ReportService.java

@@ -948,13 +948,20 @@ public class ReportService {
             List<Programme> programmeList = programmeMap.get(performance.getId());
             Map<Long, List<Programme>> specialty = programmeList.stream()
                     .collect(Collectors.groupingBy(Programme::getParentSpecialtyId));
+            Set<Long> artSet = new HashSet<>(artMap.keySet());
             specialty.forEach((key, value) -> {
+                artSet.remove(key);
                 String name = artMap.get(key);
                 programmeNum.add(new NumOfReport(name, value.size()));
                 long sum = value.stream()
                         .mapToLong(programme -> ObjectUtil.isNull(participantMap.get(programme.getId())) ? 0L : participantMap.get(programme.getId()))
                         .sum();
                 participantNum.add(new NumOfReport(name, (int) sum));
+
+            });
+            artSet.forEach(artId -> {
+                programmeNum.add(new NumOfReport(artMap.get(artId), 0));
+                participantNum.add(new NumOfReport(artMap.get(artId), 0));
             });
             performanceStatistic.setParticipantNum(participantNum);
             performanceStatistic.setProgrammeNum(programmeNum);

src/main/vue/src/router.js

@@ -881,7 +881,7 @@ const router = new Router({
             meta: {
                 title: '登录'
             }
-        },
+        }
         /**初审 */
         // {
         //     path: '/programmeGOList',
@@ -892,15 +892,15 @@ const router = new Router({
         //     }
         // },
         /**节目评审 */
-        {
-            path: '/programmeScoreList',
-            name: 'ProgrammeScoreList',
-            component: () =>
-                import(/* webpackChunkName: "programmeScoreList" */ '@/views/performance/ProgrammeScoreList.vue'),
-            meta: {
-                title: '节目评审'
-            }
-        }
+        // {
+        //     path: '/programmeScoreList',
+        //     name: 'ProgrammeScoreList',
+        //     component: () =>
+        //         import(/* webpackChunkName: "programmeScoreList" */ '@/views/performance/ProgrammeScoreList.vue'),
+        //     meta: {
+        //         title: '节目评审'
+        //     }
+        // }
     ]
 });
 router.beforeEach((to, from, next) => {

src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -106,8 +106,8 @@
             <el-table-column prop="myScore" label="评分" align="center" min-width="80">
                 <template slot-scope="{ row }">
                     <span v-if="row.myScore">{{ row.myScore }}</span>
-                    <!-- <span v-else>{{ row.myScore }}</span> -->
-                    <el-input-number
+                    <span v-else>暂无</span>
+                    <!-- <el-input-number
                         v-else
                         v-model="row.myScore"
                         size="mini"
@@ -119,28 +119,28 @@
                         controls-position="both"
                         @change="saveScore(row)"
                     >
-                    </el-input-number>
+                    </el-input-number> -->
                 </template>
             </el-table-column>
             <el-table-column prop="remark" label="备注" align="center" min-width="80">
                 <template slot-scope="{ row }">
                     <span v-if="row.remark">{{ row.remark }}</span>
-                    <!-- <span v-else>{{ row.remark }}</span> -->
-                    <el-input
+                    <span v-else>暂无</span>
+                    <!-- <el-input
                         v-else
                         size="mini"
                         @change="saveScore(row)"
                         v-model="row.remark"
                         placeholder="请输入备注"
                         clearable
-                    ></el-input>
+                    ></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, $index }">
                     <el-button @click="playVideo(row, $index)" 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">

src/main/vue/src/views/showStatistic/PerformanceWidget.vue

@@ -82,7 +82,6 @@ export default {
                 }
                 let participantNum = this.list[i].participantNum;
                 for (let j = 0; j < participantNum.length; j++) {
-                    names.push(participantNum[j].name);
                     if (participantNum[j].name == '音乐') {
                         music1.push(participantNum[j].num);
                     } else if (participantNum[j].name == '舞蹈') {
@@ -112,8 +111,6 @@ export default {
                 var chartDom = this.$refs.chart;
                 var myChart = echarts.init(chartDom);
                 var option;
-                console.log(this.seriesPar);
-                var option;
                 option = {
                     legend: {
                         data: names,
@@ -131,7 +128,54 @@ export default {
                             dataView: {}
                         }
                     },
-                    tooltip: {},
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+                        },
+                        formatter: function(params) {
+                            //自定义划过显示样式
+                            // console.log(params); //params为滑过显示的数据信息
+                            var str = '';
+                            for (var i = 0; i < params.length; i++) {
+                                // console.log(params);
+                                if (i == 0) {
+                                    str += '<br/>' + '节目数量';
+                                    str +=
+                                        '<div style="width:140px;border-top:1px solid #ccc;margin-top:4px;">' +
+                                        params[i].marker +
+                                        params[i].seriesName +
+                                        ':' +
+                                        params[i].value +
+                                        '</div >';
+                                } else if (i == 5) {
+                                    str += '报名人数';
+                                    str +=
+                                        '<div style="width:140px;border-top:1px solid #ccc;margin-top:4px;">' +
+                                        params[i].marker +
+                                        params[i].seriesName +
+                                        ':' +
+                                        params[i].value +
+                                        '</div >';
+                                } else {
+                                    str +=
+                                        '<div style="width:140px;">' +
+                                        params[i].marker +
+                                        params[i].seriesName +
+                                        ':' +
+                                        params[i].value +
+                                        '</div >';
+                                }
+                            }
+                            var tooltipHtml =
+                                '<div style="width:140px;overflow-y:auto;">' +
+                                params[0].axisValue +
+                                '年' +
+                                str +
+                                '</div>';
+                            return tooltipHtml;
+                        }
+                    },
                     xAxis: {
                         data: xAxisData,
                         name: '年份',