diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/classEvaluation/summaryEva.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/classEvaluation/summaryEva.vue
index 76a7171..8104a91 100644
--- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/classEvaluation/summaryEva.vue
+++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/classEvaluation/summaryEva.vue
@@ -2,48 +2,92 @@
     <div class="summary-evaluation-div">
         <div class="search-div">
             <div class="title-item">
-                <div class="title-text"><span>汇总查看</span></div>
+                <div class="title-text"><span>学部</span></div>
             </div>
             <div class="title-dom">
-                <a-select :value="gatherName" @change="taskChange">
+                <a-select :value="stageId" @change="stageChange">
                     <a-icon class="drop-down-icon" slot="suffixIcon" type="caret-down"
                             :style="{fontSize:'16px',color:'#c280ff'}"/>
-                    <a-select-option v-for="item in gatherTaskList" :key="item.id + '-' + item.gather_name">
-                        {{ item.gather_name }}
+                    <a-select-option v-for="item in stageList" :key="item.stage_id">
+                        {{ item.stage_name }}
                     </a-select-option>
                 </a-select>
             </div>
             <div class="title-item">
-                <div class="title-text"><span>参数设置</span></div>
+                <div class="title-text"><span>入学年份</span></div>
             </div>
             <div class="title-dom">
-                <div class="gather-info-div">
-                    <div>
-                        汇总周期：{{gatherDate}}
-                        计算规则：{{calcMethods}}
-                        评定班额数：{{classNum}}
-                    </div>
-                </div>
+                <a-select :value="yearId" @change="yearChange">
+                    <a-icon class="drop-down-icon" slot="suffixIcon" type="caret-down"
+                            :style="{fontSize:'16px',color:'#c280ff'}"/>
+                    <a-select-option v-for="item in yearList" :key="item.create_year">
+                        {{ item.create_year_name }}
+                    </a-select-option>
+                </a-select>
+                <!--<div class="gather-info-div">-->
+                <!--<div>-->
+                <!--&lt;!&ndash;汇总周期：{{gatherDate}}&ndash;&gt;-->
+                <!--&lt;!&ndash;计算规则：{{calcMethods}}&ndash;&gt;-->
+                <!--&lt;!&ndash;评定班额数：{{classNum}}&ndash;&gt;-->
+                <!--</div>-->
+                <!--</div>-->
             </div>
+            <div class="title-item">
+                <div class="title-text"><span>汇总查看</span></div>
+            </div>
+            <div class="title-dom">
+                <a-select :value="gatherId" @change="taskChange">
+                    <a-icon class="drop-down-icon" slot="suffixIcon" type="caret-down"
+                            :style="{fontSize:'16px',color:'#c280ff'}"/>
+                    <a-select-option v-for="item in gatherTaskList" :key="item.id">
+                        {{ item.gather_name }}
+                    </a-select-option>
+                </a-select>
+            </div>
+
+            <a-tooltip class="taskInfoIcon" placement="bottomRight">
+                <template slot="title">
+                    汇总周期：{{gatherDate}}
+                    计算规则：{{calcMethods}}
+                    评定班额数：{{classNum}}
+                </template>
+                <a-icon class="taskInfoIcon" type="question-circle" title="参数设置" @mouseenter="showTaksInfoFun"
+                        @mouseleave="hideTaksInfoFun"/>
+            </a-tooltip>
+
         </div>
         <div class="table-list-div">
             <a-table :columns="columns" :data-source="tableData" bordered tableLayout="fixed"
                      :loading="showLoading"
-                     :scroll="{ x: '100%' }"
-            />
+                     :pagination="false"
+                     :scroll="{ x: '100%'}"
+                     size="middle"
+            >
+                <span slot="scoreSlot" slot-scope="record">
+                    {{record.score}}
+                    <a-icon type="flag" v-if="record.isFlag" :style="{color: 'red' }"></a-icon>
+                </span>
+            </a-table>
         </div>
     </div>
 </template>
 <script>
     import interConfig from './interConfig';
