diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity01.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity01.jpg
new file mode 100644
index 0000000..d3164aa
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity01.jpg differ
diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity02.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity02.jpg
new file mode 100644
index 0000000..8cb3de1
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity02.jpg differ
diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity03.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity03.jpg
new file mode 100644
index 0000000..3624d02
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity03.jpg differ
diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity04.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity04.jpg
new file mode 100644
index 0000000..de44242
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity04.jpg differ
diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity05.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity05.jpg
new file mode 100644
index 0000000..a6d1fa4
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity05.jpg differ
diff --git a/src/views/screenAdaptation/assets/images/window/studentActivity06.jpg b/src/views/screenAdaptation/assets/images/window/studentActivity06.jpg
new file mode 100644
index 0000000..0836365
Binary files /dev/null and b/src/views/screenAdaptation/assets/images/window/studentActivity06.jpg differ
diff --git a/src/views/screenAdaptation/pages/adminCenter/mainCenter/planSummary_yp.vue b/src/views/screenAdaptation/pages/adminCenter/mainCenter/planSummary_yp.vue
index 8f53b43..6133a76 100644
--- a/src/views/screenAdaptation/pages/adminCenter/mainCenter/planSummary_yp.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/mainCenter/planSummary_yp.vue
@@ -70,7 +70,7 @@
                                 <div id="planEchart" class="all-echart-div" style="width:100%;height: 100%;"></div>
                                 <a-icon class="echart-icon-style" type="bar-chart"
                                         :style="{ fontSize: '20px', color: '#bbdefb' }"/>
-                                <div class="total-num-style">累计/256</div>
+                                <div class="total-num-style">累计/{{totalNum}}</div>
                             </div>
                             <div class="right-info-style">
                                 <div class="plan-row-style">
@@ -151,6 +151,8 @@
                 },//机构数据
 
                 //计划
+                undoneNum:0,//未完成
+                doneNum:0,//已完成
                 personalPlanNum: 0,//人员计划
                 deptPlanNum: 0,//部门计划
                 orgPlanNum: 0,//机构计划
@@ -163,6 +165,11 @@
             this.getPlanDataexReport01();
             this.getPlanDataexReport02();
         },
+        computed:{
+          totalNum:function () {
+              return this.undoneNum + this.doneNum;
+          }
+        },
         methods: {
             getSummaryDataexReport01: function () {
                 let param = {
@@ -347,6 +354,17 @@
                     if (result[0].data.success) {
                         let dataList = JSON.parse(result[0].data.result);
                         console.log("计划2", dataList)
+                        if(dataList && dataList.length > 0){
+                            for(let i = 0,len = dataList.length;i < len;i ++){
+                                let finish_flag = dataList[i].finish_flag;
+                                if(finish_flag === 1){
+                                    this.doneNum = dataList[i].total;
+                                }else if(finish_flag === 0){
+                                    this.undoneNum = dataList[i].total;
+                                }
+                            }
+                            this.buildPlanEchart();
+                        }
                     }
                 })
             },
