diff --git a/src/api/routine/NotificationManagement.js b/src/api/routine/NotificationManagement.js
index cfa3e7f..3a522be 100644
--- a/src/api/routine/NotificationManagement.js
+++ b/src/api/routine/NotificationManagement.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询通知管理列表
export function listNotificationManagement(query) {
return request({
- url: '/routine/NotificationManagement/my-sent',
+ url: '/routine/NotificationManagement/list',
method: 'get',
params: query
})
@@ -43,6 +43,15 @@ export function delNotificationManagement(id) {
})
}
+// 批量修改通知管理
+export function batchUpdateNotificationManagement(data) {
+ return request({
+ url: '/routine/NotificationManagement/batchUpdate',
+ method: 'post',
+ data: data
+ })
+}
+
// 获取年级列表
export function getGradeList() {
return request({
@@ -60,5 +69,15 @@ export function sendNotificationByGrades(data) {
})
}
+// 查询当前用户发送的通知列表
+export function listMySentNotifications(query) {
+ return request({
+ url: '/routine/NotificationManagement/my-sent',
+ method: 'get',
+ params: query
+ })
+}
+
+
diff --git a/src/api/routine/stuIdReissue.js b/src/api/routine/stuIdReissue.js
index a29c454..a958f8a 100644
--- a/src/api/routine/stuIdReissue.js
+++ b/src/api/routine/stuIdReissue.js
@@ -90,7 +90,23 @@ export function updateStuIdReissue(data) {
// 删除学生证补办
export function delStuIdReissue(id) {
return request({
- url: '/routine/stuIdReissue/' + id,
+ url: '/routine/stuIdReissue/cancel/' + id,
+ method: 'post'
+ })
+}
+
+// 获取学生证补办审核状态
+export function getStuIdReissueStatus(stuNo) {
+ return request({
+ url: '/routine/stuIdReissue/getStatus/' + stuNo,
+ method: 'get'
+ })
+}
+
+// 完成制作
+export function completedStuIdReissue(id) {
+ return request({
+ url: '/routine/stuIdReissue/completed/' + id,
method: 'post'
})
}
diff --git a/src/api/routine/stuMultiLevelReview.js b/src/api/routine/stuMultiLevelReview.js
index dbbd79f..9f6c3aa 100644
--- a/src/api/routine/stuMultiLevelReview.js
+++ b/src/api/routine/stuMultiLevelReview.js
@@ -54,3 +54,13 @@ export function delStuMultiLevelReview(id) {
method: 'post'
})
}
+
+
+// 更新审核信息并同时更新学生证补办状态
+export function updateStuMultiLevelReviewWithStuIdReissue(data) {
+ return request({
+ url: '/routine/stuMultiLevelReview/updateWithStuIdReissue',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/stuCQS/process-center/msg.js b/src/api/stuCQS/process-center/msg.js
index c81ac02..680ee8e 100644
--- a/src/api/stuCQS/process-center/msg.js
+++ b/src/api/stuCQS/process-center/msg.js
@@ -45,3 +45,11 @@ export function delMsg(id) {
method: 'post'
})
}
+
+// 根据学号查询用户ID
+export function getUserIdByStuNo(stuNo) {
+ return request({
+ url: '/system/msg/getUserIdByStuNo/' + stuNo,
+ method: 'get'
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2608e5f..a108cdd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -112,8 +112,31 @@ service.interceptors.response.use(res => {
},
error => {
console.log('err' + error)
+
+ // 判断是否是请求取消错误
+ const isCanceled = error && (
+ error.code === 'ERR_CANCELED' ||
+ error.code === 'ECONNABORTED' ||
+ error.message === 'canceled' ||
+ error.message === 'Cancel' ||
+ error.__CANCEL__ === true ||
+ (typeof error.message === 'string' && /cancel/i.test(error.message))
+ );
+
+ // 如果是请求取消，直接返回，不显示错误消息
+ if (isCanceled) {
+ console.log('请求被取消，忽略该错误');
+ return Promise.reject(error);
+ }
+
let { message } = error;
if (message == "Network Error") {
+ // 进一步判断是否真的是网络错误，还是页面卸载导致的
+ if (window.performance && window.performance.navigation.type === 1) {
+ // 页面刷新导致的，忽略
+ console.log('页面刷新导致的网络错误，已忽略');
+ return Promise.reject(error);
+ }
message = "后端接口连接异常";
Message({ message: message, type: 'error', duration: 5 * 1000 })
} else if (message.includes("timeout")) {
diff --git a/src/views/routine/NotificationManagement/index.vue b/src/views/routine/NotificationManagement/index.vue
index 70fc32d..29de064 100644
--- a/src/views/routine/NotificationManagement/index.vue
+++ b/src/views/routine/NotificationManagement/index.vue
@@ -2,12 +2,7 @@
-
+
搜索
@@ -17,46 +12,20 @@
- 新增
+ 新增
- 修改
+ 修改
- 删除
+ 删除
- 导出
+ 导出
@@ -64,35 +33,21 @@
-
+
+
- 修改
- 删除
+ 修改
+ 删除
-
-
+
+
@@ -103,31 +58,22 @@
按年级发送
-
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+