diff --git a/src/components/common/selectPeople/SelectPeople.vue b/src/components/common/selectPeople/SelectPeople.vue
index 3b582c7..90f5d99 100644
--- a/src/components/common/selectPeople/SelectPeople.vue
+++ b/src/components/common/selectPeople/SelectPeople.vue
@@ -3,7 +3,7 @@
         <div class="card-container"  @click.stop>
             <a-tabs type="card" @change="tabsChange" v-model="curTabKey">
                 <a-tab-pane v-for="tab in tabsData" :key="tab.key" :tab="tab.tab">
-                    <vue-scroll v-if="curTabKey !== '1' && curTabKey !== '7' && tab.key === curTabKey"  :ops="ops"
+                    <vue-scroll v-if="curTabKey !== '1' && curTabKey !== '7' && tab.key === curTabKey" :ops="ops"
                                 class="tree-container-style" style="margin-right: 1rem;width: 30%">
                         <a-tree v-if="treeData.length > 0" :treeData="treeData" :replaceFields="{key:'id',title:'name',children:'subChild'}"
                                 :selectedKeys="[curSelectedKey]" :defaultExpandedKeys="defaultExpandedKeys" @select="treeSelected"/>
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/personList.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/personList.vue
index b0efd84..ff4c527 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/personList.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/administration/personList.vue
@@ -45,13 +45,14 @@
     import {Table, Divider, Input, Icon, Pagination, Button, Modal} from 'ant-design-vue';
     import PersonInfo from './personInfo.vue';
     import Upload from '../../../../../../components/common/uploader/Upload.vue';