-    import {Select, Icon, Table} from 'ant-design-vue';
+    import {Select, Icon, Table, Tooltip} from 'ant-design-vue';
     export default{
         data(){
             return {
                 showLoading: true,
+                showTaksInfo: false,
                 columns: [],
                 tableData: [],
-                gatherTaskList: [],
+                stageList: [],//学部
+                stageId: "",
+                stageName: "",
+                yearList: [],//学年
+                yearId: "",
+                yearName: "",
+                gatherTaskList: [],//任务
                 gatherId: "",
                 gatherName: "",
                 gatherDate: "",//汇总周期
@@ -56,10 +100,35 @@
         mounted(){
             this.getGatherTaskList();
         },
+        watch: {
+            yearId: function (newVal) {
+                for (let i = 0, len = this.yearList.length; i < len; i++) {
+                    if (this.yearList[i].create_year == newVal) {
+                        this.yearName = this.yearList[i].create_year_name;
+                        break;
+                    }
+                }
+            },
+            stageId: function (newVal) {
+                for (let i = 0, len = this.stageList.length; i < len; i++) {
+                    if (this.stageList[i].stage_id == newVal) {
+                        this.stageName = this.stageList[i].stage_name;
+                        this.yearList = this.stageList[i].create_year_list;
+                        if (this.yearId == "" && this.yearList && this.yearList.length > 0) {
+                            this.yearId = this.yearList[0].create_year;
+                        }
+                        break;
+                    }
+                }
+            }
+        },
         methods: {
             getGatherTaskList: function () {
+                this.showLoading = true;
                 let param = {
                     org_id: this.BaseConfig.person_info_my.bureau_id,
+                    stage_id: this.stageId,
+                    create_year: this.yearId,
                 };
                 this.InterfaceConfig.callInterface([{
                     url: interConfig.getGatherTaskList.url,
@@ -68,28 +137,68 @@
                     isTestLogin: interConfig.getGatherTaskList.isTestLogin,
                 }], (result) => {
                     let resData = result[0].data;
+                    this.showLoading = false;
                     if (result[0].status === 200) {
                         if (resData.code === 2000) {
                             this.gatherTaskList = resData.data.gather_task_list;
+                            this.stageId = resData.data.stage_id;
+                            this.yearId = resData.data.create_year;
+                            this.gatherId = resData.data.gather_id;
+                            this.stageList = resData.data.stage_list;
+
+                            //构造选中任务
                             if (this.gatherTaskList && this.gatherTaskList.length > 0) {
-                                this.gatherId = this.gatherTaskList[0].id;
-                                this.gatherName = this.gatherTaskList[0].gather_name;
-                                let calc_method = this.gatherTaskList[0].calc_method;
-                                this.gatherDate = this.gatherTaskList[0].begin_time + "-" + this.gatherTaskList[0].end_time;
-                                this.calcMethods = calc_method == 1 ? '求和' : (calc_method == 2 ? '平均' : (calc_method == 3 ? '权重求和' : ''));//计算规则 1：求和、2：平均、3：权重求和
-                                this.classNum = this.gatherTaskList[0].class_num;
-                                this.redFlagGather();
+                                for (let i = 0, len = this.gatherTaskList.length; i < len; i++) {
+                                    if (this.gatherTaskList[i].id == this.gatherId) {
+                                        this.gatherName = this.gatherTaskList[i].gather_name;
+                                        let calc_method = this.gatherTaskList[i].calc_method;
+                                        this.gatherDate = this.gatherTaskList[i].begin_time + "-" + this.gatherTaskList[i].end_time;
+                                        this.calcMethods = calc_method == 1 ? '求和' : (calc_method == 2 ? '平均' : (calc_method == 3 ? '权重求和' : ''));//计算规则 1：求和、2：平均、3：权重求和
+                                        this.classNum = this.gatherTaskList[i].class_num;
+                                        this.redFlagGather();
+                                        break;
+                                    }
+                                }
+                            } else {
+                                this.columns = [];
+                                this.tableData = [];
+                                this.gatherTaskList = [];
+                                this.gatherId = "";
+                                this.gatherName = "";
+                                this.gatherDate = "";
+                                this.calcMethods = "";
+                                this.classNum = "";
+                            }
+                            //构造选中学部
+                            if (this.stageList && this.stageList.length > 0) {
+                                for (let i = 0, len = this.stageList.length; i < len; i++) {
+                                    if (this.stageList[i].stage_id == this.stageId) {
+                                        this.stageName = this.stageList[i].stage_name;
+                                        this.yearList = this.stageList[i].create_year_list;
+                                        //构造选中学年
+                                        if (this.yearList && this.yearList.length > 0) {
+                                            for (let y = 0, ylen = this.yearList.length; y < ylen; y++) {
+                                                if (this.yearList[y].create_year == this.yearId) {
+                                                    this.yearName = this.yearList[y].create_year_name;
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    }
+                                }
                             }
                         }
                     }
                 })
             },
             redFlagGather: function () {
+                this.showLoading = true;
                 let param = {
                     org_id: this.BaseConfig.person_info_my.bureau_id,
                     gather_id: this.gatherId,
                     page_number: this.pageNumber,
-                    page_size: this.pageSize
+                    page_size: 1000000000
                 };
                 this.InterfaceConfig.callInterface([{
                     url: interConfig.redFlagGather.url,
@@ -107,7 +216,6 @@
                 })
             },
             buildTableData: function (data) {
-                console.log(data)
                 //构造tableData
                 let list = data.list;
                 let tableData = [];
@@ -127,30 +235,38 @@
                             if (scoreMapKeys[k] == dataKeys[i]) {
                                 //班级在某个任务中的得分key 与 任务列表key值相同
                                 let score = scoreMap[scoreMapKeys[k]];
-                                dataJson[classId] = score;
+                                dataJson[classId] = {
+                                    score: score
+                                };
                                 break;
                             }
                         }
                     })
                     tableData.push(dataJson);
                 }
-
                 //构造columns
                 let columns = [
                     {
                         title: '评价任务',
                         dataIndex: "taskId",
                         key: 1,
-                        align:"center",
-                        ellipsis:true,//超出宽度省略
-                        width:150,
-                        fixed: 'left'
+                        align: "center",
+                        ellipsis: true,//超出宽度省略
+                        width: 150,
+                        fixed: 'left',
+//                        customRender:function (text,record,index) {
+//                            console.log(text,record,index)
+//                            if(record.taskId == '合计'){
+//                                //return "<a-icon type='flag' />";
+//                                return '<h1>测试</h1>';
+//                            }
+//                        }
                     },
                 ];
                 //合计JSON
                 let totalJson = {
                     key: dataKeys.length + 1,
-                    taskId: '合计',
+                    taskId: '总分',
                 };//key classId, score: totalScore
                 for (let i = 0, len = list.length; i < len; i++) {
                     let classItem = list[i];
@@ -158,38 +274,73 @@
                         title: classItem.class_name,
                         dataIndex: classItem.class_id,
                         key: i + 2,
-                        align:"center",
-                        ellipsis:true,//超出宽度省略
-                        width:120
+                        align: "center",
+                        ellipsis: true,//超出宽度省略
+                        width: 120,
+                        scopedSlots: {customRender: 'scoreSlot'},
                     }
                     columns.push(column);
                     //合计
                     let task_score_map = classItem.task_score_map;
                     let scoreKeys = Object.keys(task_score_map);
                     let totalScore = 0;
-                    scoreKeys.forEach(key=>{
+                    scoreKeys.forEach(key => {
                         let score = task_score_map[key];
                         totalScore += parseFloat(score);
                     })
-                    totalJson[classItem.class_id] = totalScore;
+                    totalJson[classItem.class_id] = {
+                        score: totalScore,
+                        isFlag: classItem.is_redFlag
+                    };
                 }
                 this.columns = columns;
                 tableData.push(totalJson);
                 this.tableData = tableData;
             },
+            stageChange: function (value) {
+                if (parseInt(this.stageId) != parseInt(value)) {
+                    this.stageId = value;
+                    this.yearId = "";
+                    this.$nextTick(function () {
+                        this.getGatherTaskList();
+                    })
+
+                    //this.redFlagGather();
+                }
+            },
+            yearChange: function (value) {
+                if (parseInt(this.yearId) != parseInt(value)) {
+                    this.yearId = value;
+                    this.getGatherTaskList();
+                }
+            },
             taskChange: function (value) {
-                let taskId = value.substring(0, value.indexOf('-'));
-                if (parseInt(this.gatherId) != parseInt(taskId)) {
-                    this.gatherId = taskId;
-                    this.gatherName = value.substring(value.indexOf('-') + 1);
+                if (parseInt(this.gatherId) != parseInt(value)) {
+                    this.gatherId = value;
+                    for(let i = 0,len = this.gatherTaskList.length;i < len;i ++){
+                        if(this.gatherId == this.gatherTaskList[i].id){
+                            let calc_method = this.gatherTaskList[i].calc_method;
+                            this.gatherDate = this.gatherTaskList[i].begin_time + "-" + this.gatherTaskList[i].end_time;
+                            this.calcMethods = calc_method == 1 ? '求和' : (calc_method == 2 ? '平均' : (calc_method == 3 ? '权重求和' : ''));//计算规则 1：求和、2：平均、3：权重求和
+                            this.classNum = this.gatherTaskList[i].class_num;
+                        }
+                    }
+                    this.redFlagGather();
                 }
             },
+            showTaksInfoFun: function () {
+                this.showTaksInfo = true;
+            },
+            hideTaksInfoFun: function () {
+                //this.showTaksInfo = false;
+            }
         },
         components: {
             ASelect: Select,
             ASelectOption: Select.Option,
             AIcon: Icon,
-            ATable: Table
+            ATable: Table,
+            ATooltip: Tooltip
         }
     }
 </script>
@@ -212,6 +363,7 @@
             border: 1px solid #c280ff;
             margin: auto;
             display: flex;
+            position: relative;
             .title-item {
                 width: 5rem;
                 height: auto;
@@ -229,13 +381,13 @@
                 }
             }
             .title-dom {
-                width: calc(50% - 5rem);
+                width: calc(33% - 5rem);
                 height: auto;
                 display: flex;
                 justify-content: center;
                 align-items: center;
                 .ant-select {
-                    width: calc(100% - 5rem);
+                    width: calc(100% - 2rem);
                     margin: auto;
                     transform: skew(30deg);
                     -webkit-transform: skew(30deg);
@@ -247,29 +399,51 @@
                         box-shadow: none !important;
                     }
                 }
-                .gather-info-div {
-                    width: calc(100% - 2rem);
-                    height: auto;
-                    transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
-                    -webkit-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
-                    -moz-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
-                    -o-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
-                    -ms-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
-                    display: flex;
-                    flex-wrap: wrap;
-                    align-items: center;
-                    font-size: 12px;
-                }
+
+            }
+            .gather-info-div {
+                position: absolute;
+                width: 10rem;
+                padding: 0 0.5rem;
+                height: 2rem;
+                right: 0;
+                top: 3rem;
+                background-color: white;
+                transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                -webkit-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                -moz-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                -o-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                -ms-transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+                font-size: 12px;
+            }
+            .taskInfoIcon {
+                position: absolute;
+                right: -20px;
+                bottom: 0;
+                color: #31a8fa;
+                transform: skew(30deg) translateZ(0); /*设置倾斜度为-30  防止点击抖动*/
+                -webkit-transform: skew(30deg);
+                -moz-transform: skew(30deg);
+                -o-transform: skew(30deg);
+                -ms-transform: skew(30deg);
             }
         }
         .table-list-div {
             width: 100%;
             min-height: 20rem;
             margin-top: 0.5rem;
-            .ant-table-content{
-                .ant-table-thead{
-                    tr th .ant-table-header-column{
-                        color: #31a8fa;
+            .ant-table-content {
+                /*.ant-table-thead{*/
+                /*tr th .ant-table-header-column{*/
+                /*color: #31a8fa;*/
+                /*}*/
+                /*}*/
+                .ant-table-tbody {
+                    tr td {
+                        padding: 5px 10px !important;
                     }
                 }
             }
diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/studentEvaluation/studentEvaluation.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/studentEvaluation/studentEvaluation.vue
index e0b1ed3..0ecfd66 100644
--- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/studentEvaluation/studentEvaluation.vue
+++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/oa/studentEvaluation/studentEvaluation.vue
@@ -397,7 +397,7 @@
                             type: 'bar',
                             stack:'占比情况',
                             barWidth : 30,//柱图宽度
-                            data: scoreList
+                            data: scoreList,
                         })
                     }
                 }
@@ -515,7 +515,7 @@
         }
         .task-echart-div {
             width: 100%;
-            min-height: 20rem;
+            min-height: 25rem;
             .ant-tabs-bar {
                 display: none;
             }