From b948f3109e47a7b0fb50cd12863815d40ae878c5 Mon Sep 17 00:00:00 2001
From: gongdi <410827992@qq.com>
Date: Tue, 26 Jul 2022 18:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E5=AD=A6=E6=A0=A1=E5=85=AB?=
 =?UTF-8?q?=E5=A4=A7=E4=B8=AD=E5=BF=83=20=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global-llibs/base-config.js               |   6 +-
 src/views/screenAdaptation/menuConfig.js      | 248 +++++++++++-------
 .../pages/adminCenter/adminCenterDS.vue       |  21 +-
 .../oa/classEvaluation/classEvaluation.vue    |   1 -
 .../monitorCenter/schoolDaily/calendarDS.vue  |   2 +-
 .../schoolDaily/calendar_new.vue              |   2 +-
 .../studentClassTeacherManage/classManage.vue |   2 +-
 .../studentManage.vue                         |   2 +-
 .../virtueBodyHealthArt/artWork.vue           |   4 +-
 .../virtueBodyHealthArt/healthWork.vue        |   4 +-
 .../moralEducationWork.vue                    |   4 +-
 .../virtueBodyHealthArt/psychicBuild.vue      |   4 +-
 .../virtueBodyHealthArt/sportsWork.vue        |   4 +-
 13 files changed, 178 insertions(+), 126 deletions(-)