-    export default{
+
+    export default {
         props: {
             menuId: {
                 type: String
             },
         },
-        data(){
+        data() {
             return {
                 pageType: 0,//0 列表 1 新增
                 loading: false,
@@ -97,7 +98,7 @@
                         dataIndex: 'create_time',
                         key: 'createTime',
                         title: '创建时间',
-                        align: "center"
+                        align: "center",
                     },
                     {
                         title: '操作',
@@ -117,7 +118,7 @@
                 this.getPersonList();
             }
         },
-        mounted(){
+        mounted() {
             this.getPersonList();
         },
         methods: {
@@ -148,6 +149,17 @@
                                 fileList.push(dataList[i]['id_photo_json']);
                                 dataList[i]['fileList'] = fileList;
                             }
+                            // for (let i = 0; i < dataList.length; i++) {
+                            //     for (let j = 0; j <= dataList.length - i; j++) {
+                            //         if (dataList[j].create_time > dataList[j + 1].create_time) {
+                            //             let t
+                            //             t = dataList[j].create_time
+                            //             dataList[j].create_time = dataList[j + 1].create_time
+                            //             dataList[j + 1].create_time = t
+                            //         }
+                            //
+                            //     }
+                            // }
                         }
                         this.dataList = dataList;
                         this.totalNum = resData.data.total_row;
@@ -263,26 +275,31 @@
         width: 100%;
         height: auto;
         padding: 0.5rem;
-        .search-and-add-style {
-            width: 100%;
-            height: 3.5rem;
-            background-color: white;
-            margin-bottom: 0.5rem;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 0.5rem;
-        }
-        .ant-table-wrapper{
-            /deep/ .upload-container-style {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-            }
-        }
-        .ant-pagination {
-            margin-top: 0.5rem;
-            text-align: right;
-        }
+
+    .search-and-add-style {
+        width: 100%;
+        height: 3.5rem;
+        background-color: white;
+        margin-bottom: 0.5rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 0.5rem;
+    }
+
+    .ant-table-wrapper {
+
+    /deep/ .upload-container-style {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    }
+    .ant-pagination {
+        margin-top: 0.5rem;
+        text-align: right;
+    }
+
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorCategory.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorCategory.vue
index 9786a7e..b9bd8c4 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorCategory.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorCategory.vue
@@ -32,13 +32,13 @@
 <script>
     import {Tabs, Table, Pagination, Button, Modal, Input, Divider} from 'ant-design-vue';
     import InterConfig from '../interConfig';
-    export default{
+    export default {
         props: {
             menuId: {
                 type: String
             }
         },
-        data(){
+        data() {
             return {
                 loading: false,
                 visible: false,
@@ -84,9 +84,11 @@
                 dataList: [],
                 categoryId: "",
                 categoryName: "",
+                scienceActibityDataList: [],
+                nameList: [],
             }
         },
-        created(){
+        created() {
             let menuId = this.$props.menuId;
             if (menuId === "honorCategory") {
                 this.categoryType = 5;
@@ -116,6 +118,7 @@
                 this.getCategoryList();
             },
             toAdd: function () {
+                this.categoryName = ''
                 this.modalTitle = "新增分类";
                 this.operateType = 1;
                 this.visible = true;
@@ -141,11 +144,11 @@
                         this.loading = false;
                         let resData = result[0].data;
                         if (resData.code === 2000) {
-//                            Modal.success({
-//                                title: "操作成功",
-//                                content: "",
-//                                centered: true
-//                            });
+                            Modal.success({
+                                title: "操作成功",
+                                content: "",
+                                centered: true
+                            });
                             this.categoryName = "";
                             this.getCategoryList();
                             this.visible = false;
@@ -164,15 +167,25 @@
                     }], (result) => {
                         this.loading = false;
                         let resData = result[0].data;
-                        if (resData.code === 2000) {
-//                            Modal.success({
-//                                title: "操作成功",
-//                                content: "",
-//                                centered: true
-//                            });
-                            this.categoryId = "";
-                            this.getCategoryList();
+                        // console.log(resData)
+                        if (resData.data.affected_rows == 0) {
+                            Modal.warning({
+                                title: "该分类下有科研活动，不能删除",
+                                content: "",
+                                centered: true
+                            });
                             this.visible = false;
+                        } else {
+                            if (resData.code === 2000) {
+                                Modal.success({
+                                    title: "操作成功",
+                                    content: "",
+                                    centered: true
+                                });
+                                this.categoryId = "";
+                                this.getCategoryList();
+                                this.visible = false;
+                            }
                         }
                     })
                 }
@@ -229,10 +242,20 @@
                 this.visible = true;
             },
             toDelete: function (record) {
-                this.categoryId = record.category_id;
-                this.operateType = -1;
-                this.modalTitle = "提示";
-                this.visible = true;
+                if (!this.nameList.includes(record.category_name)) {
+                    this.categoryId = record.category_id;
+                    this.operateType = -1;
+                    this.modalTitle = "提示";
+                    this.visible = true;
+                } else {
+                    Modal.warning({
+                        title: "",
+                        content: "此分类下有科研活动，不能删除",
+                        centered: true
+                    })
+                    return
+                }
+
             }
         },
         components: {
@@ -252,18 +275,22 @@
         width: 100%;
         height: auto;
         padding: 0.5rem;
-        .tab-search-style {
-            width: 100%;
-            height: 3rem;
-            display: flex;
-            justify-content: space-between;
-            .ant-tabs {
-                width: 200px;
-            }
-        }
-        .ant-pagination {
-            margin-top: 0.5rem;
-            text-align: right;
-        }
+
+    .tab-search-style {
+        width: 100%;
+        height: 3rem;
+        display: flex;
+        justify-content: space-between;
+
+    .ant-tabs {
+        width: 200px;
+    }
+
+    }
+    .ant-pagination {
+        margin-top: 0.5rem;
+        text-align: right;
+    }
+
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue
index a7cdb1f..1e4d6e9 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorInfo.vue
@@ -20,7 +20,7 @@
                             <div class="list-content-style">
                                 <div class="honor-person-info" v-for="info in personJson" :key="info.honor_person_id">
                                     <div class="person-name">{{info.honor_person_name}}</div>
-                                    <Upload :type="2" :multiple="false" title="点击上传" :option="{}" :canDownload="false"
+                                    <Upload :type="2" :multiple="false" title="点击上传" :option="{}" :canDownload="false" :emptyImgShow="false"
                                             ref="fileUpload"
                                             @uploadComplete="(file)=>{info.attachment_json = JSON.stringify(file)}"
                                     />
@@ -52,9 +52,10 @@
     import SelectStudent from '../../../../../../components/common/selectPeople/SelectStudent';
     import Upload from '../../../../../../components/common/uploader/Upload.vue';
     import InterConfig from '../interConfig';
-    export default{
-        props: ["categoryType"],
-        data(){
+
+    export default {
+        props: ["categoryType",],
+        data() {
             return {
                 category: this.$props.categoryType,//5 教师 6 学生
                 pageLoading: false,
@@ -74,7 +75,7 @@
                 listScroll: this.StaticParams.scrollOption,
             }
         },
-        created(){
+        created() {
             this.getCategoryList();
         },
         watch: {
@@ -87,7 +88,7 @@
             }
         },
         methods: {
-            getCategoryList:function () {
+            getCategoryList: function () {
                 let param = {
                     bureau_id: this.BaseConfig.person_info_my.bureau_id,
                     category_type: this.category,
@@ -220,108 +221,130 @@
         height: auto;
         font-size: 1rem;
         color: black;
-        .add-record-row-style {
-            width: 50%;
-            min-height: 3rem;
-            margin: 0.5rem auto;
-            display: flex;
-            .li-box {
-                min-height: 3rem;
-                line-height: 3rem;
-                .must-option-style {
-                    color: red;
-                    margin-right: 0.2rem;
-                }
-            }
-            .li-left {
-                width: 15%;
-                text-align: right;
-            }
-            .li-right {
-                width: 85%;
-                .person-list-content-style {
-                    width: 700px;
-                    height: 500px;
-                    background-color: #ebebeb;
-                    .list-content-style {
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-wrap: wrap;
-                        .honor-person-info {
-                            width: auto;
-                            height: 180px;
-                            border: 1px solid #31a8fa;
-                            margin: 0.5rem 0 0 0.5rem;
-                            display: flex;
-                            flex-direction: column;
-                            justify-content: center;
-                            .person-name {
-                                width: 100%;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                                text-align: center;
-                            }
-                            /deep/ .img-style {
-                                margin-right: 0 !important;
-                            }
-                        }
-                    }
-                }
-                .ant-select {
-                    width: 100px;
-                }
-                .no-border-input-style {
-                    border-top: 0 !important;
-                    border-left: 0 !important;
-                    border-right: 0 !important;
-                }
-                .photo-container-style {
-                    display: flex;
-                    align-items: center;
-                    align-content: center;
-                    justify-content: center;
-                    justify-items: center;
-                    width: 120px !important;
-                    border: 1px solid #e5e5e5;
-                    height: 160px;
-                    background-color: white;
-                    position: relative;
-                    .operate-class {
-                        position: absolute;
-                        bottom: 0.1rem;
-                        color: #31a8fa;
-                        font-size: 1rem;
-                        cursor: pointer;
-                        display: none;
-                    }
-                    .photo-size-style {
-                        display: flex;
-                        align-items: center;
-                        align-content: center;
-                        justify-items: center;
-                        justify-content: center;
-                    }
-                }
-                .edit-style {
-                    &:hover {
-                        .operate-class {
-                            display: inline-block;
-                        }
-                    }
-                }
-            }
-        }
-        .button-row-style {
-            width: 50%;
-            margin: auto;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            .button-style {
-                margin-left: 0.5rem;
-            }
-        }
+
+    .add-record-row-style {
+        width: 50%;
+        min-height: 3rem;
+        margin: 0.5rem auto;
+        display: flex;
+
+    .li-box {
+        min-height: 3rem;
+        line-height: 3rem;
+
+    .must-option-style {
+        color: red;
+        margin-right: 0.2rem;
+    }
+
+    }
+    .li-left {
+        width: 15%;
+        text-align: right;
+    }
+
+    .li-right {
+        width: 85%;
+
+    .person-list-content-style {
+        width: 700px;
+        height: 500px;
+        background-color: #ebebeb;
+
+    .list-content-style {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-wrap: wrap;
+
+    .honor-person-info {
+        width: auto;
+        height: 180px;
+        border: 1px solid #31a8fa;
+        margin: 0.5rem 0 0 0.5rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+
+    .person-name {
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: center;
+    }
+
+    /deep/ .img-style {
+        margin-right: 0 !important;
+    }
+
+    }
+    }
+    }
+    .ant-select {
+        width: 100px;
+    }
+
+    .no-border-input-style {
+        border-top: 0 !important;
+        border-left: 0 !important;
+        border-right: 0 !important;
+    }
+
+    .photo-container-style {
+        display: flex;
+        align-items: center;
+        align-content: center;
+        justify-content: center;
+        justify-items: center;
+        width: 120px !important;
+        border: 1px solid #e5e5e5;
+        height: 160px;
+        background-color: white;
+        position: relative;
+
+    .operate-class {
+        position: absolute;
+        bottom: 0.1rem;
+        color: #31a8fa;
+        font-size: 1rem;
+        cursor: pointer;
+        display: none;
+    }
+
+    .photo-size-style {
+        display: flex;
+        align-items: center;
+        align-content: center;
+        justify-items: center;
+        justify-content: center;
+    }
+
+    }
+    .edit-style {
+
+    &
+    :hover {
+
+    .operate-class {
+        display: inline-block;
+    }
+
+    }
+    }
+    }
+    }
+    .button-row-style {
+        width: 50%;
+        margin: auto;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+    .button-style {
+        margin-left: 0.5rem;
+    }
+
+    }
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue
index daaf5ed..9b843d5 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/honor/honorList.vue
@@ -11,7 +11,7 @@
             </div>
             <a-table :columns="tableColumn" :data-source="dataList" :loading="loading" :pagination="false">
                 <div slot="honorPhoto" slot-scope="text, record" class="idPhotoContent">
-                    <Upload :type="2" :multiple="false" :option="{}" :canDownload="false"
+                    <Upload :type="2" :multiple="false" :option="{}" :canDownload="false" :emptyImgShow="true"
                             :fileData="record.fileList"
                             :canUpload="false"
                             ref="fileUpload"
@@ -45,6 +45,7 @@
     import _ from 'lodash';
     import Upload from '../../../../../../components/common/uploader/Upload.vue';
     import HonorInfo from './honorInfo.vue';
+
     const tableColumn = [
         {
             dataIndex: 'index',
@@ -66,9 +67,9 @@
             align: "center"
         }
     ]
-    export default{
+    export default {
         props: ["menuId"],
-        data(){
+        data() {
             return {
                 pageType: 0,//0 列表页面 1 新增页面
                 categoryType: 0,// 5 教师 6 学生
@@ -92,13 +93,13 @@
                 visible: false,
             }
         },
-        created(){
+        created() {
             this.categoryType = this.$props.menuId === "studentHonor" ? 6 : 5;
             this.buildTableColumn();
             this.getCategoryList();
             this.getHonorList();
         },
-        mounted(){
+        mounted() {
 
         },
         watch: {
@@ -203,6 +204,8 @@
                             }
                         }
                         this.dataList = dataList;
+                        console.log(this.dataList)
+                        // this.dataList./honor_person_id
                         this.totalNum = resData.data.total_row;
                         this.totalPage = resData.data.total_page;
                     }
@@ -238,6 +241,7 @@
                     identity_id: this.BaseConfig.userInfo.identity_id,
                     bureau_id: this.BaseConfig.person_info_my.bureau_id,
                 }
+                console.log('a', param)
                 this.InterfaceConfig.callInterface([{
                     url: InterConfig.saveHonor.url,
                     params: param,
@@ -303,29 +307,35 @@
         width: 100%;
         height: auto;
         padding: 0.5rem;
-        .search-and-add-style {
-            width: 100%;
-            height: 3.5rem;
-            background-color: white;
-            margin-bottom: 0.5rem;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 0.5rem;
-            .ant-select {
-                width: 100px;
-            }
-        }
-        .ant-table-wrapper {
-            /deep/ .upload-container-style {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-            }
-        }
-        .ant-pagination {
-            margin-top: 0.5rem;
-            text-align: right;
-        }
+
+    .search-and-add-style {
+        width: 100%;
+        height: 3.5rem;
+        background-color: white;
+        margin-bottom: 0.5rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 0.5rem;
+
+    .ant-select {
+        width: 100px;
+    }
+
+    }
+    .ant-table-wrapper {
+
+    /deep/ .upload-container-style {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    }
+    .ant-pagination {
+        margin-top: 0.5rem;
+        text-align: right;
+    }
+
     }
 </style>
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/appraisingInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/appraisingInfo.vue
index 588bf49..c63462b 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/appraisingInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/appraisingInfo.vue
@@ -20,20 +20,23 @@
                     <!--                    <div>-->
                     <!--                        {{teacherNames}}-->
                     <!--                    </div>-->
-                    <a-list :data-source="listData">
-                        <a-list-item v-for="(item,i) in listData" :key="i">
-                            <span class="name">{{item.person_name}}</span>
-                            <span class="listData_title">所属单位：{{item.bureau_name}}</span>
-                            <a-popconfirm title="确定删除本条信息吗?"
-                                          ok-text="确认"
-                                          cancel-text="取消"
-                                          @confirm="confirmDelete(i)"
-                                          @cancel="cancelDelete">
-                                <a href="#" style="color: #1890FF">删除</a>
-                            </a-popconfirm>
-                        </a-list-item>
-                    </a-list>
-
+                    <vue-scroll :ops="listScroll"
+                                :style="showPage?'height:12rem':'height:22rem'"
+                                class="score-list-div">
+                        <a-list :data-source="listData">
+                            <a-list-item v-for="(item,i) in listData" :key="i">
+                                <span class="name">{{item.person_name}}</span>
+                                <span class="listData_title">所属单位：{{item.bureau_name}}</span>
+                                <a-popconfirm title="确定删除本条信息吗?"
+                                              ok-text="确认"
+                                              cancel-text="取消"
+                                              @confirm="confirmDelete(i)"
+                                              @cancel="cancelDelete">
+                                    <a href="#" style="color: #1890FF">删除</a>
+                                </a-popconfirm>
+                            </a-list-item>
+                        </a-list>
+                    </vue-scroll>
                 </div>
             </div>
             <div class="add-record-row-style button-row-style">
@@ -87,6 +90,8 @@
                 teacherNames: "",
                 selectTeacherAry: [],
                 listData: [],
+                listScroll: this.StaticParams.scrollOption,
+                showPage: true,
             }
         },
         created() {
@@ -169,6 +174,7 @@
                     method: InterConfig.excellentSave.method,
                     isTestLogin: InterConfig.excellentSave.isTestLogin,
                 }], (result) => {
+                    console.log('re', result)
                     this.pageLoading = false;
                     let resData = result[0].data;
                     if (resData.code === 2000) {
@@ -189,6 +195,7 @@
             },
             selectComplete: function (ary) {
                 this.listData = ary[0]
+                this.showPage = false
                 let teacherAry = [];
                 if (ary && ary.length > 0) {
                     let objAry = ary[0];
@@ -251,151 +258,165 @@
         }
     }
 </script>
-<style scoped lang="scss">
+<style scoped lang="scss" type="text/scss">
     .teacher-appraising-info-content-style {
         width: 100%;
         height: auto;
         font-size: 1rem;
         color: black;
 
-    .add-record-row-style {
-        width: 50%;
-        min-height: 3rem;
-        margin: 0.5rem auto;
-        display: flex;
+        .add-record-row-style {
+            width: 50%;
+            min-height: 3rem;
+            margin: 0.5rem auto;
+            display: flex;
 
-    .li-box {
-        min-height: 3rem;
-        line-height: 3rem;
+            .li-box {
+                min-height: 3rem;
+                line-height: 3rem;
 
-    .must-option-style {
-        color: red;
-        margin-right: 0.2rem;
-    }
+                .must-option-style {
+                    color: red;
+                    margin-right: 0.2rem;
+                }
 
-    }
-    .li-left {
-        width: 15%;
-        text-align: right;
-    }
+            }
 
-    .liList {
-        width: 60% !important;
+            .li-left {
+                width: 15%;
+                text-align: right;
+            }
 
-    .name {
-        display: inline-block;
-        width: 80px;
-    }
+            .liList {
+                width: 60% !important;
 
-    .delete {
-        cursor: pointer;
-        color: #1990FF;
-    }
+                .score-list-div {
+                    width: 100%;
+                    height: 23rem;
+                    display: flex;
+                    flex-direction: column;
+                    margin-top: 0;
+                    overflow: hidden;
 
-    }
+                }
 
-    .li-right {
-        width: 85%;
+                .name {
+                    display: inline-block;
+                    width: 80px;
+                }
 
-    .person-list-content-style {
-        width: 700px;
-        height: 500px;
-        background-color: #ebebeb;
+                .delete {
+                    cursor: pointer;
+                    color: #1990FF;
+                }
 
-    .list-content-style {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-wrap: wrap;
-
-    .honor-person-info {
-        width: auto;
-        height: 180px;
-        border: 1px solid #31a8fa;
-        margin: 0.5rem 0 0 0.5rem;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-
-    .person-name {
-        width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        text-align: center;
-    }
+            }
 
-    /deep/ .img-style {
-        margin-right: 0 !important;
-    }
+            .li-right {
+                width: 85%;
 
-    }
-    }
-    }
-    .ant-select {
-        width: 100px;
-    }
+                .person-list-content-style {
+                    width: 700px;
+                    height: 500px;
+                    background-color: #ebebeb;
 
-    .no-border-input-style {
-        border-top: 0 !important;
-        border-left: 0 !important;
-        border-right: 0 !important;
-    }
+                    .list-content-style {
+                        width: 100%;
+                        height: 100%;
+                        display: flex;
+                        flex-wrap: wrap;
 
-    .photo-container-style {
-        display: flex;
-        align-items: center;
-        align-content: center;
-        justify-content: center;
-        justify-items: center;
-        width: 120px !important;
-        border: 1px solid #e5e5e5;
-        height: 160px;
-        background-color: white;
-        position: relative;
-
-    .operate-class {
-        position: absolute;
-        bottom: 0.1rem;
-        color: #31a8fa;
-        font-size: 1rem;
-        cursor: pointer;
-        display: none;
-    }
+                        .honor-person-info {
+                            width: auto;
+                            height: 180px;
+                            border: 1px solid #31a8fa;
+                            margin: 0.5rem 0 0 0.5rem;
+                            display: flex;
+                            flex-direction: column;
+                            justify-content: center;
 
-    .photo-size-style {
-        display: flex;
-        align-items: center;
-        align-content: center;
-        justify-items: center;
-        justify-content: center;
-    }
+                            .person-name {
+                                width: 100%;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                                text-align: center;
+                            }
 
-    }
-    .edit-style {
+                            /deep/ .img-style {
+                                margin-right: 0 !important;
+                            }
 
-    &
-    :hover {
+                        }
+                    }
+                }
 
-    .operate-class {
-        display: inline-block;
-    }
+                .ant-select {
+                    width: 100px;
+                }
 
-    }
-    }
-    }
-    }
-    .button-row-style {
-        width: 50%;
-        margin: auto;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-    .button-style {
-        margin-left: 0.5rem;
-    }
+                .no-border-input-style {
+                    border-top: 0 !important;
+                    border-left: 0 !important;
+                    border-right: 0 !important;
+                }
 
-    }
+                .photo-container-style {
+                    display: flex;
+                    align-items: center;
+                    align-content: center;
+                    justify-content: center;
+                    justify-items: center;
+                    width: 120px !important;
+                    border: 1px solid #e5e5e5;
+                    height: 160px;
+                    background-color: white;
+                    position: relative;
+
+                    .operate-class {
+                        position: absolute;
+                        bottom: 0.1rem;
+                        color: #31a8fa;
+                        font-size: 1rem;
+                        cursor: pointer;
+                        display: none;
+                    }
+
+                    .photo-size-style {
+                        display: flex;
+                        align-items: center;
+                        align-content: center;
+                        justify-items: center;
+                        justify-content: center;
+                    }
+
+                }
+
+                .edit-style {
+
+                    &
+                    :hover {
+
+                        .operate-class {
+                            display: inline-block;
+                        }
+
+                    }
+                }
+            }
+        }
+
+        .button-row-style {
+            width: 50%;
+            margin: auto;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            .button-style {
+                margin-left: 0.5rem;
+            }
+
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/studentHonor.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/studentHonor.vue
index 1e1097e..8f47040 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/studentHonor.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/studentHonor.vue
@@ -153,7 +153,6 @@
                     isTestLogin: InterConfig.getSchoolStageList.isTestLogin,
                 }], (result) => {
                     let resData = result[0].data;
-                    // console.log('学生荣誉',resData)
                     if (resData.code === 2000) {
                         let stageList = resData.data;
                         if (stageList && stageList.length > 0) {
@@ -167,6 +166,25 @@
                     }
                 })
             },
+            //获取班级列表
+            getGradeClassList: function () {
+                let param = {
+                    bureau_id: this.BaseConfig.person_info_my.bureau_id,
+                    stage_id: this.stageId,
+                    create_year: this.yearId,
+                }
+                this.InterfaceConfig.callInterface([{
+                    url: InterConfig.getGradeClassList.url,
+                    params: param,
+                    method: InterConfig.getGradeClassList.method,
+                    isTestLogin: InterConfig.getGradeClassList.isTestLogin,
+                }], (result) => {
+                    if (result[0].data.code === 2000 && result[0].data.length != 0) {
+                        let res = result[0].data
+                        this.classList = res
+                    }
+                })
+            },
             search: function () {
                 this.getRewardList();
             },
@@ -214,6 +232,7 @@
                     this.yearId = "";
                 }
                 this.getRewardList();
+                this.getGradeClassList()
             },
             classChange: function (value) {
                 this.classId = value;
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
index fb65248..b4bb2e2 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/courseInfo.vue
@@ -7,8 +7,8 @@
                     <a-cascader
                             :field-names="{label:'createYearName',value:'createYear',children:'create_year_list'}"
                             :allowClear="false"
-                            v-model:value="defaultValue"
-                            :options="stageList" @change="stageChange" placeholder="选择学段学年"></a-cascader>
+                            :options="stageList" @change="stageChange" placeholder="选择学段学年">
+                    </a-cascader>
                 </div>
             </div>
             <div class="add-record-row-style">
@@ -41,21 +41,23 @@
 <script>
     import {Spin, Button, Cascader, Input, InputNumber, Modal} from 'ant-design-vue';
     import InterConfig from '../interConfig';
-    export default{
+
+    export default {
         props: {
-            defaultValue: {
-                type: Array,
-                default: [],
+            // defaultValue: {
+            //     type: Array,
+            //     default: []
+            // },
+            planInfo: {
+                type: Object,
+                default: {}
             },
-            planInfo:{
-                type:Object,
-                default:{}
-            }
         },
-        data(){
+        data() {
             return {
+                selectedValue:[],
                 pageLoading: false,
-                planId:"",
+                planId: "",
                 stageId: "",
                 yearId: "",
                 stageList: [],
@@ -64,18 +66,18 @@
                 realNumber: "",//学校实际执行数量
             }
         },
-        created(){
+        created() {
             this.getStageList();
         },
-        mounted(){
-            if(this.planInfo && this.planInfo.plan_id !== ""){
+        mounted() {
+            if (this.planInfo && this.planInfo.plan_id !== "") {
                 this.planId = this.planInfo.plan_id;
                 this.courseName = this.planInfo.course_name;
                 this.planNumber = this.planInfo.plan_number;
                 this.realNumber = this.planInfo.real_number;
             }
-            this.stageId = this.defaultValue[0];
-            this.yearId = this.defaultValue[1];
+            // this.stageId = this.defaultValue[0];
+            // this.yearId = this.defaultValue[1];
         },
         methods: {
             getStageList: function () {
@@ -108,7 +110,7 @@
                 }
             },
             submit: function () {
-                if(this.stageId === "" || this.yearId === ""){
+                if (this.stageId === "" || this.yearId === "") {
                     Modal.warning({
                         title: "请选择学段或者学年",
                         content: "",
@@ -116,7 +118,7 @@
                     })
                     return;
                 }
-                if(this.courseName.trim() === ""){
+                if (this.courseName.trim() === "") {
                     Modal.warning({
                         title: "请输入课程名称",
                         content: "",
@@ -124,7 +126,7 @@
                     })
                     return;
                 }
-                if(this.planNumber === ""){
+                if (this.planNumber === "") {
                     Modal.warning({
                         title: "请输入省级计划数量",
                         content: "",
@@ -132,7 +134,7 @@
                     })
                     return;
                 }
-                if(this.realNumber === ""){
+                if (this.realNumber === "") {
                     Modal.warning({
                         title: "请输入学校实际执行数量",
                         content: "",
@@ -141,16 +143,18 @@
                     return;
                 }
                 let param = {
-                    plan_id:this.planId,
-                    stage_id:this.stageId,
-                    create_year:this.yearId,
-                    course_name:this.courseName,
-                    plan_number:this.planNumber,
-                    real_number:this.realNumber,
+                    plan_id: this.planId,
+                    stage_id: this.stageId,
+                    create_year: this.yearId,
+                    course_name: this.courseName,
+                    plan_number: this.planNumber,
+                    real_number: this.realNumber,
                     person_id: this.BaseConfig.userInfo.person_id,
                     identity_id: this.BaseConfig.userInfo.identity_id,
                     bureau_id: this.BaseConfig.person_info_my.bureau_id,
                 }
+                this.selectedValue.push(this.stageId,this.yearId)
+
                 this.InterfaceConfig.callInterface([{
                     url: InterConfig.saveSingle.url,
                     params: param,
@@ -164,7 +168,7 @@
                             content: "",
                             centered: true
                         });
-                        this.cancel();
+                        this.$emit('getSelectValue', this.selectedValue)
                     }
                 })
             },
@@ -189,108 +193,130 @@
         height: auto;
         font-size: 1rem;
         color: black;
-        .add-record-row-style {
-            width: 50%;
-            min-height: 3rem;
-            margin: 0.5rem auto;
-            display: flex;
-            .li-box {
-                min-height: 3rem;
-                line-height: 3rem;
-                .must-option-style {
-                    color: red;
-                    margin-right: 0.2rem;
-                }
-            }
-            .li-left {
-                width: 20%;
-                text-align: right;
-            }
-            .li-right {
-                width: 80%;
-                .person-list-content-style {
-                    width: 700px;
-                    height: 500px;
-                    background-color: #ebebeb;
-                    .list-content-style {
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-wrap: wrap;
-                        .honor-person-info {
-                            width: auto;
-                            height: 180px;
-                            border: 1px solid #31a8fa;
-                            margin: 0.5rem 0 0 0.5rem;
-                            display: flex;
-                            flex-direction: column;
-                            justify-content: center;
-                            .person-name {
-                                width: 100%;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                                text-align: center;
-                            }
-                            /deep/ .img-style {
-                                margin-right: 0 !important;
-                            }
-                        }
-                    }
-                }
-                .ant-select {
-                    width: 100px;
-                }
-                .no-border-input-style {
-                    border-top: 0 !important;
-                    border-left: 0 !important;
-                    border-right: 0 !important;
-                }
-                .photo-container-style {
-                    display: flex;
-                    align-items: center;
-                    align-content: center;
-                    justify-content: center;
-                    justify-items: center;
-                    width: 120px !important;
-                    border: 1px solid #e5e5e5;
-                    height: 160px;
-                    background-color: white;
-                    position: relative;
-                    .operate-class {
-                        position: absolute;
-                        bottom: 0.1rem;
-                        color: #31a8fa;
-                        font-size: 1rem;
-                        cursor: pointer;
-                        display: none;
-                    }
-                    .photo-size-style {
-                        display: flex;
-                        align-items: center;
-                        align-content: center;
-                        justify-items: center;
-                        justify-content: center;
-                    }
-                }
-                .edit-style {
-                    &:hover {
-                        .operate-class {
-                            display: inline-block;
-                        }
-                    }
-                }
-            }
-        }
-        .button-row-style {
-            width: 50%;
-            margin: auto;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            .button-style {
-                margin-left: 0.5rem;
-            }
-        }
+
+    .add-record-row-style {
+        width: 50%;
+        min-height: 3rem;
+        margin: 0.5rem auto;
+        display: flex;
+
+    .li-box {
+        min-height: 3rem;
+        line-height: 3rem;
+
+    .must-option-style {
+        color: red;
+        margin-right: 0.2rem;
+    }
+
+    }
+    .li-left {
+        width: 20%;
+        text-align: right;
+    }
+
+    .li-right {
+        width: 80%;
+
+    .person-list-content-style {
+        width: 700px;
+        height: 500px;
+        background-color: #ebebeb;
+
+    .list-content-style {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-wrap: wrap;
+
+    .honor-person-info {
+        width: auto;
+        height: 180px;
+        border: 1px solid #31a8fa;
+        margin: 0.5rem 0 0 0.5rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+
+    .person-name {
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: center;
+    }
+
+    /deep/ .img-style {
+        margin-right: 0 !important;
+    }
+
+    }
+    }
+    }
+    .ant-select {
+        width: 100px;
+    }
+
+    .no-border-input-style {
+        border-top: 0 !important;
+        border-left: 0 !important;
+        border-right: 0 !important;
+    }
+
+    .photo-container-style {
+        display: flex;
+        align-items: center;
+        align-content: center;
+        justify-content: center;
+        justify-items: center;
+        width: 120px !important;
+        border: 1px solid #e5e5e5;
+        height: 160px;
+        background-color: white;
+        position: relative;
+
+    .operate-class {
+        position: absolute;
+        bottom: 0.1rem;
+        color: #31a8fa;
+        font-size: 1rem;
+        cursor: pointer;
+        display: none;
+    }
+
+    .photo-size-style {
+        display: flex;
+        align-items: center;
+        align-content: center;
+        justify-items: center;
+        justify-content: center;
+    }
+
+    }
+    .edit-style {
+
+    &
+    :hover {
+
+    .operate-class {
+        display: inline-block;
+    }
+
+    }
+    }
+    }
+    }
+    .button-row-style {
+        width: 50%;
+        margin: auto;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+    .button-style {
+        margin-left: 0.5rem;
+    }
+
+    }
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
index ab6f24f..3c82759 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/teachingAdmin/coursePlan.vue
@@ -6,7 +6,8 @@
                         :field-names="{label:'createYearName',value:'createYear',children:'create_year_list'}"
                         :allowClear="false"
                         v-model:value="defaultValue"
-                        :options="stageList" @change="stageChange" placeholder="选择学段学年"></a-cascader>
+                        :options="stageList" @change="stageChange" placeholder="选择学段学年">
+                </a-cascader>
                 <a-button type="primary" @click="toAdd" class="add-button-style">新增</a-button>
             </div>
             <a-table :columns="tableColumn" :data-source="dataList" :loading="loading" :pagination="false"
@@ -35,7 +36,8 @@
             是否确定删除此条信息？
         </a-modal>
         <template v-if="pageType === 1">
-            <course-info :defaultValue="defaultValue" @cancel="cancel" @submit="submit" :planInfo="planInfo"/>
+            <!--            <course-info :defaultValue="defaultValue" @cancel="cancel" @submit="submit" :planInfo="planInfo"/>-->
+            <course-info @cancel="cancel" @submit="submit" @getSelectValue="getSelectValue" :planInfo="planInfo"/>
         </template>
     </div>
 </template>
@@ -111,11 +113,20 @@
         },
         created() {
             this.getStageList();
+            //this.getSelectValue()
         },
         mounted() {
-
         },
         methods: {
+            getSelectValue(val) {
+                if (this.defaultValue.length != 0) {
+                    this.defaultValue = val
+                    this.stageId = this.defaultValue[0]
+                    this.yearId = this.defaultValue[1]
+                    this.pageType = 0;
+                    this.getStageList();
+                }
+            },
             getStageList: function () {
                 let param = {
                     bureau_id: this.BaseConfig.person_info_my.bureau_id,
@@ -136,7 +147,13 @@
                             }
                         }
                         this.stageList = stageList;
-                        this.buildDefaultValue();
+                        console.log('this.defaultValue:',this.defaultValue)
+                        if (this.defaultValue.length == 0) {
+                            this.defaultValue.push(this.stageList[0].stage_id, this.stageList[0].create_year_list[0].createYear)
+                            this.buildDefaultValue();
+                        }else {
+                            this.getListPlanByStageYear();
+                        }
                     }
                 })
             },
@@ -174,6 +191,7 @@
                                 }
                             }
                             this.dataList = dataList;
+                            console.log('list',this.dataList)
                         }
                     })
                 }