diff --git a/src/components/page/Achievement.vue b/src/components/page/Achievement.vue
index 3701743..74dcd3b 100644
--- a/src/components/page/Achievement.vue
+++ b/src/components/page/Achievement.vue
@@ -51,6 +51,7 @@
round
class="bt_one"
@click="delAllData"
+ v-auth
>批量删除
@@ -103,8 +104,8 @@
- 成绩管理
- 删除
+ 成绩管理
+ 删除
diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue
index 1756af9..e7ff7f9 100644
--- a/src/components/page/Assessment.vue
+++ b/src/components/page/Assessment.vue
@@ -55,6 +55,7 @@
round
@click="add"
class="bt_one"
+ v-auth
>创建实验
批量删除
@@ -114,16 +116,16 @@
- 启动
- 修改
+ 启动
+ 修改
- 提前结束
+ 提前结束
- 查看成绩
+ 查看成绩
- 删除
+ 删除
diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index 5d091c2..67b1385 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -75,8 +75,8 @@
- 编辑
- 删除
+ 编辑
+ 删除
@@ -84,7 +84,7 @@
- 创建班级
+ 创建班级
diff --git a/src/components/page/Evaluation.vue b/src/components/page/Evaluation.vue
index 0bcf4f7..4fc793a 100644
--- a/src/components/page/Evaluation.vue
+++ b/src/components/page/Evaluation.vue
@@ -2,7 +2,7 @@
- 测评设置
+ 测评设置
@@ -224,6 +224,7 @@
round
class="bt_one"
@click="addTopics"
+ v-auth
>新增题目
批量上传
批量删除
@@ -270,10 +273,10 @@
- 查看
+ 查看
- 修改
+ 修改
- 删除
+ 删除
diff --git a/src/components/page/ExperimentAss.vue b/src/components/page/ExperimentAss.vue
index 0227d6a..375b8b8 100644
--- a/src/components/page/ExperimentAss.vue
+++ b/src/components/page/ExperimentAss.vue
@@ -143,7 +143,6 @@ export default {
let not = 0
list.map(n => {
n.class = this.className
- score += n.score
if(!n.isRead){
not++
}else{
@@ -154,6 +153,10 @@ export default {
this.not = not
}
+ list.map(n => {
+ score += n.score
+ })
+
this.listDataAll = list
this.handlePage()
this.totals = list.length
diff --git a/src/components/page/Match.vue b/src/components/page/Match.vue
index 463bda8..2b26693 100644
--- a/src/components/page/Match.vue
+++ b/src/components/page/Match.vue
@@ -55,6 +55,7 @@
round
@click="add"
class="bt_one"
+ v-auth
>创建实验
批量删除
@@ -119,16 +121,16 @@
- 启动
- 修改
+ 启动
+ 修改
- 提前结束
+ 提前结束
- 查看成绩
+ 查看成绩
- 删除
+ 删除
diff --git a/src/components/page/Project.vue b/src/components/page/Project.vue
index 06186fc..14d760d 100644
--- a/src/components/page/Project.vue
+++ b/src/components/page/Project.vue
@@ -62,8 +62,8 @@
项目列表
- 新增项目
- 批量删除
+ 新增项目
+ 批量删除
@@ -92,8 +92,8 @@
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/src/components/page/Staff.vue b/src/components/page/Staff.vue
index e766e51..08c46db 100644
--- a/src/components/page/Staff.vue
+++ b/src/components/page/Staff.vue
@@ -442,6 +442,7 @@ export default {
this.teacherForm.userAccount = user.account
this.teacherForm.userId = user.userId
this.teacherForm.schoolId = user.schoolId
+ this.teacherForm.uniqueIdentificationAccount = user.uniqueIdentificationAccount
or.forEach((n,i) => {
this.teacherForm.roleValue.push(this.roleStatus(n.roleId))
if(n.roleId == 13) {
@@ -590,19 +591,19 @@ export default {
data = {
workNumber: this.encodeString(this.teacherForm.managerWorkNumber),
roleId: 13,
- schoolId: this.teacherForm.schoolId
+ // schoolId: this.teacherForm.schoolId
}
msg = '该管理员工号已存在'
}else if(type == 14){
data = {
workNumber: this.encodeString(this.teacherForm.teacherWorkNumber),
roleId: 14,
- schoolId: this.teacherForm.schoolId
+ // schoolId: this.teacherForm.schoolId
}
msg = '该老师工号已存在'
}
- let res = await this.$get(this.api.queryWorkNumberIsExist, data);
- if(JSON.stringify(res.message) != '{}'){
+ let res = await this.$get(this.api.queryStaffWorkNumberIsExist, data);
+ if(JSON.stringify(res.status) == 201){
this.$message.warning(msg);
type == 13 ? (this.managerNumberNoAdd = false) : (this.teacherNumberNoAdd = false)
}else{
diff --git a/src/components/page/Student.vue b/src/components/page/Student.vue
index 266f219..f61a808 100644
--- a/src/components/page/Student.vue
+++ b/src/components/page/Student.vue
@@ -25,12 +25,12 @@
- 新增学生
- 批量导入
- 批量删除
+ 新增学生
+ 批量导入
+ 批量删除
-
+
@@ -40,6 +40,8 @@
+
+
@@ -54,16 +56,17 @@
- 查看
- 编辑
- 重置密码
- 删除
+ 查看
+ 编辑
+ 重置密码
+ 删除
diff --git a/src/router/routes.js b/src/router/routes.js
index bbf460f..ec86c2c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -16,6 +16,7 @@ export default [
}
},
{
+ name: 'dashboard',
path: '/dashboard',
component: () => import('../components/page/Dashboard.vue'),
meta: { title: '班级教学' }
@@ -31,6 +32,7 @@ export default [
meta: { title: '新建班级' }
},
{
+ name: 'assessment',
path: '/assessment',
component: () => import('../components/page/Assessment.vue'),
meta: { title: '考核管理' }
@@ -41,6 +43,7 @@ export default [
meta: { title: '考核管理' }
},
{
+ name: 'achievement',
path: '/achievement',
component: () => import('../components/page/Achievement.vue'),
meta: { title: '成绩管理' }
@@ -86,11 +89,13 @@ export default [
meta: { title: '用户管理' }
},
{
+ name: 'evaluation',
path: '/evaluation',
component: () => import('../components/page/Evaluation.vue'),
meta: { title: '测评管理' }
},
{
+ name: 'project',
path: '/project',
component: () => import('../components/page/Project.vue'),
meta: { title: '实验项目管理' }
@@ -111,16 +116,19 @@ export default [
meta: { title: '查看判分点' }
},
{
+ name: 'student',
path: '/student',
component: () => import('../components/page/Student.vue'),
meta: { title: '学生管理' }
},
{
+ name: 'match',
path: '/match',
component: () => import('../components/page/Match.vue'),
meta: { title: '竞赛实验' }
},
{
+ name: 'backstage',
path: '/backstage',
component: () => import('../components/page/Backstage.vue'),
meta: { title: '业务后台' }
@@ -141,11 +149,13 @@ export default [
meta: { title: '老师评语' }
},
{
+ name: 'staff',
path: '/staff',
component: () => import('../components/page/Staff.vue'),
meta: { title: '用户管理' }
},
{
+ name: 'system',
path: '/system',
component: () => import('../components/page/System.vue'),
meta: { title: '系统设置' }
diff --git a/src/utils/api.js b/src/utils/api.js
index 5fd582a..a4e95c3 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -24,7 +24,7 @@ export default {
queryAccountIsExist:`${host}/liuwanr/userInfo/queryAccountIsExist`,//查询员工,学生账号是否存在接口
queryWorkNumberIsExist:`${host}/evaluation/tms/userInfo/queryWorkNumberIsExist`,//查询学号是否存在
- queryWorkNumberIsExist1:`${host}/liuwanr/userInfo/queryWorkNumberIsExist`,//查询工号是否存在
+ queryStaffWorkNumberIsExist:`${host}/evaluation/tms/system/queryStaffWorkNumberIsExist`,//查询工号是否存在
querySchool: `${host}/liuwanr/customer/querySchool`, //根据学校名称查询学校信息
queryPersonalCenter:`${host}/liuwanr/personalCenter/queryPersonalCenter`,