Merge remote-tracking branch 'origin/init' into init

src/global-llibs/dataex-report-axios.js

@@ -23,7 +23,11 @@ import {Modal} from 'ant-design-vue';
 //     }
 //     return random_num;
 // }
-let interUrl = "http://10.10.14.186:9009/dataex/report/QuerySimpleGP";
+//let interUrl = "http://10.10.14.186:9009/dataex/report/QuerySimpleGP";
+let interUrl = "https://dsdataex.cpolar.cn/dataex/report/QuerySimpleGP";
+//https://dsdataex.cpolar.cn/
+//https://53cebb99.cpolar.cn/
+//let interUrl = "https://www.edusoa.com/dataex/report/QuerySimpleGP";
 export default {
     /*
     * interfaceConfigAry[{

src/views/screenAdaptation/menuConfig.js

@@ -425,10 +425,10 @@ const menuConfigDS = [
         component: () => import("./pages/secondPages/secondPageBox.vue"),
         children: [
             {
-                title: "行政管理中心",
+                title: "",//行政管理中心
                 path: "/adminCenter/mainCenter",
                 name: "mainCenter",
-                // disable:true,
+                disable: true,
                 component: () => import("./pages/adminCenter/adminCenterDS.vue"),
             }
         ]
@@ -654,12 +654,12 @@ const menuConfigDS = [
                 name: "virtueBodyHealthArtManagementPage",
                 component: () => import("./pages/moralEducationCenter/virtueBodyHealthArtManagement.vue"),
             },
-            {
-                title: "家长服务管理",
-                path: "/moralEducationCenter/parentalServicesManagement",
-                name: "parentalServicesManagementPage",
-                component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
-            },
+            // {
+            //     title: "家长服务管理",
+            //     path: "/moralEducationCenter/parentalServicesManagement",
+            //     name: "parentalServicesManagementPage",
+            //     component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
+            // },
         ]
     },
     // {
@@ -787,33 +787,40 @@ const menuConfigDS = [
         component: () => import("./pages/secondPages/secondPageBox.vue"),
         children: [
             {
-                title: "校园之窗",
-                path: "/serviceCenter/schoolWindow",
-                name: "schoolWindowPage",
-                disable: true,
-                component: () => import("./pages/serviceCenter/serviceCenter.vue"),
-            },
-            {
-                title: "本周营养餐",
-                path: "/serviceCenter/schoolNutritiousMeal",
-                name: "schoolNutritiousMealPage",
-                disable: true,
-                component: () => import("./pages/serviceCenter/serviceCenter.vue"),
-            },
-            {
-                title: "校车管理",
-                path: "/serviceCenter/schoolBus",
-                name: "schoolBusPage",
-                disable: true,
-                component: () => import("./pages/serviceCenter/serviceCenter.vue"),
-            },
-            {
-                title: "招生通道",
-                path: "/serviceCenter/schoolAdmissionChannel",
-                name: "schoolAdmissionChannelPage",
+                title: "",
+                path: "/moralEducationCenter/parentalServicesManagement",
+                name: "parentalServicesManagementPage",
                 disable: true,
-                component: () => import("./pages/serviceCenter/serviceCenter.vue"),
+                component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
             },
+            // {
+            //     title: "校园之窗",
+            //     path: "/serviceCenter/schoolWindow",
+            //     name: "schoolWindowPage",
+            //     disable: true,
+            //     component: () => import("./pages/serviceCenter/serviceCenter.vue"),
+            // },
+            // {
+            //     title: "本周营养餐",
+            //     path: "/serviceCenter/schoolNutritiousMeal",
+            //     name: "schoolNutritiousMealPage",
+            //     disable: true,
+            //     component: () => import("./pages/serviceCenter/serviceCenter.vue"),
+            // },
+            // {
+            //     title: "校车管理",
+            //     path: "/serviceCenter/schoolBus",
+            //     name: "schoolBusPage",
+            //     disable: true,
+            //     component: () => import("./pages/serviceCenter/serviceCenter.vue"),
+            // },
+            // {
+            //     title: "招生通道",
+            //     path: "/serviceCenter/schoolAdmissionChannel",
+            //     name: "schoolAdmissionChannelPage",
+            //     disable: true,
+            //     component: () => import("./pages/serviceCenter/serviceCenter.vue"),
+            // },
         ]
     },
 ]

src/views/screenAdaptation/pages/moralEducationCenter/parentalServicesManagement.vue

@@ -30,6 +30,10 @@
         data(){
             return {}
         },
+        created(){
+            document.documentElement.style.setProperty('--modTitleOne', '#094193');
+            document.documentElement.style.setProperty('--modTitleTwo', '#094193');
+        },
         components:{
             StudentActivities,
             CourseScheduleQuery,

src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue

@@ -373,7 +373,9 @@
                         this.titleData = JSON.parse(result[0].data.result)
                         this.excellent_id = this.titleData[0].excellent_id
                     }
-                    this.getMasterBextData2()//班主任评优2
+                    if(this.excellent_id !== ""){
+                        this.getMasterBextData2()//班主任评优2
+                    }
                 })
             },
             //班主任评优2
@@ -413,13 +415,17 @@
             next(id) {
                 this.$refs.imgs.next()
                 this.excellent_id = id
-                this.getMasterBextData2()
+                if(this.excellent_id !== ""){
+                    this.getMasterBextData2()
+                }
+
             },
             prve(id) {
                 this.$refs.imgs.prev()
                 this.excellent_id = id
-                this.getMasterBextData2()
-
+                if(this.excellent_id !== ""){
+                    this.getMasterBextData2()
+                }
             },
             //显示队伍建设详情
             showTeamBuildInfo(item){