1
deploy-bschclass-front / build-and-deploy (push) Successful in 4m34s

This commit is contained in:
lijing
2026-08-17 15:31:53 +08:00
parent 0e48281920
commit 04ff7a8895
6 changed files with 47 additions and 43 deletions
+25 -25
View File
@@ -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,
});
+2 -2
View File
@@ -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: {
//年级树
+1
View File
@@ -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;
+18 -14
View File
@@ -29,7 +29,7 @@
</div>
<div style="margin-bottom:20px;"></div>
<!-- 底部确定按钮 -->
<div class="confirm-btn-wrap" style="position: fixed;bottom: 0;text-align: center;left: 0;right: 0;background: #fff;padding: 10px;border-top: 1px solid #eee;">
<div v-if="selectnodeid>0" class="confirm-btn-wrap" style="position: fixed;bottom: 0;text-align: center;left: 0;right: 0;background: #fff;padding: 10px;border-top: 1px solid #eee;">
<Button type="primary" style="padding:0px 40px;" @click="handleConfirm">确定</Button>
</div>
</Col>
@@ -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) {
+1 -1
View File
@@ -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' }],
@@ -32,7 +32,6 @@
<div class="col-bottom-btns">
<Button type="error" @click="delGroup">删除分组</Button>
<Button style="margin-left:8px" @click="editGroup">编辑分组</Button>
<Button type="primary">Primary</Button>
</div>
</div>