diff --git a/src/views/screenAdaptation/assets/images/modalLogo.png b/src/views/screenAdaptation/assets/images/modalLogo.png
new file mode 100644
index 0000000..272f6fb
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/modalLogo.png differ
diff --git a/src/views/screenAdaptation/common/commonInfo.vue b/src/views/screenAdaptation/common/commonInfo.vue
index fe4b0be..8cfe51e 100644
--- a/src/views/screenAdaptation/common/commonInfo.vue
+++ b/src/views/screenAdaptation/common/commonInfo.vue
@@ -23,6 +23,7 @@
                     <div v-html="contentHtml"></div>
                 </vue-scroll>
             </div>
+            <img src="../assets/images/modalLogo.png" alt="" class="title-logo-png">
         </div>
     </modal-panel>
 </template>
@@ -90,7 +91,7 @@
                 this.showPanel = newData;
             },
             infoObj: function (newData) {
-                console.log("infoObj变化:",newData)
+                console.log("infoObj变化:", newData)
                 this.infoTitle = newData.title;
                 this.infoArr = newData.infoArr;
                 this.contentHtml = newData.content;
@@ -161,6 +162,8 @@
                 height: 50px;
                 display: flex;
                 align-items: center;
+                margin-left: 100px;
+                margin-bottom: 40px;
             }
             .ant-modal-body {
                 .common-info-style {
@@ -171,26 +174,45 @@
                     flex-direction: column;
                     .title-content-style {
                         width: 100%;
-                        min-height: 30px;
+                        min-height: 52px;
                         display: flex;
                         justify-content: center;
                         align-items: center;
+                        h1 {
+                            color: #fff;
+                        }
                     }
                     .info-content-style {
-                        width: 100%;
+                        width: 87%;
                         height: 30px;
                         display: flex;
                         align-items: center;
-                        justify-content: flex-end;
+                        justify-content: center;
+                        background: #525E7B;
+                        padding: 25px 0;
+                        margin: 0 auto;
+                        font-size: 18px;
                     }
                     .content-info-style {
                         width: 100%;
                         height: 400px;
-                        .content-scroll-style{
+                        font-size: 18px;
+                        line-height: 10px;
+                        margin-top: 20px;
+                        .content-scroll-style {
                             display: flex;
                             flex-wrap: wrap;
                         }
                     }
+                    .title-logo-png {
+                        vertical-align: middle;
+                        border-style: none;
+                        width: 240px;
+                        height: 150px;
+                        position: absolute;
+                        top: -10px;
+                        left: -10px;
+                    }
                 }
             }
         }
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue
index 704e239..3c43d46 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/parentingClasses.vue
@@ -17,7 +17,7 @@
                                     <img src="../images/familyEdu3.png" alt="">
                                 </div>
                                 <div class="familyEdu-list" v-for="(item,i) in familyEduListData" :key="i"
-                                     v-if="familyEduListData.length != 0">
+                                     v-if="familyEduListData.length != 0" @click="showInfo(item)">
                                     <span class="familyEdu-list-span"></span>
                                     <span class="familyEdu-list-content">
                                     {{item.content}}
@@ -30,7 +30,7 @@
                                 <a-empty description="暂无数据" v-if="activityDataEmpty" class="timeLine-empty"/>
                                 <a-row v-for="(item,i) in activityData" :key="i" type="flex" justify="space-between"
                                        v-if="activityData.length != 0"
-                                       class="activity-content">
+                                       class="activity-content" @click="showInfo(item)">
                                     <a-col :span="6" class="activity-img">
                                         <img :src="item.src" alt="">
                                     </a-col>
@@ -98,25 +98,31 @@
                     </a-col>
                 </a-row>
             </div>
