From e1a63de0597dba92a2ca7daedb21f94938aec6c6 Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Mon, 8 May 2023 18:11:30 +0800 Subject: [PATCH] 5.8 --- demo-web-ui/src/api/system/Role/role.js | 2 +- .../src/api/system/datamapping/datamapping.js | 4 +- .../src/api/system/functional/functional.js | 22 +- demo-web-ui/src/api/system/menu/index.js | 2 +- demo-web-ui/src/api/system/region/region.js | 33 +- demo-web-ui/src/api/system/sources/index.js | 32 ++ .../src/layout/components/Sidebar/index.vue | 5 +- demo-web-ui/src/store/modules/user.js | 4 +- demo-web-ui/src/views/PwdModify/PwdModify.vue | 64 ++- .../views/RoleAdminister/RoleAdminister.vue | 2 +- .../src/views/functional/functional.vue | 146 ++----- demo-web-ui/src/views/logManage/logManage.vue | 82 ++-- .../src/views/menuManage/menuManage.vue | 71 +++- .../src/views/postManage/postManage.vue | 10 +- demo-web-ui/src/views/region/region.vue | 389 ++++++++++++------ demo-web-ui/src/views/workflow/form/form.vue | 8 +- 16 files changed, 545 insertions(+), 331 deletions(-) diff --git a/demo-web-ui/src/api/system/Role/role.js b/demo-web-ui/src/api/system/Role/role.js index c9c9a81..2dcf37b 100644 --- a/demo-web-ui/src/api/system/Role/role.js +++ b/demo-web-ui/src/api/system/Role/role.js @@ -13,7 +13,7 @@ export function rolemenus(data) { // 获取左侧菜单 export function getrolemenus(data) { return request({ - url: 'v1/SysMenu/list', + url: 'v1/SysMenu/list/'+data.Sid, method: 'POST', async: false, data: data, diff --git a/demo-web-ui/src/api/system/datamapping/datamapping.js b/demo-web-ui/src/api/system/datamapping/datamapping.js index a741519..4df6928 100644 --- a/demo-web-ui/src/api/system/datamapping/datamapping.js +++ b/demo-web-ui/src/api/system/datamapping/datamapping.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function saveSysPlanSchedule(data) { +export function alterSysPlan(data) { return request({ - url: 'v1/sysPlanSchedule/saveSysPlanSchedule', + url: 'v1/sysPlan/alterSysPlan', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/demo-web-ui/src/api/system/functional/functional.js b/demo-web-ui/src/api/system/functional/functional.js index 9fe81c3..960f573 100644 --- a/demo-web-ui/src/api/system/functional/functional.js +++ b/demo-web-ui/src/api/system/functional/functional.js @@ -31,7 +31,7 @@ export function savePost(data) { // 模块名称 export function sourceList(data) { return request({ - url: 'v1/SysMenu/list', + url: 'v1/SysMenu/listList', method: 'POST', data: data, headers: { @@ -40,6 +40,26 @@ export function sourceList(data) { } }) } +// 查询角色 +export function alterRole(data){ + return request({ + url: 'v1/sysrole/RoleOne', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'}, + 'token':tokens + }) +} +//设置权限 +export function addSysMenuRole(data){ + return request({ + url: 'v1/sysmenurole/addSysMenuRole', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'}, + 'token':tokens + }) +} // 删除 export function delOrgroles(data) { diff --git a/demo-web-ui/src/api/system/menu/index.js b/demo-web-ui/src/api/system/menu/index.js index 521ff32..7d06379 100644 --- a/demo-web-ui/src/api/system/menu/index.js +++ b/demo-web-ui/src/api/system/menu/index.js @@ -7,7 +7,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: 'v1/SysMenu/list', + url: 'v1/SysMenu/listList', method: 'POST', data: data, headers: { diff --git a/demo-web-ui/src/api/system/region/region.js b/demo-web-ui/src/api/system/region/region.js index 2fcf2b0..349959d 100644 --- a/demo-web-ui/src/api/system/region/region.js +++ b/demo-web-ui/src/api/system/region/region.js @@ -12,7 +12,7 @@ export function selectSysPlanXs(data) { } }) } -export function saveSysPlan(data) { +export function saveSysPlanSchedule(data) { return request({ url: 'v1/sysPlanSchedule/saveSysPlanSchedule', method: 'POST', @@ -22,6 +22,17 @@ export function saveSysPlan(data) { } }) } +// 提交 +export function upSysPlan(data) { + return request({ + url: 'v1/sysPlan/upSysPlan', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} // 新增保存 export function selectSysPlanComment(sid) { return request({ @@ -57,3 +68,23 @@ export function selectSysPlan(data) { } }) } +export function selectTeacher(data) { + return request({ + url: 'v1/sysinfo/selectTeacher', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +export function selectSysPlanComment11(data) { + return request({ + url: 'v1/sysPlan/selectSysPlanComment/'+data.sid, + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/demo-web-ui/src/api/system/sources/index.js b/demo-web-ui/src/api/system/sources/index.js index cb4ace8..5ea4c0d 100644 --- a/demo-web-ui/src/api/system/sources/index.js +++ b/demo-web-ui/src/api/system/sources/index.js @@ -130,3 +130,35 @@ export function alterInfoUser(data) { } }) } + +// 查看成绩 +export function selectScore(data) { + return request({ + url: 'v1/sysscore/selectScore', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +export function save(data) { + return request({ + url: 'v1/sysscore/save', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +export function update(data) { + return request({ + url: 'v1/sysscore/update', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} diff --git a/demo-web-ui/src/layout/components/Sidebar/index.vue b/demo-web-ui/src/layout/components/Sidebar/index.vue index 114d1ab..cef4092 100644 --- a/demo-web-ui/src/layout/components/Sidebar/index.vue +++ b/demo-web-ui/src/layout/components/Sidebar/index.vue @@ -52,7 +52,8 @@ export default { data() { return { - routes: [] + routes: [], + sid: window.sessionStorage.getItem("sid"), } }, components: { @@ -94,7 +95,7 @@ sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33', userSid: userSid } - getrolemenus(params).then(res => { + getrolemenus({Sid:this.sid}).then(res => { console.log('aaa') console.log(res) this.routes = res.data diff --git a/demo-web-ui/src/store/modules/user.js b/demo-web-ui/src/store/modules/user.js index 9dba53c..3e0aaf8 100644 --- a/demo-web-ui/src/store/modules/user.js +++ b/demo-web-ui/src/store/modules/user.js @@ -46,7 +46,8 @@ const actions = { defaultOrgPath: data.defaultOrgPath, postName: data.postName, sid: data.sid, - type:data.type + type:data.type, + id:data.id } commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid) @@ -61,6 +62,7 @@ const actions = { window.sessionStorage.setItem('postName', user.postName) window.sessionStorage.setItem('sid', user.sid) window.sessionStorage.setItem('type', user.type) + window.sessionStorage.setItem('id', user.id) resolve(data) }).catch(error => { reject(error) diff --git a/demo-web-ui/src/views/PwdModify/PwdModify.vue b/demo-web-ui/src/views/PwdModify/PwdModify.vue index ccb91e9..655b1fb 100644 --- a/demo-web-ui/src/views/PwdModify/PwdModify.vue +++ b/demo-web-ui/src/views/PwdModify/PwdModify.vue @@ -66,23 +66,11 @@ width="100px" > - + - + - + @@ -108,7 +96,7 @@ * @@ -198,7 +186,7 @@ import { UserInfo, saveSourcesInfo, alterPassword, - alterInfoUser + alterInfoUser, } from "@/api/system/sources/index.js"; export default { data() { @@ -231,8 +219,10 @@ export default { zylb: [], sourceList: [], usePwd: { - id: "", - password: "" + pwd: "", + id: window.sessionStorage.getItem("id"), + sid: window.sessionStorage.getItem("sid"), + password: "", }, token: window.sessionStorage.getItem("token"), sid: window.sessionStorage.getItem("sid"), @@ -314,25 +304,25 @@ export default { // }) }, updatePsw() { - // if (this.formPwd.password != this.formPwd.confirmPassword) { - // this.$message({ - // type: 'warning', - // message: '两次密码输入不一致!' - // }); - // return - // } - alterPassword(this.usePwd).then((res) => { - if(res.code===200){ - this.$alert("密码修改成！请重新登录点击确定后退出。", "修改成功", { - confirmButtonText: "确定", - callback: (action) => { - window.sessionStorage.removeStorage("token"); - window.sessionStorage.removeStorage("userSid"); - this.$router.push({ path: "/login" }); - }, + if (this.pwd === this.password) { + alterPassword(this.usePwd).then((res) => { + if (res.code === 200) { + this.$alert("密码修改成！请重新登录点击确定后退出。", "修改成功", { + confirmButtonText: "确定", + callback: (action) => { + window.sessionStorage.removeStorage("token"); + window.sessionStorage.removeStorage("userSid"); + this.$router.push("/login"); + }, + }); + } }); - } - }); + }else{ + this.$message({ + message: '两次密码不一致请重新输入', + type: "warning", + }); + } }, }, }; diff --git a/demo-web-ui/src/views/RoleAdminister/RoleAdminister.vue b/demo-web-ui/src/views/RoleAdminister/RoleAdminister.vue index 91df900..eb69bc5 100644 --- a/demo-web-ui/src/views/RoleAdminister/RoleAdminister.vue +++ b/demo-web-ui/src/views/RoleAdminister/RoleAdminister.vue @@ -130,7 +130,7 @@ v-for="item in postSidData" :key="item.num" :label="item.type" - :value="item.num" + :value="item.type" > diff --git a/demo-web-ui/src/views/functional/functional.vue b/demo-web-ui/src/views/functional/functional.vue index bef1ace..6d981cf 100644 --- a/demo-web-ui/src/views/functional/functional.vue +++ b/demo-web-ui/src/views/functional/functional.vue @@ -6,88 +6,20 @@ @tab-click="handleClick" > - - - - - - 查询
- + - - - - + - - - - - - - - - - - - - + - + - - - - - - - -
教师姓名学科名
教师工号学分
学生姓名 - - - - -
学生学号 - - - - -
保存 @@ -158,8 +62,10 @@ import { saveSysInfoShip, selectTeacherDownStudent, deleteSysInfoShip, + selectScore, + save, + update } from "@/api/system/sources/index.js"; -import { selectScoreKM } from "@/api/system/userAdminister/index.js"; export default { data() { return { @@ -168,12 +74,14 @@ export default { editDialog: false, lookstuders: false, form: {}, - id:'', - formList:{}, + id: "", + formList: {}, gridData: [], teacher: { - teacherName: "", - teacherNo: "", + type: "", + score: "", + sid:'', + id:'' }, formBackup: Object.assign({}, this.form), page: { @@ -198,8 +106,13 @@ export default { mounted() { this.getPageList(this.page); this.getstuder(); - selectScoreKM().then((res) => { - this.formList=res.data + // selectScoreKM().then((res) => { + // this.formList=res.data + // }); + selectScore().then((res) => { + console.log(res); + this.tableData=res.data + this.formList = res.data; }); }, methods: { @@ -238,11 +151,7 @@ export default { }, getPageList(data) { // 获取列表 - pageList(data).then((res) => { - console.log(res); - this.tableData = res.data.records; - this.page.total = res.data.total; - }); + }, handleClick(tab, event) { if (tab.name == "addrole") { @@ -258,12 +167,13 @@ export default { editRow(row) { this.dialogTitle = "添加"; this.editDialog = true; - this.teacher.teacherName = row.name; - this.teacher.teacherNo = row.infoId; + this.teacher.sid = row.sid; + this.teacher.id = row.id; this.form = Object.assign({}, row); + this.teacher.type=row.type }, save() { - saveSysInfoShip(this.teacher).then((res) => { + update(this.teacher).then((res) => { if (res.code == 200) { this.$message({ type: "success", diff --git a/demo-web-ui/src/views/logManage/logManage.vue b/demo-web-ui/src/views/logManage/logManage.vue index 364c369..e21bdc2 100644 --- a/demo-web-ui/src/views/logManage/logManage.vue +++ b/demo-web-ui/src/views/logManage/logManage.vue @@ -6,15 +6,20 @@ @tab-click="handleClick" > - - + +
- + - + - - + - - + - { - this.formList=res.data + this.formList1 = res.data; + console.log(res); + this.formList=this.formList1.concat(this.arr); }); selectClass().then((res) => { // this.formList=res.data + this.calssArr = res.data; console.log(res); }); - selectStudentScoreYIELD(this.name,this.calss).then((res)=>{ - console.log(res); - }) }, methods: { lookstuder(row) { @@ -218,6 +216,17 @@ export default { this.gridData = res.data; }); }, + toLook() { + selectStudentScoreYIELD(this.lookArr).then((res) => { + this.tableData = res.data; + if(res.data.calss==undefined){ + res.data.calss=this.lookArr.calss + // console.log(this.lookArr.calss); + this.tableData = res.data; + } + + }); + }, pagination(val) { // 分页 this.page.current = val.pageNum; @@ -248,7 +257,6 @@ export default { // 获取列表 pageList(data).then((res) => { console.log(res); - this.tableData = res.data.records; this.page.total = res.data.total; }); }, diff --git a/demo-web-ui/src/views/menuManage/menuManage.vue b/demo-web-ui/src/views/menuManage/menuManage.vue index ade7391..20a8bef 100644 --- a/demo-web-ui/src/views/menuManage/menuManage.vue +++ b/demo-web-ui/src/views/menuManage/menuManage.vue @@ -16,6 +16,9 @@