diff --git a/src/App.vue b/src/App.vue index 78f29a3..f12f314 100644 --- a/src/App.vue +++ b/src/App.vue @@ -59,7 +59,7 @@ export default { var info = await this.getUserInfo(); // var bschResult = await this.getBschHomeJsonp(baseHost, info.id); // this.setCurrentRole(bschResult, baseHost, info.id); - localStorage.setItem("currentRole", encodeURI(JSON.stringify({ childId:0, roleId:info.roleId, schId:info.schId, userId:info.userId }))); + localStorage.setItem("currentRole", encodeURI(JSON.stringify({ childId:0, roleId:info.roleIds[0], schId:info.school?info.school.id:0, userId:info.id }))); var mod = await this.getUserMod(); this.layoutInit(info, mod, [], baseHost, ssoHost); @@ -106,27 +106,27 @@ export default { APIConfig.Base.GetUserMod, null, resp => { - let resps = { - "code": 0, "msg": "", "data": - [ - { "id": 1493, "appId": 551, "modId": 1, "name": "学制选择", "parentId": 0, "path": null, "level": 0, "page": "/", "icon": null, "orderNumber": 1493, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 2, "name": "时段设置", "parentId": 0, "path": null, "level": 0, "page": "/itemSet", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 3, "name": "区域操作日志", "parentId": 0, "path": null, "level": 0, "page": "/areaOperateDaily", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 4, "name": "学校设置", "parentId": 0, "path": null, "level": 0, "page": "/schoolSetting", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 5, "name": "课程设置", "parentId": 0, "path": null, "level": 0, "page": "/subjectManForZy", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 6, "name": "学科管理", "parentId": 0, "path": null, "level": 0, "page": "/subjectSetzhi", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 7, "name": "班级管理", "parentId": 0, "path": null, "level": 0, "page": "/classManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 8, "name": "选修班管理", "parentId": 0, "path": null, "level": 0, "page": "/electiveClassManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 9, "name": "教师管理", "parentId": 0, "path": null, "level": 0, "page": "/teacherManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 10, "name": "学生管理", "parentId": 0, "path": null, "level": 0, "page": "/studentManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 11, "name": "历史查询", "parentId": 0, "path": null, "level": 0, "page": "/historySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 12, "name": "学生异动管理", "parentId": 0, "path": null, "level": 0, "page": "/studentYDManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 13, "name": "教师转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfo", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 14, "name": "学生转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfostu", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - { "id": 1494, "appId": 551, "modId": 15, "name": "日志管理", "parentId": 0, "path": null, "level": 0, "page": "/dailySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, - ], "timeNow": "2026-06-17 14:44:05" - } - resolve(resps.data); + // let resps = { + // "code": 0, "msg": "", "data": + // [ + // { "id": 1493, "appId": 551, "modId": 1, "name": "学制选择", "parentId": 0, "path": null, "level": 0, "page": "/", "icon": null, "orderNumber": 1493, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 2, "name": "时段设置", "parentId": 0, "path": null, "level": 0, "page": "/itemSet", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 3, "name": "区域操作日志", "parentId": 0, "path": null, "level": 0, "page": "/areaOperateDaily", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 4, "name": "学校设置", "parentId": 0, "path": null, "level": 0, "page": "/schoolSetting", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 5, "name": "课程设置", "parentId": 0, "path": null, "level": 0, "page": "/subjectManForZy", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 6, "name": "学科管理", "parentId": 0, "path": null, "level": 0, "page": "/subjectSetzhi", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 7, "name": "班级管理", "parentId": 0, "path": null, "level": 0, "page": "/classManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 8, "name": "选修班管理", "parentId": 0, "path": null, "level": 0, "page": "/electiveClassManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 9, "name": "教师管理", "parentId": 0, "path": null, "level": 0, "page": "/teacherManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 10, "name": "学生管理", "parentId": 0, "path": null, "level": 0, "page": "/studentManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 11, "name": "历史查询", "parentId": 0, "path": null, "level": 0, "page": "/historySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 12, "name": "学生异动管理", "parentId": 0, "path": null, "level": 0, "page": "/studentYDManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 13, "name": "教师转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfo", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 14, "name": "学生转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfostu", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // { "id": 1494, "appId": 551, "modId": 15, "name": "日志管理", "parentId": 0, "path": null, "level": 0, "page": "/dailySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] }, + // ], "timeNow": "2026-06-17 14:44:05" + // } + resolve(resp.data); }, error => reject(error) ); @@ -181,14 +181,14 @@ export default { typeof x.meta !== "undefined" && typeof x.meta.modId !== "undefined" && typeof x.meta.icon !== "undefined" && - x.meta.modId == element.modId + x.meta.modId == element.customId ); let icon = iconIndex > -1 ? "iconfont " + routes[iconIndex].meta.icon : ""; //icon不传则为默认 arr.push({ id: element.id, name: element.name, - modId: element.modId, - page: element.page, + modId: element.customId, + page: element.path, children: element.children || [], icon, }); diff --git a/src/config/apiConf.js b/src/config/apiConf.js index fb69635..7f07df8 100644 --- a/src/config/apiConf.js +++ b/src/config/apiConf.js @@ -3,8 +3,8 @@ let BaseUrl = conf.serviceUrl; export default { Base: { - GetUserInfo: BaseUrl + "/api/GetUserInfo", - GetUserMod: BaseUrl + "/api/GetUserMod", + GetUserInfo: BaseUrl + "/api/base/getUserInfo", + GetUserMod: BaseUrl + "/api/base/getUserMod", }, BschClassSystem: { //年级树 diff --git a/src/frame/layout.vue b/src/frame/layout.vue index 3dd4f9e..8004f8f 100644 --- a/src/frame/layout.vue +++ b/src/frame/layout.vue @@ -243,6 +243,7 @@ export default { }, logout() { + // http://sso.yunhaixingtong.com/cas/logout let url = window.location.href; url = "/logout?service=" + url; top.location.href = this.ssoHost + url; diff --git a/src/views/studySystemChoice.vue b/src/views/studySystemChoice.vue index 154f3e6..a4b6d4a 100644 --- a/src/views/studySystemChoice.vue +++ b/src/views/studySystemChoice.vue @@ -29,7 +29,7 @@
-
+
@@ -68,12 +68,12 @@ export default { const _this = this; var item={}; _this.$api.get(APIConfig.BschClassSystem.getGroupTree, item, resp => { - if(resp.code==0) - { - _this.treeData = resp.data; - }else{ - _this.treeData=[]; - } + if(resp.code==0) + { + _this.treeData = resp.data; + }else{ + _this.treeData=[]; + } }); }, //节点点击事件 @@ -81,6 +81,11 @@ export default { if(treeNode.type==2){ this.selectnodeid=treeNode.id; this.getschsystemlist(); + }else{ + this.selectnodeid=0; + this.getschsystemlist(); + this.$Message.warning("请先选择学校!"); + return; } }, //获取学校绑定学制列表 @@ -90,13 +95,12 @@ export default { schId:this.selectnodeid }; _this.$api.get(APIConfig.BschClassSystem.getschsystemlist, item, resp => { - - if(resp.code==0) - { - _this.schsystemlist = resp.data; - }else{ - _this.schsystemlist=[]; - } + if(resp.code==0) + { + _this.schsystemlist = resp.data; + }else{ + _this.schsystemlist=[]; + } }); }, selectEduType(val,index,index2) { diff --git a/src/views/subjectManForZy.vue b/src/views/subjectManForZy.vue index a50a3b0..627b597 100644 --- a/src/views/subjectManForZy.vue +++ b/src/views/subjectManForZy.vue @@ -189,7 +189,7 @@ }, // 表单校验规则 formRules: { - courseCode: [{ required: true, message: '请输入课程代码', trigger: 'blur' }], + // courseCode: [{ required: true, message: '请输入课程代码', trigger: 'blur' }], courseName: [{ required: true, message: '请输入课程名称', trigger: 'blur' }], courseType: [{ required: true, message: '请选择课程类别', trigger: 'change' }], bindMajor: [{ required: true, type: 'array', min: 1, message: '请选择所属专业', trigger: 'change' }], diff --git a/src/views/teacherManage/Teachergrouping.vue b/src/views/teacherManage/Teachergrouping.vue index a0bcf07..72bf86e 100644 --- a/src/views/teacherManage/Teachergrouping.vue +++ b/src/views/teacherManage/Teachergrouping.vue @@ -32,7 +32,6 @@
-