-            <CommonModal :visible="visible" :modalTitle="modalTitle" :releaseCompany="releaseCompany"
-                         :releasePerson="releasePerson" :releaseTime="releaseTime"
-                         @cancelModal="cancelModal"></CommonModal>
+            <!--<CommonModal :visible="visible" :modalTitle="modalTitle" :releaseCompany="releaseCompany"-->
+            <!--:releasePerson="releasePerson" :releaseTime="releaseTime"-->
+            <!--@cancelModal="cancelModal"></CommonModal>-->
+            <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                        @cancel="closeInfo"/>
         </a-spin>
     </CommonBox>
 </template>
 <script>
     /*
-    * 家长学校
-    * */
+     * 家长学校
+     * */
     import CommonBox from '../../secondPages/commonBox.vue';
-    import CommonModal from './commonModal.vue';
+    import CommonInfo from '../../../common/commonInfo.vue'
+    //import CommonModal from './commonModal.vue';
     import {Row, Col, Spin, Empty} from 'ant-design-vue';
 
     export default {
         data() {
             return {
+                infoObj: {},
+                infoId: '',
+                visible: false,
                 //对话框数据
-                visible: false,//对话框显示隐藏
+                //visible: false,//对话框显示隐藏
                 modalTitle: '',//对话框标题
                 releaseCompany: '',//发布单位
                 releasePerson: '',//发布人
@@ -366,11 +372,11 @@
         },
         components: {
             CommonBox,
-            CommonModal,
             ARow: Row,
             ACol: Col,
             AEmpty: Empty,
             ASpin: Spin,
+            CommonInfo,
         }
     }
 </script>
@@ -388,7 +394,6 @@
             width: 100%;
             height: 100%;
 
-
             /*家庭教育*/
             .familyEdu {
                 color: #81D3F8;
@@ -612,7 +617,6 @@
                     background: #027DB4;
                 }
 
-
                 .familyMember-listBox {
                     height: 365px;
                     position: absolute;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/povertyAlleviation.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/povertyAlleviation.vue
index aa51e24..2f4c963 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/povertyAlleviation.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/povertyAlleviation.vue
@@ -9,9 +9,10 @@
                             <a-col :span=4></a-col>
                             <a-col :span="20" style="position: relative;">
                                 <a-timeline>
-                                    <a-timeline-item v-for="(item,i) in policybenefits" :key="i">
+                                    <a-timeline-item v-for="(item,i) in policybenefits" :key="i"
+                                                     @click="showInfo(item)">
                                         <div class="timelineDate">
-                                            <span class="span1">{{item.time.substring(0,4)}}</span>
+                                            <span class="span1">{{item.time.substring(0, 4)}}</span>
                                             <span class="span2">{{item.time.substring(5)}}</span>
                                         </div>
                                         {{item.title}}
@@ -30,7 +31,7 @@
                         <!--                    <vue-scroll :ops="listScroll" :style="showPage?'height:22.1rem':'height:22.1rem'"-->
                         <!--                                class="score-list-div">-->
                         <a-row class="poverty-alleviation-row" v-for="(item,i) in specialeducation" :key="i"
-                               v-if="specialeducation.length != 0">
+                               v-if="specialeducation.length != 0" @click="showInfo(item)">
                             <a-col :span="4">
                                 <img :src="item.src" alt="">
                             </a-col>
@@ -56,6 +57,8 @@
                     </a-tab-pane>
                 </a-tabs>
             </div>
+            <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                        @cancel="closeInfo"/>
         </a-spin>
     </CommonBox>
 </template>
@@ -63,14 +66,18 @@
 
 <script>
     /*
-    * 学生活动
-    * */
+     * 学生活动
+     * */
     import CommonBox from '../../secondPages/commonBox.vue';
+    import CommonInfo from '../../../common/commonInfo.vue'
     import {Tabs, Timeline, Row, Col, Empty, Spin,} from 'ant-design-vue';
 
     export default {
         data() {
             return {
+                infoObj: {},
+                infoId: '',
+                visible: false,
                 spinning: false,
                 policybenefits: [
                     // {
@@ -214,6 +221,13 @@
                     }
                 )
             },
+            showInfo(item){
+                this.visible = true
+            },
+            closeInfo () {
+                this.infoId = "";
+                this.visible = false;
+            }
         },
         components: {
             CommonBox,
@@ -225,6 +239,7 @@
             ATimelineItem: Timeline.Item,
             ASpin: Spin,
             AEmpty: Empty,
+            CommonInfo,
         }
     }
 </script>
@@ -316,7 +331,6 @@
                     border: none !important;
                     color: #fff !important;
 
-
                     .ant-tabs-nav {
                         .ant-tabs-ink-bar, .ant-tabs-ink-bar-animated {
                             width: 0 !important;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
index 73ea5fc..c578afd 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
@@ -4,35 +4,43 @@
             <div class="student-activities-content-style">
                 <div class="window-left-style">
                     <div class="left-top-style">
-                        <img :src="imgArr[0].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                        <img :src="imgArr[0].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                             @click="showInfo(item)"/>
                         <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                     </div>
                     <div class="left-bottom-style">
                         <div class="item-style">
-                            <img :src="imgArr[1].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                            <img :src="imgArr[1].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                                 @click="showInfo(item)"/>
                             <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                         </div>
                         <div class="item-style">
-                            <img :src="imgArr[2].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                            <img :src="imgArr[2].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                                 @click="showInfo(item)"/>
                             <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                         </div>
                     </div>
                 </div>
                 <div class="window-right-style">
                     <div class="right-item-style">
-                        <img :src="imgArr[3].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                        <img :src="imgArr[3].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                             @click="showInfo(item)"/>
                         <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                     </div>
                     <div class="right-item-style">
-                        <img :src="imgArr[4].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                        <img :src="imgArr[4].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                             @click="showInfo(item)"/>
                         <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                     </div>
                     <div class="right-item-style">
-                        <img :src="imgArr[5].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"/>
+                        <img :src="imgArr[5].src" style="width: 100%;height: 100%" v-if="imgArr.length!=0"
+                             @click="showInfo(item)"/>
                         <img src="" style="width: 100%;height: 100%" v-if="imgArr.length==0"/>
                     </div>
                 </div>
             </div>
+            <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                        @cancel="closeInfo"/>
         </a-spin>
     </CommonBox>
 </template>
@@ -43,11 +51,15 @@
      * 学生活动
      * */
     import CommonBox from '../../secondPages/commonBox.vue';
+    import CommonInfo from '../../../common/commonInfo.vue'
     import {Spin} from 'ant-design-vue';
 
     export default {
         data() {
             return {
+                infoObj: {},
+                infoId: '',
+                visible: false,
                 spinning: false,
                 imgArr: [
                     // {src: require('../../../assets/images/window/studentActivity01.jpg')},
@@ -92,8 +104,14 @@
                         console.log('学生活动', result[0].data)
                     }
                 )
-
             },
+            showInfo(item){
+                this.visible = true
+            },
+            closeInfo () {
+                this.infoId = "";
+                this.visible = false;
+            }
         }
     }
 </script>
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
index 1812e12..ff03422 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
@@ -121,7 +121,7 @@
                         <div class="classManage-event-list">
                             <a-row v-for="(item,i) in factualNews" class="classManage-event-listRow" :key="i"
                                    type="flex"
-                                   justify="center" align="middle">
+                                   justify="center" align="middle" @click="showContent(item)">
                                 <a-col :span="1"
                                        style="width: 5px;height: 5px;border-radius: 50%;background: #00FFFF"></a-col>
                                 <a-col :span="17" offset="1"
@@ -135,16 +135,21 @@
                 </a-row>
             </div>
         </a-spin>
+        <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                    @cancel="closeInfo"/>
     </CommonBox>
 </template>
 <script>
     import CommonBox from '../../secondPages/commonBox.vue';
     import {Carousel, Table, Row, Col, Empty, Spin} from 'ant-design-vue';
     import {Carousel3d, Slide} from 'vue-carousel-3d'
-
+    import CommonInfo from '../../../common/commonInfo.vue'
     export default {
         data() {
             return {
+                visible: false,
+                infoId: '',
+                infoObj: {},
                 bestHeadMasterName: 'XXX',
                 bestHeadMasterScore: 'XX',
                 bestHeadMasterClass: 'XX',
@@ -201,47 +206,41 @@
                 ],
                 //班级文化
                 dotposition: 'right',
-                classCulture:
-                    [
-                        // [
-                        //     {src: require('../images/classCulture1.png')},
-                        //     {src: require('../images/classCulture2.png')},
-                        //     {src: require('../images/classCulture3.png')},
-                        //     {src: require('../images/classCulture4.png')},
-                        //     {src: require('../images/classCulture5.png')},
-                        //     {src: require('../images/classCulture6.png')},
-                        // ],
-                        // [
-                        //     {src: require('../images/classCulture5.png')},
-                        //     {src: require('../images/classCulture4.png')},
-                        //     {src: require('../images/classCulture2.png')},
-                        //     {src: require('../images/classCulture1.png')},
-                        //     {src: require('../images/classCulture6.png')},
-                        //     {src: require('../images/classCulture3.png')},
-                        // ],
-                    ],
-                currentP:
-                    '',
+                classCulture: [
+                    // [
+                    //     {src: require('../images/classCulture1.png')},
+                    //     {src: require('../images/classCulture2.png')},
+                    //     {src: require('../images/classCulture3.png')},
+                    //     {src: require('../images/classCulture4.png')},
+                    //     {src: require('../images/classCulture5.png')},
+                    //     {src: require('../images/classCulture6.png')},
+                    // ],
+                    // [
+                    //     {src: require('../images/classCulture5.png')},
+                    //     {src: require('../images/classCulture4.png')},
+                    //     {src: require('../images/classCulture2.png')},
+                    //     {src: require('../images/classCulture1.png')},
+                    //     {src: require('../images/classCulture6.png')},
+                    //     {src: require('../images/classCulture3.png')},
+                    // ],
+                ],
+                currentP: '',
                 //时事新闻数据
-                factualNews:
-                    [
-                        // {content: '洋浦薛小平小学部开展班级文化展示活动', date: '2022/01/22'},
-                    ],
+                factualNews: [
+                    // {content: '洋浦薛小平小学部开展班级文化展示活动', date: '2022/01/22'},
+                ],
                 //时事新闻的轮播图
-                carousel3dData:
-                    [
-                        {src: require('../images/newsPic1.png')},
-                        {src: require('../images/newsPic2.png')},
-                        {src: require('../images/newsPic3.png')},
-                        {src: require('../images/newsPic4.png')},
-                        {src: require('../images/newsPic5.png')},
-                    ],
-                swiperOption:
-                    {
-                        speed: 400,
-                        loop:
-                            true,
-                    },
+                carousel3dData: [
+                    {src: require('../images/newsPic1.png')},
+                    {src: require('../images/newsPic2.png')},
+                    {src: require('../images/newsPic3.png')},
+                    {src: require('../images/newsPic4.png')},
+                    {src: require('../images/newsPic5.png')},
+                ],
+                swiperOption: {
+                    speed: 400,
+                    loop: true,
+                },
                 redFlagClassMatchEmpty: false,
                 classCultureEmpty: false,
                 factualNewsEmpty: false,
@@ -363,14 +362,12 @@
                 this.bestHeadMasterScore = item.score
                 this.bestHeadMasterClass = item.class_name
                 this.bestHeadMasterName = this.detailTableData[0].class_teacher_name
-            }
-            ,
+            },
             //退出表格详情页
             exitdetail() {
                 this.classManageTableBody = true
                 this.detailTableData = []
-            }
-            ,
+            },
             //班级文化
             getClassCulture() {
                 let param = {
@@ -398,8 +395,7 @@
                         this.classCultureEmpty = true
                     }
                 })
