diff --git a/src/router/index.js b/src/router/index.js
index 076e063fef4edf8ac93643e06e4d03f0abc928c2..45cd319e136e29490fa68e360aad3b28698007eb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,6 +70,12 @@ const routes = [
meta: { title: 'Report', icon: 'el-icon-edit'},
hidden: true
},
+ {
+ path: '/student/inform',
+ name: '个人信息确认',
+ component: () => import('@/wanglingyu/views/StuInformView'),
+ meta: { title: 'Report', icon: 'el-icon-edit'}
+ },
{
path: '/student/summary',
name: '学年总结填报',
@@ -117,8 +123,8 @@ const routes = [
{
path: '/eval/gpa',
name: '学生成绩审核',
- component: () => import('@/views/evals/GpaEvalView'),
- meta: { title: 'GPA Evaluation', icon: 'el-icon-edit'}
+ component: () => import('@/wanglingyu/views/GpaEvalView'),
+ meta: { title: 'Report', icon: 'el-icon-edit'}
},
{
path: '/eval/summary',
@@ -162,13 +168,17 @@ const routes = [
path: '/admin',
name: '学工页面', icon: 'el-icon-s-check',
component: () => import('@/layout'),
- redirect: '/admin/import',
+ redirect: '/admin/importStudent',
children: [
{
- path: '/admin/import',
+ path: '/admin/importStudent',
name: '导入学生名单',
- component: () => import('@/wanglingyu/views/ImportListView'),
- meta: { title: 'List Import', icon: 'el-icon-edit'}
+ component: () => import('@/wanglingyu/views/ImportStudentView')
+ },
+ {
+ path: '/admin/importFaculty',
+ name: '导入教职工名单',
+ component: () => import('@/wanglingyu/views/ImportFacultyView')
},
{
path: '/admin/collect',
diff --git a/src/wanglingyu/api/import.js b/src/wanglingyu/api/import.js
new file mode 100644
index 0000000000000000000000000000000000000000..e812d63e629e322d6cc813ce5cc826aeff187882
--- /dev/null
+++ b/src/wanglingyu/api/import.js
@@ -0,0 +1,74 @@
+import service from '@/utils/service';
+
+// 导入学生名单
+export function importStu(file) {
+ const data = {
+ file
+ }
+ return service({
+ url: '/student/import',
+ method: 'post',
+ data: data
+ })
+ }
+
+ export function getStuPage(page, pageSize){
+ const data = {
+ page,
+ pageSize
+ }
+ return service({
+ url:'/student/page',
+ method:'get',
+ params:data
+ })
+ }
+
+// 导入教职工名单
+ export function importFaculty(file) {
+ const data = {
+ file
+ }
+ return service({
+ url: '/faculty/import',
+ method: 'post',
+ data: data
+ })
+ }
+
+ export function getFacultyPage(page, pageSize){
+ const data = {
+ page,
+ pageSize
+ }
+ return service({
+ url:'/faculty/page',
+ method:'get',
+ params:data
+ })
+ }
+
+
+ // 导入GPA
+ export function importGpa(file) {
+ const data = {
+ file
+ }
+ return service({
+ url: '/gpa/import',
+ method: 'post',
+ data: data
+ })
+ }
+
+ export function getGpaPage(page, pageSize){
+ const data = {
+ page,
+ pageSize
+ }
+ return service({
+ url:'/gpa/page',
+ method:'get',
+ params:data
+ })
+ }
\ No newline at end of file
diff --git a/src/wanglingyu/api/upload.js b/src/wanglingyu/api/upload.js
deleted file mode 100644
index 07bdbe3f1151c71cf5afd1338a63f203607cfcd8..0000000000000000000000000000000000000000
--- a/src/wanglingyu/api/upload.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import service from '@/utils/service';
-
-// 导入名单
-export function importStu(file) {
- const data = {
- file
- }
- return service({
- url: '/student/import',
- method: 'post',
- data: data
- })
- }
-
- export function getPage(page, pageSize){
- const data = {
- page,
- pageSize
- }
- return service({
- url:'/student/page',
- method:'get',
- data:data
- })
- }
\ No newline at end of file
diff --git a/src/wanglingyu/views/GpaEvalView.vue b/src/wanglingyu/views/GpaEvalView.vue
new file mode 100644
index 0000000000000000000000000000000000000000..310cc60535e81e5c8e19d9459424f51648dc1163
--- /dev/null
+++ b/src/wanglingyu/views/GpaEvalView.vue
@@ -0,0 +1,123 @@
+
+
+
+ 导入学生成绩
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导入教职工名单
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导入学生
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+ 仅允许导入xls、xlsx格式文件。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+