diff --git a/demo-web-ui/src/api/system/region/region.js b/demo-web-ui/src/api/system/region/region.js index 0ed2c91..2fcf2b0 100644 --- a/demo-web-ui/src/api/system/region/region.js +++ b/demo-web-ui/src/api/system/region/region.js @@ -1,139 +1,59 @@ import request from '@/utils/request' -export default { - - // 分页列表 - pagerList: function (params) { - return request({ - url: '/portal/v1/regions/pagerList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 新增保存 - save: function (regionDto) { - return request({ - url: '/portal/v1/regions/save', - method: 'post', - data: regionDto, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // // 根据省sid获取该省的所有市 - // getCity: function (sid) { - // return request({ - // url: '/portal/v1/regions/getCity', - // method: 'get', - // params: { - // sid - // } - // }) - // }, - // - // // 根据市sid获取该省的所有县区 - // getCounty: function (sid) { - // return request({ - // url: '/portal/v1/regions/getCounty', - // method: 'get', - // params: { - // sid - // } - // }) - // }, - - // 删除 - delete: function (sid) { - return request({ - url: '/portal/v1/regions/delete/' + sid, - method: 'delete', - data: sid - }) - }, - - //点击修改回显数据 - updateEcho: function (sid) { - return request({ - url: '/portal/v1/regions/getOne/' + sid, - method: 'post', - params: { - sid - } - }) - }, - - // 区域修改保存 - // system/region/update/{sid} - update: function (params, sid) { - return request({ - url: '/portal/v1/regions/update/' + sid, - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - - // 自主学姐计划 - - // 分页列表 - selectSysPlanXs: function (data) { - return request({ - url: `v1/sysPlan/selectSysPlanXs/${data.userName}`, - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 新增保存 - saveSysPlan: function (data) { - return request({ - url: 'v1/sysPlanSchedule/saveSysPlanSchedule', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - selectSysPlanComment: function (sid) { - return request({ - url: 'v1/sysPlan/selectSysPlanComment/' + sid, - method: 'post' - }) - }, - - // 删除 - deleteSysPlan: function (sid) { - return request({ - url: '/v1/sysPlan/deleteSysPlan/' + sid, - method: 'delete' - }) - }, - - //点击修改回显数据 - alterSysPlant: function (data) { - return request({ - url: '/v1/sysPlan/alterSysPlan', - method: 'POST', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - - +// 分页列表 +export function selectSysPlanXs(data) { + return request({ + url: `v1/sysPlan/selectSysPlanXs/${data.userName}`, + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +export function saveSysPlan(data) { + return request({ + url: 'v1/sysPlanSchedule/saveSysPlanSchedule', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 新增保存 +export function selectSysPlanComment(sid) { + return request({ + url: 'v1/sysPlan/selectSysPlanComment/' + sid, + method: 'post' + }) +} +// 删除 +export function deleteSysPlan(sid) { + return request({ + url: '/v1/sysPlan/deleteSysPlan/' + sid, + method: 'delete' + }) +} +//点击修改回显数据 +export function alterSysPlant(data) { + return request({ + url: '/v1/sysPlan/alterSysPlan', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +export function selectSysPlan(data) { + return request({ + url: 'v1/sysPlan/selectSysPlan', + 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 50359fb..cb4ace8 100644 --- a/demo-web-ui/src/api/system/sources/index.js +++ b/demo-web-ui/src/api/system/sources/index.js @@ -27,7 +27,7 @@ export function saveSourcesInfo(data) { // 修改 保存 资源信息 export function putSourcesInfo(data) { return request({ - url: 'v1/sysuser/alterInfoUser', + url: 'v1/sysinfo/alterInfo', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -119,3 +119,14 @@ export function UserInfo(data) { } }) } + +export function alterInfoUser(data) { + return request({ + url: 'v1/sysuser/alterInfoUser', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} diff --git a/demo-web-ui/src/api/system/userAdminister/client.js b/demo-web-ui/src/api/system/userAdminister/client.js deleted file mode 100644 index cfdec18..0000000 --- a/demo-web-ui/src/api/system/userAdminister/client.js +++ /dev/null @@ -1,32 +0,0 @@ -import request from '@/utils/request' -import qs from 'qs' - -// 委托人分页列表 -export function clientList(data){ - return request({ - url: '/jlcyry/v1/clientalterrecords/pagerList', - method: 'post', - data: data, - headers: {'Content-Type': 'application/json'} - }) -} - -// 变更选择委托人列表 -export function setclientList(data){ - return request({ - url: '/jlcyry/v1/clientalterrecords/staffClientList', - method: 'post', - data: data, - headers: {'Content-Type': 'application/json'} - }) -} - -// 变更为被委托人 -export function doClientAlter(data){ - return request({ - url: '/jlcyry/v1/clientalterrecords/doClientAlter', - method: 'post', - data: data, - headers: {'Content-Type': 'application/json'} - }) -} diff --git a/demo-web-ui/src/api/system/userAdminister/index.js b/demo-web-ui/src/api/system/userAdminister/index.js index afdcc2d..496e57f 100644 --- a/demo-web-ui/src/api/system/userAdminister/index.js +++ b/demo-web-ui/src/api/system/userAdminister/index.js @@ -1,16 +1,33 @@ import request from '@/utils/request' import qs from 'qs' let tokens = window.sessionStorage.getItem('token'); -// 单位用户列表 -export function orgUserList(data){ +// 获取科目 +export function selectScoreKM(data){ return request({ - url: '/system/user/userListByOrg', + url: 'v1/sysscore/selectScoreKM', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} +// 获取班级 +export function selectStudentScoreYIELD(data){ + return request({ + url: 'v1/sysstudentscore/selectStudentScoreYIELD', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} +// 查看详情 +export function selectClass(data){ + return request({ + url: 'v1/sysstudentscore/selectClass', method: 'post', data: data, headers: {'Content-Type': 'application/json'} }) } - // 设置角色 export function psotUserRole(data){ @@ -21,11 +38,6 @@ export function psotUserRole(data){ }) } -/** - * 获取角色列表 - * orgSid 用户SID - * roleName 角色名称 - * */ export function orgrolesList(data){ return request({ url: '/system/v1/orgroles/list', diff --git a/demo-web-ui/src/layout/components/Navbar.vue b/demo-web-ui/src/layout/components/Navbar.vue index 74cf9a4..d4d43a4 100644 --- a/demo-web-ui/src/layout/components/Navbar.vue +++ b/demo-web-ui/src/layout/components/Navbar.vue @@ -4,7 +4,7 @@
-

欢迎您,{{pNameAndDepartmentNameAndPostName}} {{name}}

+

欢迎您,{{type}} {{name}}

返回首页 @@ -22,7 +22,7 @@ export default { departmentName:'', name:'', year:'', - pNameAndDepartmentNameAndPostName:'', + type:'', userSid:'', } }, @@ -30,11 +30,18 @@ export default { this.Orgname = window.sessionStorage.getItem('Orgname') this.departmentName = window.sessionStorage.getItem('departmentName') this.name = window.sessionStorage.getItem('name') - this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName') + let type = window.sessionStorage.getItem('type') this.userSid = window.sessionStorage.getItem('userSid') var nowDate = new Date() this.year = nowDate.getFullYear() - console.log(this.userSid); + console.log(type); + if(type==0){ + this.type='学生' + }else if(type==1){ + this.type='老师' + }else{ + this.type='管理员' + } }, methods: { logout() { diff --git a/demo-web-ui/src/layout/components/Sidebar/index.vue b/demo-web-ui/src/layout/components/Sidebar/index.vue index 3f7a5f2..114d1ab 100644 --- a/demo-web-ui/src/layout/components/Sidebar/index.vue +++ b/demo-web-ui/src/layout/components/Sidebar/index.vue @@ -145,4 +145,8 @@ line-height: 28px !important; font-size: 16px!important; } +/deep/ .el-menu-item.is-active { + color: #fff; + background-color: #087dba!important; +} diff --git a/demo-web-ui/src/router/index.js b/demo-web-ui/src/router/index.js index f2a8f95..78e6dca 100644 --- a/demo-web-ui/src/router/index.js +++ b/demo-web-ui/src/router/index.js @@ -151,9 +151,9 @@ export const constantRoutes = [{ } }, { - path: '/organizationManage', + path: '/luntanliaoliu', component: () => - import('@/views/organizationManage/organizationManage.vue'), + import('@/views/copyofprocess/liuchengchaosongAdd.vue'), name: 'organizationManage', meta: { title: '论坛交流' @@ -161,7 +161,7 @@ export const constantRoutes = [{ }, { path: '/datamapping', - component: () => import('@/views/datamapping/shujuyingshe.vue'), + component: () => import('@/views/datamapping/shujuyingshe.vue'), name: 'shujuyingshe', meta: { title: '自主学习计划制定指导' @@ -483,4 +483,4 @@ export function resetRouter() { router.matcher = newRouter.matcher // reset router } -export default router +export default router diff --git a/demo-web-ui/src/store/modules/user.js b/demo-web-ui/src/store/modules/user.js index 248e74a..9dba53c 100644 --- a/demo-web-ui/src/store/modules/user.js +++ b/demo-web-ui/src/store/modules/user.js @@ -45,7 +45,8 @@ const actions = { defaultOrgPathName: data.defaultOrgPathName, defaultOrgPath: data.defaultOrgPath, postName: data.postName, - sid: data.sid + sid: data.sid, + type:data.type } commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid) @@ -59,6 +60,7 @@ const actions = { window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath) window.sessionStorage.setItem('postName', user.postName) window.sessionStorage.setItem('sid', user.sid) + window.sessionStorage.setItem('type', user.type) 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 780dfe7..ccb91e9 100644 --- a/demo-web-ui/src/views/PwdModify/PwdModify.vue +++ b/demo-web-ui/src/views/PwdModify/PwdModify.vue @@ -70,21 +70,18 @@ prop="department" label="系别" align="center" - width="100px" > @@ -200,7 +197,8 @@ import { putSourcesInfo, UserInfo, saveSourcesInfo, - alterPassword + alterPassword, + alterInfoUser } from "@/api/system/sources/index.js"; export default { data() { @@ -247,17 +245,7 @@ export default { loginform() { UserInfo({ sid: this.sid }).then((res) => { this.msg = res.msg.length; - console.log(res); - let qyArry = Object.keys(res.data).map((item) => { - if (res.data[item] == null) { - delete res.data[item]; - } - return res.data; - }); - this.qyArry = Object.values(qyArry[0]); - console.log(qyArry); - this.tableData = qyArry; - this.form.id = qyArry.id; + this.tableData = res.data; }); }, pagination(val) { @@ -302,7 +290,7 @@ export default { }); }); } else { - putSourcesInfo(this.form).then((res) => { + alterInfoUser(this.form).then((res) => { this.form.userSid = this.sid; this.editDialog = false; this.loginform(); diff --git a/demo-web-ui/src/views/copyofprocess/liuchengchaosongAdd.vue b/demo-web-ui/src/views/copyofprocess/liuchengchaosongAdd.vue index bfd559f..c318f92 100644 --- a/demo-web-ui/src/views/copyofprocess/liuchengchaosongAdd.vue +++ b/demo-web-ui/src/views/copyofprocess/liuchengchaosongAdd.vue @@ -1,178 +1,214 @@ - + \ No newline at end of file diff --git a/demo-web-ui/src/views/copyofprocess/organizationManageInfo.vue b/demo-web-ui/src/views/copyofprocess/organizationManageInfo.vue new file mode 100644 index 0000000..a121c45 --- /dev/null +++ b/demo-web-ui/src/views/copyofprocess/organizationManageInfo.vue @@ -0,0 +1,157 @@ + + + + + + \ No newline at end of file diff --git a/demo-web-ui/src/views/dictManage/dictManage.vue b/demo-web-ui/src/views/dictManage/dictManage.vue index 80bca9f..8183417 100644 --- a/demo-web-ui/src/views/dictManage/dictManage.vue +++ b/demo-web-ui/src/views/dictManage/dictManage.vue @@ -131,7 +131,7 @@
- - - + \ No newline at end of file diff --git a/demo-web-ui/src/views/guideManage/guideManage.vue b/demo-web-ui/src/views/guideManage/guideManage.vue index 709c4a5..e4dfbeb 100644 --- a/demo-web-ui/src/views/guideManage/guideManage.vue +++ b/demo-web-ui/src/views/guideManage/guideManage.vue @@ -133,7 +133,7 @@ import { selectTeacherDownStudent, deleteSysInfoShip } from "@/api/system/sources/index.js"; - +import {selectScoreKM} from "@/api/system/userAdminister/index.js"; export default { data() { return { @@ -143,18 +143,22 @@ export default { lookstuders: false, form: {}, gridData: [], - teacher: {}, - type: "js", + teacher: { + teacherName:'', + teacherNo:'' + }, formBackup: Object.assign({}, this.form), page: { total: 0, // 默认数据总数 current: 1, // 默认开始页面 size: 10, // 每页的数据条数 - params: { - psid: "", - sourceId: "", - sourceName: "", - }, + type: "js", + }, + pageStu:{ + total: 0, // 默认数据总数 + current: 1, // 默认开始页面 + size: 10, // 每页的数据条数 + type: "xs", }, tableData: [], zylb: [], @@ -165,10 +169,10 @@ export default { }, mounted() { this.getPageList(this.page); - pageList("xs").then((res) => { - this.options = res.data; - console.log(res); - }); + this.getstuder(); + selectScoreKM().then((res) => { + console.log(res); + }); }, methods: { lookstuder(row) { @@ -199,10 +203,16 @@ export default { }; this.getPageList(); }, - getPageList() { + getstuder(){ + pageList(this.pageStu).then((res) => { + this.options = res.data.records; + }); + }, + getPageList(data) { // 获取列表 - pageList(this.type).then((res) => { - this.tableData = res.data; + pageList(data).then((res) => { + console.log(res); + this.tableData = res.data.records; this.page.total = res.data.total; }); }, @@ -220,11 +230,18 @@ export default { editRow(row) { this.dialogTitle = "添加"; this.editDialog = true; + this.teacher.teacherName=row.name + this.teacher.teacherNo=row.infoId this.form = Object.assign({}, row); }, save() { saveSysInfoShip(this.teacher).then((res) => { - console.log(res); + if(res.code==200){ + this.$message({ + type: "success", + message: "添加成功!", + }); + } }); this.editDialog = false; }, @@ -235,11 +252,11 @@ export default { type: "warning", }).then(() => { deleteSysInfoShip({ sid: row.sid }).then((res) => { - this.getPageList() this.$message({ type: "success", message: "删除成功!", }); + this.lookstuders=false }); }); }, diff --git a/demo-web-ui/src/views/logManage/logManage.vue b/demo-web-ui/src/views/logManage/logManage.vue index eb9b5ef..364c369 100644 --- a/demo-web-ui/src/views/logManage/logManage.vue +++ b/demo-web-ui/src/views/logManage/logManage.vue @@ -1,212 +1,308 @@ - - - - + \ No newline at end of file diff --git a/demo-web-ui/src/views/postManage/postManage.vue b/demo-web-ui/src/views/postManage/postManage.vue index ad35cd2..4c22f69 100644 --- a/demo-web-ui/src/views/postManage/postManage.vue +++ b/demo-web-ui/src/views/postManage/postManage.vue @@ -15,7 +15,7 @@ style="width: 300px" >