-            }
-            ,
+            },
             //时事新闻
             getFactualNewsData() {
                 let param = {
@@ -427,8 +423,14 @@
                         this.factualNewsEmpty = true
                     }
                 })
+            },
+            showContent(item){
+                this.visible = true
+            },
+            closeInfo(){
+                this.infoId = "";
+                this.visible = false
             }
-            ,
         },
         components: {
             CommonBox,
@@ -441,6 +443,7 @@
             //时事新闻轮播图
             Carousel3d,
             Slide,
+            CommonInfo,
         }
     }
 </script>
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue
index 27a6194..1d9708d 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue
@@ -17,7 +17,7 @@
                         <a-timeline reverse ref="timeLineUl" v-if="teamBuildData.length != 0">
                             <a-timeline-item
                                     v-for="(item,i) in teamBuildData" :key="i" @mouseenter="enter(i)"
-                                    @mouseleave="leave(i)"
+                                    @mouseleave="leave(i)" @click="showInfo(item)"
                             >
                                 <p style="color:#80FFFF;font-size: 12px;margin-bottom: 0;">{{item.time}}</p>
                                 <p style="font-size: 14px;color: #fff;margin-bottom: 0;overflow:hidden; text-overflow:ellipsis;white-space: nowrap;">
@@ -51,7 +51,7 @@
                             <a-timeline reverse class="headMasterMeeting">
                                 <a-timeline-item v-for="(item,i) in headMasterMeeting" :key="i">
                                     <p style="color:#80FFFF;font-size: 12px;margin-bottom: 0;">
