From 480863aa4b4ce38d5c8f4ce4962849b46916c3c6 Mon Sep 17 00:00:00 2001
From: xiayuping666 <1269237624@qq.com>
Date: Mon, 15 Apr 2024 18:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9E=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
src/utils/request.js | 6 +-
src/views/classList/classList/api.js | 37 +
src/views/classList/classList/index.vue | 170 +-
src/views/department/api.js | 30 +-
src/views/department/index.vue | 286 +-
src/views/login/index.vue | 3 +
yarn.lock | 14644 +++++++++++-----------
8 files changed, 7824 insertions(+), 7353 deletions(-)
diff --git a/package.json b/package.json
index 138f7da..23b0953 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
"@riophae/vue-treeselect": "^0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
+ "core-js": "^3.36.1",
"countup.js": "2.0.8",
"cropperjs": "^1.5.13",
"dingtalk-jsapi": "^3.0.20",
diff --git a/src/utils/request.js b/src/utils/request.js
index ec3f094..7220c5a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,6 @@ const service = axios.create({
// 添加请求拦截器
service.interceptors.request.use(
(config) => {
- console.log('---------------------')
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
let getToken = Session.get('token');
@@ -38,7 +37,6 @@ service.interceptors.request.use(
// 添加响应拦截器
service.interceptors.response.use(
(res) => {
- console.log(res)
// 对响应数据做点什么
const response = res.data;
const code = res.data.code || 200;
@@ -70,14 +68,14 @@ service.interceptors.response.use(
}
},
(error) => {
- console.log(error.response.error) // 获取错误状态码
+ console.log(error.response.data.errMessage ) // 获取错误状态码
// 对响应错误做点什么
if (error.message.indexOf('timeout') != -1) {
Message.error('网络超时');
} else if (error.message == 'Network Error') {
Message.error('网络连接错误');
} else {
- Message.error(error.response.data.msg || error.response.data.error);
+ Message.error( error.response.data.msg || error.response.data.error ||error.response.data.errMessage);
}
return Promise.reject(error);
}
diff --git a/src/views/classList/classList/api.js b/src/views/classList/classList/api.js
index d1b1aac..a79f156 100644
--- a/src/views/classList/classList/api.js
+++ b/src/views/classList/classList/api.js
@@ -15,6 +15,43 @@ export function getClassStudent (classId, params) {
params
})
}
+// 校区学段年级班级新增
+export function postManager (data) {
+ return request({
+ url: `/manager/class`,
+ method: 'post',
+ data
+ })
+}
+// 校区学段年级班级修改
+export function putManager (data) {
+ return request({
+ url: `/manager/class`,
+ method: 'put',
+ data
+ })
+}
+// 校区学段年级班级删除
+export function deleteManager (id) {
+ return request({
+ url: `/manager/class`,
+ method: 'delete',
+ params:{
+ id
+ }
+ })
+}
+// 班级家长信息
+export function getGuardian (classId, studentId) {
+ return request({
+ url: `/manager/class/guardian/list`,
+ method: 'get',
+ params:{
+ classId,studentId
+ }
+ })
+}
+
diff --git a/src/views/classList/classList/index.vue b/src/views/classList/classList/index.vue
index 0e81dc5..0c0b7d4 100644
--- a/src/views/classList/classList/index.vue
+++ b/src/views/classList/classList/index.vue
@@ -13,25 +13,35 @@
>
- 新增班级
+ 新增班级
- 新增年级
+ 新增年级
- 新增学段
+ 新增学段
- 新增校区
+ 新增校区
+
-
-
+
+
@@ -82,29 +93,35 @@
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -112,7 +129,7 @@