@@ -417,8 +435,8 @@
 //                                    show: true,
 //                                },
                                 data: [
-                                    {value: 10, name: '已完成/10'},
-                                    {value: 1, name: '未完成/1'},
+                                    {value: this.doneNum, name: '已完成/' + this.doneNum},
+                                    {value: this.undoneNum, name: '未完成/' + this.undoneNum},
                                 ]
                             }
                         ]
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/imgAdmin.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/imgAdmin.vue
index 88ca66a..0eab654 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/imgAdmin.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/imgAdmin.vue
@@ -165,6 +165,8 @@
         },
         methods: {
             getPictureCategories: function () {
+                this.categoryList = [];
+                this.categoryId = "";
                 let url = "";
                 let method = "";
                 let isTestLogin = "";
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/pictureInfo.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/pictureInfo.vue
index 916cdb3..63e03c9 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/pictureInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/imgTextAdmin/pictureInfo.vue
@@ -66,6 +66,7 @@
         },
         methods:{
             getPictureCategories: function () {
+                this.categoryList = [];
                 let url = "";
                 let method = "";
                 let isTestLogin = "";
@@ -94,6 +95,7 @@
                             this.categoryList.push(...categoryList);
                         }
                     }
+                    console.log("this.categoryList:",this.categoryList)
                 })
             },
             categoryChange:function (value) {
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/moralEducationImgText.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/moralEducationImgText.vue
new file mode 100644
index 0000000..092880a
--- /dev/null
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/moralEducation/moralEducationImgText.vue
@@ -0,0 +1,15 @@
+<template>
+    <div>
+        图文管理
+    </div>
+</template>
+<script>
+    export default{
+        data(){
+            return {}
+        }
+    }
+</script>
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/partyBuilding/partyBuilding.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/partyBuilding/partyBuilding.vue
index adb3566..a58e350 100644
--- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/partyBuilding/partyBuilding.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/partyBuilding/partyBuilding.vue
@@ -118,6 +118,30 @@
                     case "teamBuilding":
                         categoryId = 1103;
                         break;
+                    case "laborEducation":
+                        categoryId = 1231;
+                        break;
+                    case "competenceEducation":
+                        categoryId = 1232;
+                        break;
+                    case "patrioticEducation":
+                        categoryId = 1233;
+                        break;
+                    case "moralEducation":
+                        categoryId = 1234;
+                        break;
+                    case "artFestival":
+                        categoryId = 1241;
+                        break;
+                    case "prevention":
+                        categoryId = 1251;
+                        break;
+                    case "sportsMeeting":
+                        categoryId = 1261;
+                        break;
+                    case "heartNurtureSelected":
+                        categoryId = 1271;
+                        break;
                     default:
                         break;
                 }