-                                        {{item.meeting_date.slice(0,9)}} {{item.start_time.slice(11,16)}}</p>
+                                        {{item.meeting_date.slice(0, 9)}} {{item.start_time.slice(11, 16)}}</p>
                                     <p style="font-size: 14px;color: #fff;margin-bottom: 0;overflow:hidden; text-overflow:ellipsis;white-space: nowrap;">
                                         {{item.meeting_place}} | {{item.attendees}}</p>
                                 </a-timeline-item>
@@ -71,7 +71,8 @@
                     <a-col class="masterList">
                         <a-empty description="暂无数据" v-if="headMasterTrainDataEmpty" class="timeLine-empty"/>
                         <a-collapse :activeKey="masterListActiveKey" accordion v-if="headMasterTrainData.length != 0">
-                            <a-collapse-panel :key="i" :header="item.titleText" v-for="(item,i) in headMasterTrainData">
+                            <a-collapse-panel :key="i" :header="item.titleText" v-for="(item,i) in headMasterTrainData"
+                                              @click="showInfo(item)">
                                 <span class="masterList-span"> {{item.time}}</span>
                                 <img v-for="(item2,i2) in item.picData" :src="item2.src" alt="" :key="i2">
                             </a-collapse-panel>
@@ -124,11 +125,14 @@
                     </a-col>
                 </a-row>
             </div>
