diff --git a/package.json b/package.json index 44b3928..6bba412 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@babel/polyfill": "^7.12.1", + "@riophae/vue-treeselect": "^0.4.0", "core-js": "^3.6.5", "node-sass": "latest", "sortablejs": "^1.15.7", diff --git a/src/App.vue b/src/App.vue index f12f314..bdd3b46 100644 --- a/src/App.vue +++ b/src/App.vue @@ -61,6 +61,9 @@ export default { // this.setCurrentRole(bschResult, baseHost, info.id); 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(); + if(info.type==1){ + mod=mod.filter(a=>a.customId<4) + } this.layoutInit(info, mod, [], baseHost, ssoHost); this.isLogin = true; @@ -106,26 +109,6 @@ 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(resp.data); }, error => reject(error) diff --git a/src/config/apiConf.js b/src/config/apiConf.js index 7f07df8..b1151cf 100644 --- a/src/config/apiConf.js +++ b/src/config/apiConf.js @@ -27,6 +27,7 @@ export default { schsystemsave: BaseUrl + "/api/schsystem/save",//保存学制 getschsystemselect: BaseUrl + "/api/schsystem/select",//获取选择的学制 getType: BaseUrl + "/api/schsystem/getType",//获取学制类型 + selectTree: BaseUrl + "/api/schsystem/selectTree",//获取学制树 //时段设置 getyeartermlist: BaseUrl + "/api/yearterm/list",//获取学年学期 diff --git a/src/frame/layout.vue b/src/frame/layout.vue index ca2cbba..f78ee29 100644 --- a/src/frame/layout.vue +++ b/src/frame/layout.vue @@ -3,7 +3,9 @@
- + + +
diff --git a/src/views/studentManage/Christianity.vue b/src/views/studentManage/Christianity.vue index f3a5369..4c0078d 100644 --- a/src/views/studentManage/Christianity.vue +++ b/src/views/studentManage/Christianity.vue @@ -385,14 +385,14 @@ // 新增学生表单 addForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', pwd:'' }, // 编辑学生表单 - editForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', id:null,stuId:0,status:1 }, + editForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', id:null,stuId:0,status:0 }, // 调班弹窗 currentSelectClass: '', targetClass: '', // 异动弹窗 currentStuName: '', - selectedStatus: 1, + selectedStatus: 0, studentabnormallist: [], formRules: { grade: [{ required: true, message: '请选择年级', trigger: 'change' }], @@ -593,7 +593,7 @@ account:this.addForm.account, pwd:this.addForm.pwd, stuId:0, - status:1 + status:0 } const url = APIConfig.BschClassSystem.studentsave; this.$api.post(url, JSON.stringify(newItem), resp => { @@ -813,7 +813,7 @@ this.changeStatusModalVisible = true; this.currentStuName = this.selectedRows[0].name; this.getstudentabnormal(); - this.selectedStatus = 1; + this.selectedStatus = 0; }, submitChangeStatus() { const newItem = { diff --git a/src/views/studentManage/HigherEducation.vue b/src/views/studentManage/HigherEducation.vue index f0b1fa1..7a3f4bb 100644 --- a/src/views/studentManage/HigherEducation.vue +++ b/src/views/studentManage/HigherEducation.vue @@ -370,7 +370,7 @@ export default { // 新增学生表单 addForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', pwd:'' }, // 编辑学生表单 - editForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', id:null,stuId:0,status:1 }, + editForm: { grade:'', classId:'', name:'', stuClassNo:'', idCard:'', account:'', id:null,stuId:0,status:0 }, // 调班弹窗 currentSelectClass: '', targetClass: '', @@ -576,7 +576,7 @@ export default { account:this.addForm.account, pwd:this.addForm.pwd, stuId:0, - status:1 + status:0 } const url = APIConfig.BschClassSystem.studentsave; this.$api.post(url, JSON.stringify(newItem), resp => { diff --git a/src/views/studentYDManage/Christianity.vue b/src/views/studentYDManage/Christianity.vue index ff45cb3..a1ab67a 100644 --- a/src/views/studentYDManage/Christianity.vue +++ b/src/views/studentYDManage/Christianity.vue @@ -35,7 +35,7 @@
- +
共 {{ total }} 条 a.id) } const url = APIConfig.BschClassSystem.studentsetAbnormalStatus; diff --git a/src/views/studentYDManage/HigherEducation.vue b/src/views/studentYDManage/HigherEducation.vue index 8bfa500..54f387f 100644 --- a/src/views/studentYDManage/HigherEducation.vue +++ b/src/views/studentYDManage/HigherEducation.vue @@ -35,7 +35,7 @@
- +
共 {{ total }} 条 -
学制选择
+
+ 学制选择 + +
+
{{ itt.academicStageName }}
@@ -34,22 +43,61 @@
+ + +
+ + + + + + +
+
+ + +
+