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 @@