diff --git a/src/global-llibs/base-config.js b/src/global-llibs/base-config.js
index 781f96d..a8545ea 100644
--- a/src/global-llibs/base-config.js
+++ b/src/global-llibs/base-config.js
@@ -232,11 +232,11 @@ const ConfigFn = {
 
                     if (!BaseConfig.pt_type || BaseConfig.pt_type === "") {
                         interfaceConfig.callInterface([{
-                            // url: 'golbal/getValueByKey',
-                            url:"intellioa/sys/cloudPlatform/getValueByKey",
+                             url: 'golbal/getValueByKey',
+                            //url:"intellioa/sys/cloudPlatform/getValueByKey",
                             params: { key: 'common.server.location' },
                             method: 'get',
-                            isTestLogin: true
+                            isTestLogin: false
                         }], (res) => {
                             if (res[0].status === 200) {
                                 let env = res[0].data;
diff --git a/src/views/screenAdaptation/menuConfig.js b/src/views/screenAdaptation/menuConfig.js
index 1f25a67..563e359 100644
--- a/src/views/screenAdaptation/menuConfig.js
+++ b/src/views/screenAdaptation/menuConfig.js
@@ -400,11 +400,19 @@ const menuConfigDS = [
                 component: () => import("./pages/adminCenter/application.vue"),
             },
             {
-                path: '/workBench/servicePlatform',
+                path: '/workBench/servicePlatform/:id/:name',
                 name: 'servicePlatform',
                 component: () => import("./pages/adminCenter/servicePlatform/servicePlatform.vue"),
-                props: true
+                disable: true,
+                props: true,
+                children: getServicePlatformMenu()
             },
+            // {
+            //     path: '/workBench/servicePlatform',
+            //     name: 'servicePlatform',
+            //     component: () => import("./pages/adminCenter/servicePlatform/servicePlatform.vue"),
+            //     props: true
+            // },
         ]
     },
     {
@@ -579,55 +587,130 @@ const menuConfigDS = [
             }
         ]
     },
+    // {
+    //     id: 5,
+    //     title: "德育管理中心",
+    //     iconType: "icon-xueshengxinxi",
+    //     path: "/studentAdminCenter",
+    //     name: "studentAdminCenterPage",
+    //     imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png",
+    //     component: () => import("./pages/secondPages/secondPageBox.vue"),
+    //     children: [
+    //         {
+    //             title: "学生信息",
+    //             path: "/studentAdminCenter/studentInfo",
+    //             name: "studentInfoPage",
+    //             disable: true,
+    //             component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+    //         },
+    //         {
+    //             title: "学生考勤",
+    //             path: "/studentAdminCenter/studentAttendance",
+    //             name: "studentAttendancePage",
+    //             disable: true,
+    //             component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+    //         },
+    //         {
+    //             title: "班级评比",
+    //             path: "/studentAdminCenter/classEvaluate",
+    //             name: "classEvaluatePage",
+    //             disable: true,
+    //             component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+    //         },
+    //         {
+    //             title: "学生评价",
+    //             path: "/studentAdminCenter/studentEvaluate",
+    //             name: "studentEvaluatePage",
+    //             disable: true,
+    //             component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+    //         },
+    //         {
+    //             title: "课堂表现",
+    //             path: "/studentAdminCenter/studentPerformance",
+    //             name: "studentPerformancePage",
+    //             disable: true,
+    //             component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+    //         },
+    //     ]
+    // },
     {
         id: 5,
         title: "德育管理中心",
         iconType: "icon-xueshengxinxi",
-        path: "/studentAdminCenter",
-        name: "studentAdminCenterPage",
+        path: "/moralEducationCenter",
+        name: "moralEducationCenterPage",
         imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png",
         component: () => import("./pages/secondPages/secondPageBox.vue"),
         children: [
             {
-                title: "学生信息",
-                path: "/studentAdminCenter/studentInfo",
-                name: "studentInfoPage",
-                disable: true,
-                component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            },
-            {
-                title: "学生考勤",
-                path: "/studentAdminCenter/studentAttendance",
-                name: "studentAttendancePage",
-                disable: true,
-                component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            },
-            {
-                title: "班级评比",
-                path: "/studentAdminCenter/classEvaluate",
-                name: "classEvaluatePage",
-                disable: true,
-                component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+                title: "生、班、师管理",
+                path: "/moralEducationCenter/studentClassTeacherManagement",
+                name: "studentClassTeacherManagementPage",
+                component: () => import("./pages/moralEducationCenter/studentClassTeacherManagement.vue"),
             },
             {
-                title: "学生评价",
-                path: "/studentAdminCenter/studentEvaluate",
-                name: "studentEvaluatePage",
-                disable: true,
-                component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+                title: "德、体、卫、艺管理",
+                path: "/moralEducationCenter/virtueBodyHealthArtManagement",
+                name: "virtueBodyHealthArtManagementPage",
+                component: () => import("./pages/moralEducationCenter/virtueBodyHealthArtManagement.vue"),
             },
             {
-                title: "课堂表现",
-                path: "/studentAdminCenter/studentPerformance",
-                name: "studentPerformancePage",
-                disable: true,
-                component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
+                title: "家长服务管理",
+                path: "/moralEducationCenter/parentalServicesManagement",
+                name: "parentalServicesManagementPage",
+                component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
             },
         ]
     },
+    // {
+    //     id: 6,
+    //     title: "教师管理中心",
+    //     iconType: "icon-jiaoshixinxi",
+    //     path: "/teacherAdminCenter",
+    //     name: "teacherAdminCenterPage",
+    //     imgUrl: "./3D/builds-b2/3d-res/texture/teacher.png",
+    //     component: () => import("./pages/secondPages/secondPageBox.vue"),
+    //     children: [
+    //         {
+    //             title: "教师信息",
+    //             path: "/teacherAdminCenter/teacherInfo",
+    //             name: "teacherInfoPage",
+    //             disable: true,
+    //             component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+    //         },
+    //         {
+    //             title: "教师考勤",
+    //             path: "/teacherAdminCenter/teacherAttendance",
+    //             name: "teacherAttendancePage",
+    //             disable: true,
+    //             component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+    //         },
+    //         {
+    //             title: "智慧排课",
+    //             path: "/teacherAdminCenter/teachingSchedule",
+    //             name: "teachingSchedulePage",
+    //             disable: true,
+    //             component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+    //         },
+    //         {
+    //             title: "教师评价",
+    //             path: "/teacherAdminCenter/teacherEvaluate",
+    //             name: "teacherEvaluatePage",
+    //             disable: true,
+    //             component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+    //         },
+    //         {
+    //             title: "网络巡课",
+    //             path: "/teacherAdminCenter/patrolClass",
+    //             name: "patrolClassPage",
+    //             disable: true,
+    //             component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+    //         },
+    //     ]
+    // },
     {
         id: 6,
-        title: "教师管理中心",
+        title: "教师成长中心",
         iconType: "icon-jiaoshixinxi",
         path: "/teacherAdminCenter",
         name: "teacherAdminCenterPage",
@@ -635,40 +718,40 @@ const menuConfigDS = [
         component: () => import("./pages/secondPages/secondPageBox.vue"),
         children: [
             {
-                title: "教师信息",
+                title: "",
                 path: "/teacherAdminCenter/teacherInfo",
                 name: "teacherInfoPage",
                 disable: true,
-                component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
-            },
-            {
-                title: "教师考勤",
-                path: "/teacherAdminCenter/teacherAttendance",
-                name: "teacherAttendancePage",
-                disable: true,
-                component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
-            },
-            {
-                title: "智慧排课",
-                path: "/teacherAdminCenter/teachingSchedule",
-                name: "teachingSchedulePage",
-                disable: true,
-                component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
-            },
-            {
-                title: "教师评价",
-                path: "/teacherAdminCenter/teacherEvaluate",
-                name: "teacherEvaluatePage",
-                disable: true,
-                component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
-            },
-            {
-                title: "网络巡课",
-                path: "/teacherAdminCenter/patrolClass",
-                name: "patrolClassPage",
-                disable: true,
-                component: () => import("./pages/teacherAdminCenter/teacherAdminCenterDS.vue"),
+                component: () => import("./pages/teacherAdminCenter/teacherAdminCenter.vue"),
             },
+            // {
+            //     title: "教师考勤",
+            //     path: "/teacherAdminCenter/teacherAttendance",
+            //     name: "teacherAttendancePage",
+            //     disable: true,
+            //     component: () => import("./pages/teacherAdminCenter/teacherAdminCenter.vue"),
+            // },
+            // {
+            //     title: "智慧排课",
+            //     path: "/teacherAdminCenter/teachingSchedule",
+            //     name: "teachingSchedulePage",
+            //     disable: true,
+            //     component: () => import("./pages/teacherAdminCenter/teacherAdminCenter.vue"),
+            // },
+            // {
+            //     title: "教师评价",
+            //     path: "/teacherAdminCenter/teacherEvaluate",
+            //     name: "teacherEvaluatePage",
+            //     disable: true,
+            //     component: () => import("./pages/teacherAdminCenter/teacherAdminCenter.vue"),
+            // },
+            // {
+            //     title: "网络巡课",
+            //     path: "/teacherAdminCenter/patrolClass",
+            //     name: "patrolClassPage",
+            //     disable: true,
+            //     component: () => import("./pages/teacherAdminCenter/teacherAdminCenter.vue"),
+            // },
         ]
     },
     {
@@ -928,8 +1011,6 @@ const menuConfigYP = [
         id: 5,
         title: "德育管理中心",
         iconType: "icon-xueshengxinxi",
-        // path: "/studentAdminCenter",
-        // name: "studentAdminCenterPage",
         path: "/moralEducationCenter",
         name: "moralEducationCenterPage",
         imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png",
@@ -953,41 +1034,6 @@ const menuConfigYP = [
                 name: "parentalServicesManagementPage",
                 component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
             },
-            // {
-            //     title: "学生信息",
-            //     path: "/studentAdminCenter/studentInfo",
-            //     name: "studentInfoPage",
-            //     disable: true,
-            //     component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            // },
-            // {
-            //     title: "学生考勤",
-            //     path: "/studentAdminCenter/studentAttendance",
-            //     name: "studentAttendancePage",
-            //     disable: true,
-            //     component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            // },
-            // {
-            //     title: "班级评比",
-            //     path: "/studentAdminCenter/classEvaluate",
-            //     name: "classEvaluatePage",
-            //     disable: true,
-            //     component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            // },
-            // {
-            //     title: "学生评价",
-            //     path: "/studentAdminCenter/studentEvaluate",
-            //     name: "studentEvaluatePage",
-            //     disable: true,
-            //     component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            // },
-            // {
-            //     title: "课堂表现",
-            //     path: "/studentAdminCenter/studentPerformance",
-            //     name: "studentPerformancePage",
-            //     disable: true,
-            //     component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
-            // },
         ]
     },
     {
diff --git a/src/views/screenAdaptation/pages/adminCenter/adminCenterDS.vue b/src/views/screenAdaptation/pages/adminCenter/adminCenterDS.vue
index 1e9519b..4b896e6 100644
--- a/src/views/screenAdaptation/pages/adminCenter/adminCenterDS.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/adminCenterDS.vue
@@ -23,13 +23,20 @@
     /*
      * 行政管理中心
      * */
-    import MeetingDynamic from './mainCenter/meetingDynamicDS.vue';
-    import DutyPatrol from './mainCenter/dutyPatrolDS.vue';
-    import TeacherAttendance from './mainCenter/teacherAttendanceDS.vue';
-    import SchoolAnnouncement from './mainCenter/schoolAnnouncementDS.vue';
-    import PlanSummary from './mainCenter/planSummary_ds.vue';
-    import SchoolDynamic from './mainCenter/schoolDynamicDS.vue';
-    import Calendar from '../monitorCenter/schoolDaily/calendarDS.vue';
+    //import MeetingDynamic from './mainCenter/meetingDynamicDS.vue';
+    import MeetingDynamic from './mainCenter/meetingDynamic.vue';
+    //import DutyPatrol from './mainCenter/dutyPatrolDS.vue';
+    import DutyPatrol from './mainCenter/dutyPatrol.vue';
+    //import SchoolAnnouncement from './mainCenter/schoolAnnouncementDS.vue';
+    import SchoolAnnouncement from './mainCenter/schoolAnnouncement.vue';
+    //import TeacherAttendance from './mainCenter/teacherAttendanceDS.vue';
+    import TeacherAttendance from './mainCenter/teacherAttendance_yp.vue';
+    //import PlanSummary from './mainCenter/planSummary_ds.vue';
+    import PlanSummary from './mainCenter/planSummary_yp.vue';
+    //import SchoolDynamic from './mainCenter/schoolDynamicDS.vue';
+    import SchoolDynamic from './mainCenter/schoolDynamic.vue';
+    //import Calendar from '../monitorCenter/schoolDaily/calendarDS.vue';
+    import Calendar from '../monitorCenter/schoolDaily/calendar_new.vue';
     export default{
         data(){
             return {}
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/classEvaluation/classEvaluation.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/classEvaluation/classEvaluation.vue
index d55fecb..e2654a0 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/classEvaluation/classEvaluation.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/classEvaluation/classEvaluation.vue
@@ -341,7 +341,6 @@
                             }
                         });
                     }
-
                 }
                 echart.setOption(
                     {
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendarDS.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendarDS.vue
index 18f219c..5623e95 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendarDS.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendarDS.vue
@@ -20,7 +20,7 @@
 </template>
 <script>
     /*
-     * 周历校历
+     * 周历校历 ds版本
      * */
     import CommonBox from '../../secondPages/commonBox.vue';
     import {Tabs} from 'ant-design-vue';
diff --git a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_new.vue b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_new.vue
index 2a90bf8..d3c31c9 100644
--- a/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_new.vue
+++ b/src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_new.vue
@@ -20,7 +20,7 @@
 </template>
 <script>
     /*
-     * 周历校历
+     * 周历校历 接口调用版本
      * */
     import CommonBox from '../../secondPages/commonBox.vue';
     import {Tabs} from 'ant-design-vue';
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
index a98ac23..1812e12 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
@@ -447,7 +447,7 @@
 
 <style scoped lang="scss" type="text/scss">
     .moral-education-class-style {
-        width: calc(35% - 12px);
+        width: calc(35% - 12px) !important;
         height: 600px !important;
         color: #69D9FE;
 
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
index 528c12c..b44b91a 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
@@ -652,7 +652,7 @@
 
 <style scoped lang="scss" type="text/scss">
     .moral-education-student-style {
-        width: calc(65% - 12px);
+        width: calc(65% - 12px) !important;
         height: 600px !important;
         padding-right: 0 !important;
 
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
index 8aa4114..89ae90d 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
@@ -403,8 +403,8 @@
     @import "../../../assets/scss/style";
 
     .art-work-style {
-        width: 600px;
-        height: 450px;
+        width: 600px !important;
+        height: 450px !important;
         display: flex;
         .art-work-content-style {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue
index a465f07..20bd1e4 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue
@@ -347,8 +347,8 @@
     @import "../../../assets/scss/style";
 
     .health-work-style {
-        width: 600px;
-        height: 450px;
+        width: 600px !important;
+        height: 450px !important;
         display: flex;
         .health-work-content-style {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/moralEducationWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/moralEducationWork.vue
index 9278375..98669a0 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/moralEducationWork.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/moralEducationWork.vue
@@ -163,8 +163,8 @@
 </script>
 <style scoped lang="scss">
     .moral-education-work-style {
-        width: 600px;
-        height: 450px;
+        width: 600px !important;
+        height: 450px !important;
         display: flex;
         .moral-education-work-content-style {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
index 9df4ed7..e355bea 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
@@ -454,8 +454,8 @@
     @import "../../../assets/scss/style";
 
     .psychic-build-style {
-        width: 600px;
-        height: 380px;
+        width: 600px !important;
+        height: 380px !important;
         display: flex;
         .psychic-build-content-style {
             width: 100%;
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/sportsWork.vue b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/sportsWork.vue
index 96a4ccf..9d4162b 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/sportsWork.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/sportsWork.vue
@@ -471,8 +471,8 @@
     @import "../../../assets/scss/style";
 
     .sports-work-style {
-        width: 1220px;
-        height: 380px;
+        width: 1220px !important;
+        height: 380px !important;
         display: flex;
         .sports-work-content-style {
             width: 100%;