diff --git a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
index b5e68bc..8c89311 100644
--- a/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
+++ b/src/views/screenAdaptation/pages/adminCenter/systemConfig.js
@@ -275,8 +275,72 @@ export const systemCenterConfig = [
                 path:'/',
                 component:() => import("./servicePlatform/administration/administration.vue"),
                 children:[
+                    {
+                        id:"moralEducation-2-0",
+                        title:"劳动教育",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'laborEducation',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
                     {
                         id:"moralEducation-2-1",
+                        title:"素质教育",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'competenceEducation',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-2",
+                        title:"爱国教育",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'patrioticEducation',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-3",
+                        title:"道德教育",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'moralEducation',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-4",
+                        title:"艺术节",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'artFestival',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-5",
+                        title:"传染病预防",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'prevention',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-6",
+                        title:"运动会",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'sportsMeeting',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-7",
+                        title:"心育精选",
+                        path:'/workBench/servicePlatform/moralEducationImgText/:id/:name/:menuId',
+                        name:'heartNurtureSelected',
+                        component:() => import("./servicePlatform/partyBuilding/partyBuilding.vue"),
+                        props:true,
+                    },
+                    {
+                        id:"moralEducation-2-8",
                         title:"社团管理",
                         path:'/workBench/servicePlatform/moralEducationClub/:id/:name/:menuId',
                         name:'moralEducationClub',
@@ -284,7 +348,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-2",
+                        id:"moralEducation-2-9",
                         title:"社团图片管理",
                         path:'/workBench/servicePlatform/moralEducationClubImg/:id/:name/:menuId',
                         name:'moralEducationClubImg',
@@ -292,7 +356,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-3",
+                        id:"moralEducation-2-10",
                         title:"社团活动管理",
                         path:'/workBench/servicePlatform/moralEducationClubActivity/:id/:name/:menuId',
                         name:'moralEducationClubActivity',
@@ -300,7 +364,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-4",
+                        id:"moralEducation-2-11",
                         title:"学生缺勤管理",
                         path:'/workBench/servicePlatform/moralEducationStudentAbsence/:id/:name/:menuId',
                         name:'moralEducationStudentAbsence',
@@ -308,7 +372,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-5",
+                        id:"moralEducation-2-12",
                         title:"体质监测",
                         path:'/workBench/servicePlatform/moralEducationPhysical/:id/:name/:menuId',
                         name:'moralEducationPhysical',
@@ -316,7 +380,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-6",
+                        id:"moralEducation-2-13",
                         title:"近视眼监测",
                         path:'/workBench/servicePlatform/moralEducationVision/:id/:name/:menuId',
                         name:'moralEducationVision',
@@ -324,7 +388,7 @@ export const systemCenterConfig = [
                         props:true,
                     },
                     {
-                        id:"moralEducation-2-7",
+                        id:"moralEducation-2-14",
                         title:"心育活动管理",
                         path:'/workBench/servicePlatform/moralEducationHeartActivity/:id/:name/:menuId',
                         name:'moralEducationHeartActivity',
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
index 122851f..23779c0 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
@@ -1,7 +1,20 @@
 <template>
     <CommonBox title="食谱" class="recipes-box-style">
-
-
+        <div class="nutritious-meal-content-style">
+            <div v-for="item in dataList" :key="item.id" class="day-meal-style">
+                <div class="title-style">{{item.title}}</div>
+                <div class="img-style">
+                    <div class="img-box">
+                        <img :src="item.imgSrc" />
+                    </div>
+                </div>
+                <div class="meal-title-list-style">
+                    <div v-for="meal in item.mealList" :key="meal.id" class="meal-title-style">
+                        {{meal.value}}
+                    </div>
+                </div>
+            </div>
+        </div>
     </CommonBox>
 </template>
 <script>
@@ -11,7 +24,15 @@
     import CommonBox from '../../secondPages/commonBox.vue';
     export default{
         data(){
-            return {}
+            return {
+                dataList:[
+                    {id:1,title:"星期一",imgSrc:require('../../../assets/images/meal/meal01.jpg'),mealList:[{id:'1-1',value:"奶香馒头"},{id:'1-2',value:"火腿卷"},{id:'1-3',value:"酸辣土豆丝"},{id:'1-4',value:"香芹炒豆干"},{id:'1-5',value:"南瓜粥"}]},
+                    {id:2,title:"星期二",imgSrc:require('../../../assets/images/meal/meal02.jpg'),mealList:[{id:'2-1',value:"花菜炒肉片"},{id:'2-2',value:"家常豆腐"},{id:'2-3',value:"干煸豆角"},{id:'2-4',value:"青菜蛋花汤"},{id:'2-5',value:"米饭"}]},
+                    {id:3,title:"星期三",imgSrc:require('../../../assets/images/meal/meal03.jpg'),mealList:[{id:'3-1',value:"双色馒头"},{id:'3-2',value:"千层饼"},{id:'3-3',value:"蒜苗炒蛋"},{id:'3-4',value:"耗油青菜"},{id:'3-5',value:"皮蛋瘦肉粥"}]},
+                    {id:4,title:"星期四",imgSrc:require('../../../assets/images/meal/meal01.jpg'),mealList:[{id:'4-1',value:"奶香馒头"},{id:'4-2',value:"火腿卷"},{id:'4-3',value:"酸辣土豆丝"},{id:'4-4',value:"香芹炒豆干"},{id:'4-5',value:"南瓜粥"}]},
+                    {id:5,title:"星期五",imgSrc:require('../../../assets/images/meal/meal02.jpg'),mealList:[{id:'5-1',value:"花菜炒肉片"},{id:'5-2',value:"家常豆腐"},{id:'5-3',value:"干煸豆角"},{id:'5-4',value:"青菜蛋花汤"},{id:'5-5',value:"米饭"}]},
+                ]
+            }
         },
         components:{
             CommonBox
@@ -19,9 +40,65 @@
     }
 </script>
 <style scoped lang="scss">
+    @import "../../../assets/scss/style";
     .recipes-box-style{
         width: 800px;
         height: 380px;
         display: flex;
+        .nutritious-meal-content-style {
+            width: 100%;
+            height: 345px;
+            display: flex;
+            padding: 20px 0 10px 0;
+            justify-content: space-between;
+            .day-meal-style{
+                width: 143px;
+                height: 100%;
+                background-color: #132a70;
+                display: flex;
+                flex-direction: column;
+                .title-style{
+                    width: 100%;
+                    height: 50px;
+                    line-height: 50px;
+                    text-align: center;
+                    color: $color-default-bright;
+                    border-bottom: 1px solid $color-default-bright;
+                }
+                .img-style{
+                    width: 100%;
+                    height: 130px;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    .img-box{
+                        width: 80px;
+                        height: 80px;
+                        border-radius: 80px;
+                        overflow: hidden;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                        img{
+                            width: 80px;
+                            height: 80px;
+                        }
+                    }
+                }
+                .meal-title-list-style{
+                    width: 100%;
+                    height: auto;
+                    display: flex;
+                    flex-direction: column;
+                    color:$color-default-bright;
+                    .meal-title-style{
+                        width: 100%;
+                        height: 25px;
+                        line-height: 25px;
+                        text-align: center;
+                    }
+                }
+            }
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
index ea4ddff..2636ace 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/studentActivities.vue
@@ -1,29 +1,96 @@
 <template>
     <CommonBox title="学生活动" class="student-activities-box-style">
-
-
+        <div class="student-activities-content-style">
+            <div class="window-left-style">
+                <div class="left-top-style">
+                    <img :src="require('../../../assets/images/window/studentActivity01.jpg')" style="width: 100%;height: 100%"/>
+                </div>
+                <div class="left-bottom-style">
+                    <div class="item-style">
+                        <img :src="require('../../../assets/images/window/studentActivity02.jpg')"
+                             style="width: 100%;height: 100%"/>
+                    </div>
+                    <div class="item-style">
+                        <img :src="require('../../../assets/images/window/studentActivity03.jpg')"
+                             style="width: 100%;height: 100%"/>
+                    </div>
+                </div>
+            </div>
+            <div class="window-right-style">
+                <div class="right-item-style">
+                    <img :src="require('../../../assets/images/window/studentActivity04.jpg')" style="width: 100%;height: 100%"/>
+                </div>
+                <div class="right-item-style">
+                    <img :src="require('../../../assets/images/window/studentActivity05.jpg')" style="width: 100%;height: 100%"/>
+                </div>
+                <div class="right-item-style">
+                    <img :src="require('../../../assets/images/window/studentActivity06.jpg')" style="width: 100%;height: 100%"/>
+                </div>
+            </div>
+        </div>
     </CommonBox>
 </template>
 
 
 <script>
     /*
-    * 学生活动
-    * */
+     * 学生活动
+     * */
     import CommonBox from '../../secondPages/commonBox.vue';
     export default{
         data(){
             return {}
         },
-        components:{
+        components: {
             CommonBox
         }
     }
 </script>
 <style scoped lang="scss">
-    .student-activities-box-style{
+    .student-activities-box-style {
         width: 600px;
         height: 380px;
         display: flex;
+        .student-activities-content-style {
+            width: 100%;
+            height: 345px;
+            display: flex;
+            justify-content: space-between;
+            .window-left-style {
+                width: 370px;
+                height: 100%;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                .left-top-style {
+                    width: 100%;
+                    height: 226px;
+                    /*padding: 5px;*/
+                }
+                .left-bottom-style {
+                    width: 100%;
+                    height: 108px;
+                    display: flex;
+                    justify-content: space-between;
+                    .item-style {
+                        width: 180px;
+                        height: 108px;
+                        /*padding: 5px;*/
+                    }
+                }
+            }
+            .window-right-style {
+                width: calc(100% - 380px);
+                height: 100%;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                .right-item-style {
+                    width: 100%;
+                    height: 108px;
+                    /*padding: 5px;*/
+                }
+            }
+        }
     }
 </style>
\ No newline at end of file