+            <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                        @cancel="closeInfo"/>
         </a-spin>
     </CommonBox>
 </template>
 <script>
     import CommonBox from '../../secondPages/commonBox.vue';
+    import CommonInfo from '../../../common/commonInfo.vue'
     import {Carousel, Timeline, Table, Spin, Row, Col, Collapse, Empty} from 'ant-design-vue';
     import {swiper, swiperSlide} from 'vue-awesome-swiper'
     import 'swiper/dist/css/swiper.css'
@@ -136,6 +140,9 @@
     export default {
         data() {
             return {
+                infoObj: {},
+                infoId: '',
+                visible: false,
                 spinning: false,
                 swiperOption1: {
                     initialSlide: 0,//默认第几张
@@ -227,6 +234,7 @@
             //班主任评优
             swiper,
             swiperSlide,
+            CommonInfo,
         },
         created() {
         },
@@ -412,6 +420,13 @@
                 this.excellent_id = id
                 this.getMasterBextData2()
 
+            },
+            showInfo(item){
+                this.visible = true
+            },
+            closeInfo(){
+                this.infoId = "";
+                this.visible = false;
             }
         }
     }
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
index a8645b1..469a136 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
@@ -192,16 +192,19 @@
                     </div>
                 </div>
             </div>
-            <CommonModal :visible="visible" :modalTitle="modalTitle" :releaseCompany="releaseCompany"
-                         :releasePerson="releasePerson" :releaseTime="releaseTime" :modalContent="modalContent"
-                         :modalContentName="modalContentName"
-                         @cancelModal="cancelModal"></CommonModal>
+            <!--<CommonModal :visible="visible" :modalTitle="modalTitle" :releaseCompany="releaseCompany"-->
+            <!--:releasePerson="releasePerson" :releaseTime="releaseTime" :modalContent="modalContent"-->
+            <!--:modalContentName="modalContentName"-->
+            <!--@cancelModal="cancelModal"></CommonModal>-->
+            <CommonInfo commonQueryId="query_dangjian_tuandui" :infoObj="infoObj" :commonId="infoId" :show="visible"
+                        @cancel="closeInfo"/>
         </a-spin>
     </CommonBox>
 </template>
 <script>
     import CommonBox from '../../secondPages/commonBox.vue';
