diff --git a/src/views/screenAdaptation/common/centerCommonInfo.vue b/src/views/screenAdaptation/common/centerCommonInfo.vue
index 0e33b0c..5ab66a8 100644
--- a/src/views/screenAdaptation/common/centerCommonInfo.vue
+++ b/src/views/screenAdaptation/common/centerCommonInfo.vue
@@ -42,7 +42,8 @@
      * */
     import {Modal} from 'ant-design-vue';
     import ModalPanel from "../../../components/common/modal/centerModalPanel.vue";
-    export default{
+
+    export default {
         props: {
             show: {
                 type: Boolean,
@@ -66,7 +67,7 @@
                 default: ""
             },
         },
-        data(){
+        data() {
             return {
                 infoId: this.$props.commonId,
                 title: this.modalTitle, //弹出框标题
@@ -99,7 +100,7 @@
                 this.contentHtml = newData.content;
             },
             $route: {
-                handler(val, oldval){
+                handler(val, oldval) {
                     if (val.path === '/partyCenter/party') {
                         this.isPartyCenter = true
                     } else {
@@ -108,14 +109,14 @@
                 },
             },
         },
-        mounted(){
+        mounted() {
             this.getHref()
 //            if (this.infoId && this.infoId !== "") {
 //                this.getDataInfo();
 //            }
         },
         methods: {
-            getHref(){
+            getHref() {
                 this.href = window.location.hash
                 if (this.href === '#/partyCenter/party') {
                     this.isPartyCenter = true
@@ -228,6 +229,9 @@
                             height: 100% !important;
                             p {
                                 line-height: 30px !important;
+                                span {
+                                    color: #fff !important;
+                                }
                             }
                             span {
                                 line-height: 30px !important;
diff --git a/src/views/screenAdaptation/common/commonClubInfo.vue b/src/views/screenAdaptation/common/commonClubInfo.vue
index 548cc6f..e6ddded 100644
--- a/src/views/screenAdaptation/common/commonClubInfo.vue
+++ b/src/views/screenAdaptation/common/commonClubInfo.vue
@@ -18,11 +18,11 @@
                     <div class="club-info-style">
                         <div class="title-box-style">社团信息</div>
                         <div class="info-row-style">
-                            <div class="left-style">团员人数 / </div>
+                            <div class="left-style">团员人数 /</div>
                             <div class="right-style">{{memberNum + '人'}}</div>
                         </div>
                         <div class="info-row-style">
-                            <div class="left-style">社团简介 / </div>
+                            <div class="left-style">社团简介 /</div>
                             <div class="right-style">
                                 <vue-scroll :ops="listScroll" style="width: 100%;height:100px">
                                     {{clubDescribe}}
@@ -92,7 +92,8 @@
     import "swiper/dist/css/swiper.css";
     import ImgPreview from '../common/imgPreview.vue';
     import moment from 'moment';
-    export default{
+
+    export default {
         props: {
             show: {
                 type: Boolean,
@@ -116,7 +117,7 @@
                 default: ""
             },
         },
-        data(){
+        data() {
             return {
                 spinning: false,
                 infoId: this.$props.commonId,
@@ -203,7 +204,7 @@
                 this.getDataexReport2();
             }
         },
-        mounted(){
+        mounted() {
 //            if (this.infoId && this.infoId !== "") {
 //                this.getDataInfo();
 //            }
diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue
index 0343874..a930102 100644
--- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/dutyPatrol.vue
@@ -8,26 +8,28 @@
                 </div>
             </div>
             <div v-if="showData && dutyList.length > 0" class="content-list-box-style">
-                <vue-scroll class="duty-list-content-style" :ops="listScroll" style="height:350px"  ref="contentRef">
-                <div v-for="item,index in dutyList" :key="'duty-group-'+index" class="content-list-style">
-                    <div class="title-style"><span>{{item.rotaName}}</span></div>
-                    <div v-for="person in item.dutyList" :key="person.staff_id" class="duty-box-style">
-                        <div class="img-box-style">
-                            <!--<img :src="person.imgSrc">-->
-                            <img-preview :imgObj="getImgObj(person)"/>
-                        </div>
-                        <div class="person-name-style">
-                            {{person.staff_name}}
-                        </div>
-                        <div class="person-info-style">
-                            <div>{{'<' + person.position + '>'}}</div>
-                            <div>{{person.telephone}}</div>
+                <vue-scroll class="duty-list-content-style" :ops="listScroll" style="height:350px" ref="contentRef">
+                    <div v-for="item,index in dutyList" :key="'duty-group-'+index" class="content-list-style">
+                        <div class="title-style"><span>{{item.rotaName}}</span></div>
+                        <div v-for="person in item.dutyList" :key="person.staff_id" class="duty-box-style">
+                            <div class="img-box-style">
+                                <!--<img :src="person.imgSrc">-->
+                                <img-preview :imgObj="JSON.parse(person.id_photo_json)"/>
+                            </div>
+                            <div class="person-name-style">
+                                {{person.staff_name}}
+                            </div>
+                            <div class="person-info-style">
+                                <div>{{'<' + person.position + '>'}}</div>
+                                <div>{{person.telephone}}</div>
+                            </div>
                         </div>
                     </div>
-                </div>
                 </vue-scroll>
             </div>
-            <div v-if="showData && dutyList.length === 0" class="no-data-content-style"><a-empty description="暂无数据"/></div>
+            <div v-if="showData && dutyList.length === 0" class="no-data-content-style">
+                <a-empty description="暂无数据"/>
+            </div>
 
             <!--<div class="content-list-style">-->
             <!--<div class="title-style"><span>初中部</span></div>-->
@@ -55,10 +57,11 @@
     import a from '../../../assets/images/dutyMember/duty1.png';
     import {Spin, Empty} from 'ant-design-vue';
     import ImgPreview from '../../../common/imgPreview.vue'
-    export default{
-        data(){
+
+    export default {
+        data() {
             return {
-                listScroll:this.StaticParams.scrollOption,
+                listScroll: this.StaticParams.scrollOption,
                 showData: false,
                 spinning: false,
                 weekList: [
@@ -162,7 +165,7 @@
                 dutyList: [],
             }
         },
-        mounted(){
+        mounted() {
             this.getDataexReport();
         },
         methods: {
@@ -188,16 +191,17 @@
                     if (result[0].data.success) {
                         let dataList = JSON.parse(result[0].data.result);
                         this.dutyList.push(...this.buildJsonList(dataList));
-                        console.log("this.dutyList:",this.dutyList)
+                        // console.log("this.dutyList:", this.dutyList)
+                        // console.log('json', JSON.parse(this.dutyList[0].dutyList[0].id_photo_json))
                     }
                 })
             },
-            getImgObj:function (obj) {
-                console.log("obj:",obj)
+            getImgObj: function (obj) {
+                // console.log("obj:", obj)
                 let json = obj.id_photo_json;
-                if(json && json !== ""){
+                if (json && json !== "") {
                     return JSON.parse(json)
-                }else {
+                } else {
                     return {}
                 }
 //                return JSON.parse(json);
@@ -254,7 +258,7 @@
             display: flex;
             flex-direction: column;
             margin-top: 5px;
-            /deep/ .ant-spin-container{
+            /deep/ .ant-spin-container {
                 width: 100%;
                 height: 100%;
                 .week-content-style {
@@ -274,7 +278,7 @@
                         text-align: center;
                     }
                 }
-                .content-list-box-style{
+                .content-list-box-style {
                     width: 100%;
                     height: 175px;
                     padding: 2px 0;
@@ -333,7 +337,7 @@
                         }
                     }
                 }
-                .no-data-content-style{
+                .no-data-content-style {
                     width: 100%;
                     height: calc(100% - 50px);
                     padding: 2px 0;
diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
index f02ad01..0af0c18 100644
--- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/meetingDynamic.vue
@@ -24,8 +24,14 @@
                                     <span class="top-span">{{item.theme}}</span>
                                 </div>
                                 <div class="right-row-style bottom-row">
-                                    <span class="bottom-info"><a-icon type="environment"/>{{item.building_info}}</span>
-                                    <span class="bottom-info"><a-icon type="user"/>{{item.person_names}}</span>
+                                    <span class="bottom-info bottom-info_building_info">
+                                        <a-icon type="environment"/>
+                                        <span class="info_text_building_info">{{item.building_info}}</span>
+                                    </span>
+                                    <span class="bottom-info bottom-info_person_names">
+                                        <a-icon type="user"/>
+                                        <span class="info_text_person_names">{{item.person_names}}</span>
+                                    </span>
                                 </div>
                                 <div v-if="item.meeting_status === 1" class="state-style">
                                     <span>进行中</span>
@@ -70,7 +76,8 @@
                     "query": {
                         "query_id": "query_xingzheng_huiyi",
                         "query_param": [
-                            this.BaseConfig.person_info_my.bureau_id + ""
+                            // this.BaseConfig.person_info_my.bureau_id + ""
+                            "900008135"
                         ]
                     },
                     "query_cache": 0,
@@ -83,6 +90,7 @@
                     params: param,
                     method: "post",
                 }], (result) => {
+                    console.log('会议动态', result)
                     this.showData = true;
                     this.spinning = false;
                     if (result[0].data.success) {
@@ -112,12 +120,23 @@
         width: 100%;
         height: 400px !important;
         position: relative;
+        .meeting-dynamic-box-style {
+            width: 100%;
+            height: 100%;
+            .ant-spin-container{
+                overflow-x: hidden;
+            }
+        }
         .meeting-dynamic-content-style {
             width: 100%;
             height: 360px !important;
             display: flex;
             flex-direction: column;
             margin-top: 5px;
+            overflow-x: hidden !important;
+            /deep/ .__panel {
+                overflow-x: visible !important;
+            }
             .item-row-style {
                 width: 100%;
                 height: 80px;
@@ -190,7 +209,8 @@
                                 }
                             }
                             .content-right-style {
-                                width: calc(100% - 200px);
+                                /*width: calc(100% - 200px);*/
+                                width: 100%;
                                 height: 70px;
                                 transform: skewX(-20deg);
                                 background-image: linear-gradient(#806f44, #40424d);
@@ -256,6 +276,23 @@
                                         height: 35px;
                                         line-height: 35px;
                                         transform: skewX(20deg);
+                                        display: flex;
+                                        justify-content: center;
+                                        align-items: center;
+                                    }
+                                    .info_text_person_names {
+                                        display: inline-block;
+                                        width: 270px;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                        white-space: nowrap;
+                                    }
+                                    .info_text_building_info {
+                                        display: inline-block;
+                                        width: 50px;
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                        white-space: nowrap;
                                     }
                                 }
                                 .state-style {
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue
index 5080eff..49fbffa 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/schoolCalendarFromNew.vue
@@ -19,7 +19,7 @@
                 <div class="row-item-style row-narrow-style">地点</div>
                 <div class="row-item-style row-narrow-style">对象</div>
             </div>
-            <vue-scroll v-if="showData && dataList.length > 0" :ops="listScroll" style="height:420px" class="list-data-content-row-style">
+            <vue-scroll v-if="showData && dataList.length > 0" :ops="listScroll" style="height:260px" class="list-data-content-row-style">
                 <template v-for="item,index in dataList">
                     <div :class="'data-item-style ' + (index === 0?'data-first-item-style':'')" :key="item.detail_id">
                         <div class="time-style">{{item.detail_time}}</div>
@@ -438,7 +438,7 @@
         }
         .week-calendar-content-style {
             width: 100%;
-            height: 430px;
+            height: 260px;
             display: flex;
             flex-direction: column;
             .list-data-header-row-style {
@@ -464,7 +464,7 @@
             }
             .list-data-content-row-style {
                 width: 100%;
-                height: 420px;
+                height: 260px;
                 display: flex;
                 flex-direction: column;
                 /deep/ .school-calendar-content-style {
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/weekCalendarFromNew.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/weekCalendarFromNew.vue
index 083115a..d98ba82 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/weekCalendarFromNew.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/weekCalendarFromNew.vue
@@ -12,7 +12,7 @@
                 <div class="row-item-style row-narrow-style">地点</div>
                 <div class="row-item-style row-narrow-style">对象</div>
             </div>
-            <vue-scroll v-if="showData && dataList.length > 0" :ops="listScroll" style="height:420px" class="list-data-content-row-style">
+            <vue-scroll v-if="showData && dataList.length > 0" :ops="listScroll" style="height:260px" class="list-data-content-row-style">
                 <template v-for="item,index in dataList">
                     <div :class="'data-item-style ' + (index === 0?'data-first-item-style':'')"
                          :key="item.detail_id">
@@ -302,7 +302,7 @@
         }
         .week-calendar-content-style {
             width: 100%;
-            height: 450px;
+            height: 260px;
             display: flex;
             flex-direction: column;
             .list-data-header-row-style {
@@ -328,7 +328,7 @@
             }
             .list-data-content-row-style {
                 width: 100%;
-                height: 420px;
+                height: 260px;
                 display: flex;
                 flex-direction: column;
                 /deep/ .__view {
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
index 461201b..7c0dd1a 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/teacherStudents/studentInfo.vue
@@ -58,8 +58,8 @@
                 columns: [
                     {
                         title: '年级',
-                        dataIndex: 'ENTRANCE_YEAR',
-                        key: 'ENTRANCE_YEAR',
+                        dataIndex: 'entrance_year',
+                        key: 'entrance_year',
                         align: "center",
                         // customCell: () => {
                         //     return {style: {'color': '#fbc637'}}
@@ -121,7 +121,8 @@
                             this.smallClassNum = this.middleClassNum = this.totalClassNum = this.totalSmallStudentNum = this.totalMiddleStudentNum = 0
                             let res = JSON.parse(result[0].data.result)
                             res.forEach(item => {
-                                item.ENTRANCE_YEAR = item.ENTRANCE_YEAR + '级' + '(' + item.class_total + '个班' + ')'
+                                // ENTRANCE_YEAR
+                                item.entrance_year = item.entrance_year + '级' + '(' + item.class_total + '个班' + ')'
                             })
                             let smallSchool = res.filter(item => {
                                 return item.stage_name == '小学'
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
index 56ffbe1..72bc527 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
@@ -96,7 +96,7 @@
     import CommonBox from '../../secondPages/commonBox.vue';
     import VueSeamlessScroll from 'vue-seamless-scroll';
     import {swiper, swiperSlide} from "vue-awesome-swiper";
-    //    import "swiper/dist/css/swiper.css";
+    import "swiper/dist/css/swiper.css";
     import ImgPreview from '../../../common/imgPreview.vue';
     import CommonInfo from '../../../common/centerCommonInfo.vue';
     import CommonClubInfo from '../../../common/commonClubInfo.vue';
@@ -211,8 +211,8 @@
                     "query": {
                         "query_id": "query_deyu_meiyu",
                         "query_param": [
-                            // this.BaseConfig.person_info_my.bureau_id + ""
-                            "900008135"
+                            this.BaseConfig.person_info_my.bureau_id + ""
+                            // "900008135"
                         ]
                     },
                     "query_cache": 0,
@@ -423,12 +423,10 @@
         width: 600px !important;
         height: 450px !important;
         display: flex;
-        > > > .banner {
-            .swiper-wrapper {
-                width: calc(100% - 50px) !important;
-                display: flex !important;
-                overflow: hidden !important;
-            }
+        /deep/ .swiper-wrapper {
+            width: 5000000000px !important;
+            display: flex !important;
+            overflow: hidden !important;
         }
         .art-work-content-style {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTeam.vue b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTeam.vue
index fcf9e11..ab7bce9 100644
--- a/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTeam.vue
+++ b/src/views/screenAdaptation/pages/teacherAdminCenter/teacherAdminCenter/overViewTeam.vue
@@ -4,8 +4,8 @@
             <span>/ 队伍建设 /</span>
             <div class="select-top-style">
                 <span v-for="item,index in stageList" :key="'stage-item-'+index"
-                      :class="'select-item-style border-right-style' + (selectType === item.STAGE_ID?' select-style':'')"
-                      @click="typeChange(item.STAGE_ID)">{{item.stage_name}}</span>
+                      :class="'select-item-style border-right-style' + (selectType === item.stage_id?' select-style':'')"
+                      @click="typeChange(item.stage_id)">{{item.stage_name}}</span>
             </div>
         </div>
         <div class="content-style">
@@ -40,8 +40,9 @@
      * */
     import LoginBox from '../../homePages/login/loginBox.vue';
     import {Icon, Empty} from 'ant-design-vue';
-    export default{
-        data(){
+
+    export default {
+        data() {
             return {
                 listScroll: this.StaticParams.scrollOption,
                 stageList: [],
@@ -70,7 +71,7 @@
 //                ]
             }
         },
-        mounted(){
+        mounted() {
             //获取队伍建设信息
             this.getOrgStageList();
         },
@@ -82,6 +83,7 @@
                         "query_id": "query_jiaoshi_duiwu2",
                         "query_param": [
                             this.BaseConfig.person_info_my.bureau_id + ""
+                            // "900008135",
                         ]
                     },
                     "query_cache": 0,
@@ -99,7 +101,7 @@
                             let dataList = JSON.parse(res);
                             if (dataList && dataList.length > 0) {
                                 this.stageList.push(...dataList);
-                                this.selectType = dataList[0].STAGE_ID;
+                                this.selectType = dataList[0].stage_id;
                                 this.getTeamBuilding();
                             }
                         }
@@ -108,17 +110,25 @@
             },
             getTeamBuilding: function () {
                 let stageName = "";
-                for (let i = 0, len = this.stageList.length; i < len; i++) {
-                    if (parseInt(this.selectType) === parseInt(this.stageList[i].STAGE_ID)) {
-                        stageName = this.stageList[i]["stage_name"];
+                this.stageList.forEach(item => {
+                    if (this.selectType == item.stage_id) {
+                        stageName = item.stage_name
                     }
-                }
+
+                })
+                // for (let i = 0, len = this.stageList.length; i < len; i++) {
+                //     if (parseInt(this.selectType) === parseInt(this.stageList[i].STAGE_ID)) {
+                //         stageName = this.stageList[i].stage_name;
+                //     }
+                // }
+
                 let param = {
                     "access_token": "system_01##20200102030405##a6ce11eab94df48a6ce11eab",
                     "query": {
                         "query_id": "query_jiaoshi_duiwu",
                         "query_param": [
                             this.BaseConfig.person_info_my.bureau_id + "",
+                            // "900008135",
                             stageName + ""
                         ]
                     },