intellioa
/
super-fusion-platform
mirror of http://10.10.14.221/feiliming/oa-project-vue.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
init
zhusiyu 3 years ago
parent d7b00dc7a7 b948f3109e
commit cab445f4ba
13 changed files with 178 additions and 126 deletions
Show Stats Download Patch File Download Diff File

6
src/global-llibs/base-config.js
Unescape View File

@ -232,11 +232,11 @@ const ConfigFn = {
if (!BaseConfig.pt_type || BaseConfig.pt_type === "") { if (!BaseConfig.pt_type || BaseConfig.pt_type === "") {
interfaceConfig.callInterface([{ interfaceConfig.callInterface([{
// url: 'golbal/getValueByKey', url: 'golbal/getValueByKey',
url:"intellioa/sys/cloudPlatform/getValueByKey", //url:"intellioa/sys/cloudPlatform/getValueByKey",
params: { key: 'common.server.location' }, params: { key: 'common.server.location' },
method: 'get', method: 'get',
isTestLogin: true isTestLogin: false
}], (res) => { }], (res) => {
if (res[0].status === 200) { if (res[0].status === 200) {
let env = res[0].data; let env = res[0].data;

248
src/views/screenAdaptation/menuConfig.js
Unescape View File

@ -400,11 +400,19 @@ const menuConfigDS = [
component: () => import("./pages/adminCenter/application.vue"), component: () => import("./pages/adminCenter/application.vue"),
}, },
{ {
path: '/workBench/servicePlatform', path: '/workBench/servicePlatform/:id/:name',
name: 'servicePlatform', name: 'servicePlatform',
component: () => import("./pages/adminCenter/servicePlatform/servicePlatform.vue"), 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, id: 5,
title: "德育管理中心", title: "德育管理中心",
iconType: "icon-xueshengxinxi", iconType: "icon-xueshengxinxi",
path: "/studentAdminCenter", path: "/moralEducationCenter",
name: "studentAdminCenterPage", name: "moralEducationCenterPage",
imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png", imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png",
component: () => import("./pages/secondPages/secondPageBox.vue"), component: () => import("./pages/secondPages/secondPageBox.vue"),
children: [ children: [
{ {
title: "学生信息", title: "生、班、师管理",
path: "/studentAdminCenter/studentInfo", path: "/moralEducationCenter/studentClassTeacherManagement",
name: "studentInfoPage", name: "studentClassTeacherManagementPage",
disable: true, component: () => import("./pages/moralEducationCenter/studentClassTeacherManagement.vue"),
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: "学生评价", title: "德、体、卫、艺管理",
path: "/studentAdminCenter/studentEvaluate", path: "/moralEducationCenter/virtueBodyHealthArtManagement",
name: "studentEvaluatePage", name: "virtueBodyHealthArtManagementPage",
disable: true, component: () => import("./pages/moralEducationCenter/virtueBodyHealthArtManagement.vue"),
component: () => import("./pages/studentAdminCenter/studentAdminCenter.vue"),
}, },
{ {
title: "课堂表现", title: "家长服务管理",
path: "/studentAdminCenter/studentPerformance", path: "/moralEducationCenter/parentalServicesManagement",
name: "studentPerformancePage", name: "parentalServicesManagementPage",
disable: true, component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"),
component: () => import("./pages/studentAdminCenter/studentAdminCenter.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, id: 6,
title: "教师管理中心", title: "教师成长中心",
iconType: "icon-jiaoshixinxi", iconType: "icon-jiaoshixinxi",
path: "/teacherAdminCenter", path: "/teacherAdminCenter",
name: "teacherAdminCenterPage", name: "teacherAdminCenterPage",
@ -635,40 +718,40 @@ const menuConfigDS = [
component: () => import("./pages/secondPages/secondPageBox.vue"), component: () => import("./pages/secondPages/secondPageBox.vue"),
children: [ children: [
{ {
title: "教师信息", title: "",
path: "/teacherAdminCenter/teacherInfo", path: "/teacherAdminCenter/teacherInfo",
name: "teacherInfoPage", name: "teacherInfoPage",
disable: true, 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/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"),
}, },
// {
// 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, id: 5,
title: "德育管理中心", title: "德育管理中心",
iconType: "icon-xueshengxinxi", iconType: "icon-xueshengxinxi",
// path: "/studentAdminCenter",
// name: "studentAdminCenterPage",
path: "/moralEducationCenter", path: "/moralEducationCenter",
name: "moralEducationCenterPage", name: "moralEducationCenterPage",
imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png", imgUrl: "./3D/builds-b2/3d-res/texture/de-yu.png",
@ -953,41 +1034,6 @@ const menuConfigYP = [
name: "parentalServicesManagementPage", name: "parentalServicesManagementPage",
component: () => import("./pages/moralEducationCenter/parentalServicesManagement.vue"), 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"),
// },
] ]
}, },
{ {

21
src/views/screenAdaptation/pages/adminCenter/adminCenterDS.vue
Unescape View File

@ -23,13 +23,20 @@
/* /*
* 行政管理中心 * 行政管理中心
* */ * */
import MeetingDynamic from './mainCenter/meetingDynamicDS.vue'; //import MeetingDynamic from './mainCenter/meetingDynamicDS.vue';
import DutyPatrol from './mainCenter/dutyPatrolDS.vue'; import MeetingDynamic from './mainCenter/meetingDynamic.vue';
import TeacherAttendance from './mainCenter/teacherAttendanceDS.vue'; //import DutyPatrol from './mainCenter/dutyPatrolDS.vue';
import SchoolAnnouncement from './mainCenter/schoolAnnouncementDS.vue'; import DutyPatrol from './mainCenter/dutyPatrol.vue';
import PlanSummary from './mainCenter/planSummary_ds.vue'; //import SchoolAnnouncement from './mainCenter/schoolAnnouncementDS.vue';
import SchoolDynamic from './mainCenter/schoolDynamicDS.vue'; import SchoolAnnouncement from './mainCenter/schoolAnnouncement.vue';
import Calendar from '../monitorCenter/schoolDaily/calendarDS.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{ export default{
data(){ data(){
return {} return {}

1
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/classEvaluation/classEvaluation.vue
Unescape View File

@ -341,7 +341,6 @@
} }
}); });
} }
} }
echart.setOption( echart.setOption(
{ {

2
src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendarDS.vue
Unescape View File

@ -20,7 +20,7 @@
</template> </template>
<script> <script>
/* /*
* 周历校历 * 周历校历 ds版本
* */ * */
import CommonBox from '../../secondPages/commonBox.vue'; import CommonBox from '../../secondPages/commonBox.vue';
import {Tabs} from 'ant-design-vue'; import {Tabs} from 'ant-design-vue';

2
src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar_new.vue
Unescape View File

@ -20,7 +20,7 @@
</template> </template>
<script> <script>
/* /*
* 周历校历 * 周历校历 接口调用版本
* */ * */
import CommonBox from '../../secondPages/commonBox.vue'; import CommonBox from '../../secondPages/commonBox.vue';
import {Tabs} from 'ant-design-vue'; import {Tabs} from 'ant-design-vue';

2
src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/classManage.vue
Unescape View File

@ -447,7 +447,7 @@
<style scoped lang="scss" type="text/scss"> <style scoped lang="scss" type="text/scss">
.moral-education-class-style { .moral-education-class-style {
width: calc(35% - 12px); width: calc(35% - 12px) !important;
height: 600px !important; height: 600px !important;
color: #69D9FE; color: #69D9FE;

2
src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/studentManage.vue
Unescape View File

@ -661,7 +661,7 @@
<style scoped lang="scss" type="text/scss"> <style scoped lang="scss" type="text/scss">
.moral-education-student-style { .moral-education-student-style {
width: calc(65% - 12px); width: calc(65% - 12px) !important;
height: 600px !important; height: 600px !important;
padding-right: 0 !important; padding-right: 0 !important;

4
src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/artWork.vue
Unescape View File

@ -403,8 +403,8 @@
@import "../../../assets/scss/style"; @import "../../../assets/scss/style";
.art-work-style { .art-work-style {
width: 600px; width: 600px !important;
height: 450px; height: 450px !important;
display: flex; display: flex;
.art-work-content-style { .art-work-content-style {
width: 100%; width: 100%;

4
src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/healthWork.vue
Unescape View File

@ -347,8 +347,8 @@
@import "../../../assets/scss/style"; @import "../../../assets/scss/style";
.health-work-style { .health-work-style {
width: 600px; width: 600px !important;
height: 450px; height: 450px !important;
display: flex; display: flex;
.health-work-content-style { .health-work-content-style {
width: 100%; width: 100%;

4
src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/moralEducationWork.vue
Unescape View File

@ -163,8 +163,8 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.moral-education-work-style { .moral-education-work-style {
width: 600px; width: 600px !important;
height: 450px; height: 450px !important;
display: flex; display: flex;
.moral-education-work-content-style { .moral-education-work-content-style {
width: 100%; width: 100%;

4
src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/psychicBuild.vue
Unescape View File

@ -454,8 +454,8 @@
@import "../../../assets/scss/style"; @import "../../../assets/scss/style";
.psychic-build-style { .psychic-build-style {
width: 600px; width: 600px !important;
height: 380px; height: 380px !important;
display: flex; display: flex;
.psychic-build-content-style { .psychic-build-content-style {
width: 100%; width: 100%;

4
src/views/screenAdaptation/pages/moralEducationCenter/virtueBodyHealthArt/sportsWork.vue
Unescape View File

@ -471,8 +471,8 @@
@import "../../../assets/scss/style"; @import "../../../assets/scss/style";
.sports-work-style { .sports-work-style {
width: 1220px; width: 1220px !important;
height: 380px; height: 380px !important;
display: flex; display: flex;
.sports-work-content-style { .sports-work-content-style {
width: 100%; width: 100%;

Write Preview
Loading…
Cancel
Save