-    import CommonModal from './commomModal.vue'
+    //    import CommonModal from './commomModal.vue'
+    import CommonInfo from '../../../common/commonInfo.vue'
     import {Carousel, Table, Row, Col, Collapse, Spin, Empty} from 'ant-design-vue';
     import {swiper, swiperSlide} from 'vue-awesome-swiper'
     import 'swiper/dist/css/swiper.css'
@@ -210,8 +213,11 @@
     export default {
         data() {
             return {
+                visible: false,
+                infoObj: {},
+                infoId: "",
                 //对话框数据
-                visible: false,//对话框显示隐藏
+                //visible: false,//对话框显示隐藏
                 modalTitle: '',//对话框标题
                 releaseCompany: '',//发布单位
                 releasePerson: '',//发布人
@@ -322,12 +328,12 @@
         methods: {
             //显示学生通报对话框
             showModal(accept) {
-                //console.log('显示学生通报对话框', accept)
+//                console.log('显示学生通报对话框', accept)
                 this.visible = true
-                this.modalTitle = accept.punish_title
-                this.releaseTime = accept.create_time.slice(0, 10) + '\xa0\xa0' + accept.create_time.slice(12, 19)
-                this.modalContent = accept.punish_context
-                this.modalContentName = accept.punish_students
+//                this.modalTitle = accept.punish_title
+//                this.releaseTime = accept.create_time.slice(0, 10) + '\xa0\xa0' + accept.create_time.slice(12, 19)
+//                this.modalContent = accept.punish_context
+//                this.modalContentName = accept.punish_students
             },
             //关闭对话框
             cancelModal() {
@@ -640,10 +646,14 @@
                 this.swiperOption.autoplay = true
                 this.swiperOption.loop = true
             },
+            closeInfo () {
+                this.infoId = "";
+                this.visible = false;
+            }
         },
         components: {
             CommonBox,
-            CommonModal,
+//            CommonModal,
             ARow: Row,
             ACol: Col,
             ACollapse: Collapse,
@@ -655,6 +665,7 @@
             //学生荣誉轮播图
             swiper,
             swiperSlide,
+            CommonInfo,
         }
     }
 </script>
@@ -1095,6 +1106,9 @@
                                 height: 80px !important;
                             }
                         }
+                        .botNoticeCarousel {
+                            cursor: pointer;
+                        }
                     }
                 }
             }