From dbbc129f5ee624a6ab583ebed10a7b41015050dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0?= <15071126431@163.com> Date: Mon, 31 May 2021 17:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page/AddCustomer.vue | 4 ++- src/components/page/AddUser.vue | 42 ++++++++++++++++------------- src/components/page/Configure.vue | 4 +-- src/utils/api.js | 3 ++- src/utils/core.js | 4 +-- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/components/page/AddCustomer.vue b/src/components/page/AddCustomer.vue index 5232628..6d9c66a 100644 --- a/src/components/page/AddCustomer.vue +++ b/src/components/page/AddCustomer.vue @@ -384,7 +384,9 @@ export default { // 获取学校/客户名称 getSchoolData(){ let data = { - schoolName: '' + schoolName: '', + provinceId: '', + cityId: '' } this.$get(this.api.querySchoolData,data).then(res => { this.schoolList = res.message diff --git a/src/components/page/AddUser.vue b/src/components/page/AddUser.vue index 154ea12..7a60574 100644 --- a/src/components/page/AddUser.vue +++ b/src/components/page/AddUser.vue @@ -505,7 +505,7 @@
- +
管理员
@@ -556,7 +556,7 @@
- +
教师
@@ -783,11 +783,11 @@ export default { region: '', // 系统选择 checkList: [{ label: '管理员', - id: 2 + id: 13 }, { label: '教师', - id: 3 + id: 14 }, { label: '学生', @@ -1213,7 +1213,11 @@ export default { }, // 获取学校名称 getSchoolData(){ - this.$get(this.api.querySchoolData,{schoolName: ''}).then(res => { + this.$get(this.api.querySchoolData,{ + schoolName: '', + provinceId: '', + cityId: '' + }).then(res => { this.schoolList = res.message }).catch(res => {}); }, @@ -1419,11 +1423,11 @@ export default { let student = {} this.saveList.forEach( e =>{ // 管理员数据 - if(e.roleIds.indexOf(2) > -1){ + if(e.roleIds.indexOf(13) > -1){ staffLIst.push({ platformId: e.platformId, workNumber: e.staworkNumber, - roleId: 2, + roleId: 13, schoolId: e.schoolId, customerId: e.customerId, schoolName: e.customerName, @@ -1434,11 +1438,11 @@ export default { }) } // 教师数据 - if(e.roleIds.indexOf(3) > -1){ + if(e.roleIds.indexOf(14) > -1){ staffLIst.push({ platformId: e.platformId, workNumber: e.teaworkNumber, - roleId: 3, + roleId: 14, schoolId: e.schoolId, customerId: e.customerId, schoolName: e.customerName, @@ -1538,7 +1542,7 @@ export default { async worknumberChange(item){ let res = await this.$get(this.api.queryWorkNumberIsExist, { workNumber: item.staworkNumber, - roleId: 2, + roleId: 13, schoolId: item.schoolId }); if(JSON.stringify(res.message) != '{}'){ @@ -1551,7 +1555,7 @@ export default { async teaworknumberChange(item){ let res = await this.$get(this.api.queryWorkNumberIsExist, { workNumber: item.teaworkNumber, - roleId: 3, + roleId: 14, schoolId: item.schoolId }); if(JSON.stringify(res.message) != '{}'){ @@ -1737,7 +1741,7 @@ export default { let isEmpty = false this.chooseList.forEach(e =>{ // 管理员数据 - if(e.roleIds.indexOf(2) > -1){ + if(e.roleIds.indexOf(13) > -1){ for(let i in e) { if(i.startsWith('sta') && e[i] == ''){ isEmpty = true @@ -1747,7 +1751,7 @@ export default { stuStaffList.staffList.push({ platformId: e.platformId, workNumber: e.staworkNumber, - roleId: 2, + roleId: 13, schoolId: e.schoolId, customerId: e.customerId, schoolName: e.customerName, @@ -1759,7 +1763,7 @@ export default { }) } // 教师数据 - if(e.roleIds.indexOf(3) > -1){ + if(e.roleIds.indexOf(14) > -1){ for(let i in e) { if(i.startsWith('tea') && e[i] == ''){ isEmpty = true @@ -1769,7 +1773,7 @@ export default { stuStaffList.staffList.push({ platformId: e.platformId, workNumber: e.teaworkNumber, - roleId: 3, + roleId: 14, schoolId: e.schoolId, customerId: e.customerId, schoolName: e.customerName, @@ -1817,7 +1821,7 @@ export default { let list = this.saveList let isEmpty = false for(let e of list){ - if(e.roleIds.includes(2)){ + if(e.roleIds.includes(13)){ for(let i in e) { if(i.startsWith('sta') && e[i] == ''){ isEmpty = true @@ -1825,7 +1829,7 @@ export default { } } } - if(e.roleIds.includes(3)){ + if(e.roleIds.includes(14)){ for(let i in e) { if(i.startsWith('tea') && e[i] == ''){ isEmpty = true @@ -1948,10 +1952,10 @@ export default { this.$set(e, 'teacherstaffGradeName', ''); if (e.roleId) { switch (e.roleId) { - case 2: + case 13: e.staworkNumber = e.workNumber break; - case 3: + case 14: e.teaworkNumber = e.workNumber, e.teacherstaffProId = e.staffProfessionalArchitectureId, e.teacherstaffProName = e.staffProfessionalArchitectureName, diff --git a/src/components/page/Configure.vue b/src/components/page/Configure.vue index 8c6dce4..96d629c 100644 --- a/src/components/page/Configure.vue +++ b/src/components/page/Configure.vue @@ -146,13 +146,13 @@ export default { this.setCookie("userId",this.$store.state.userLoginId) this.setCookie("systemId",row.systemId) this.setCookie("systemName",row.systemName) - window.location.href = "http://www.liuwanr.cn:8080/Projectmanagement/"; + window.location.href = "http://39.108.250.202/Projectmanagement/"; }, getIntoJudgement(row){ this.setCookie("userId",this.$store.state.userLoginId) this.setCookie("systemId",row.systemId) this.setCookie("systemName",row.systemName) - window.location.href = "http://www.liuwanr.cn:8080/Score/"; + window.location.href = "http://39.108.250.202/Score/"; },  setCookie(name, value) {       if (value) { diff --git a/src/utils/api.js b/src/utils/api.js index 1cc823d..a8c675e 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -1,6 +1,7 @@ // let host = 'http://192.168.31.117:8080' -let host = 'http://www.huorantech.cn/liuwanr' +// let host = 'http://www.huorantech.cn/liuwanr' +let host = 'http://39.108.250.202/liuwanr' // let host = 'http://www.liuwanr.cn:8080' export default { diff --git a/src/utils/core.js b/src/utils/core.js index b8a6342..833d6eb 100644 --- a/src/utils/core.js +++ b/src/utils/core.js @@ -83,8 +83,8 @@ function hoursStatus (sts) { function roleStatus (sts) { const status = { '1': '超级管理员', - '2': '管理员', - '3': '教师', + '13': '管理员', + '14': '教师', '4': '学生' } return status[sts] || '未知状态'