diff --git a/src/api/routine/NotificationManagement.js b/src/api/routine/NotificationManagement.js new file mode 100644 index 0000000..3a522be --- /dev/null +++ b/src/api/routine/NotificationManagement.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +// 查询通知管理列表 +export function listNotificationManagement(query) { + return request({ + url: '/routine/NotificationManagement/list', + method: 'get', + params: query + }) +} + +// 查询通知管理详细 +export function getNotificationManagement(id) { + return request({ + url: '/routine/NotificationManagement/' + id, + method: 'get' + }) +} + +// 新增通知管理 +export function addNotificationManagement(data) { + return request({ + url: '/routine/NotificationManagement/add', + method: 'post', + data: data + }) +} + +// 修改通知管理 +export function updateNotificationManagement(data) { + return request({ + url: '/routine/NotificationManagement/update', + method: 'post', + data: data + }) +} + +// 删除通知管理 +export function delNotificationManagement(id) { + return request({ + url: '/routine/NotificationManagement/' + id, + method: 'post' + }) +} + +// 批量修改通知管理 +export function batchUpdateNotificationManagement(data) { + return request({ + url: '/routine/NotificationManagement/batchUpdate', + method: 'post', + data: data + }) +} + +// 获取年级列表 +export function getGradeList() { + return request({ + url: '/routine/NotificationManagement/gradeList', + method: 'get' + }) +} + +// 按年级发送通知 +export function sendNotificationByGrades(data) { + return request({ + url: '/routine/NotificationManagement/sendByGrades', + method: 'post', + data: 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/Home/index-new-blue.vue b/src/views/Home/index-new-blue.vue index 6274453..fd63cce 100644 --- a/src/views/Home/index-new-blue.vue +++ b/src/views/Home/index-new-blue.vue @@ -8,57 +8,57 @@
-
姓名:
+
姓名：
{{ user.nickName }}
-
用户名称:
+
用户名称：
{{ user.userName }}
-
手机号码:
+
手机号码：
{{ user.phonenumber }}
-
用户邮箱:
+
用户邮箱：
{{ user.email }}
-
所属角色:
+
所属角色：
{{ displayRole(roleGroup) }}
-
+
我的消息
-
更多 >
+
更多 >
-
+
{{ v.content }}
-
- +
-
+
公示栏
-
更多 >
+
更多 >
-
+
{{ v.submitterName }}--{{ v.projectName }} -- 审核通过
{{ formatTime(v.createTime) }}
@@ -236,8 +236,107 @@
+ + + +
+ + + + + + + + +
+ +

暂无消息数据

+
+
+ + + + +
+ + + + + + + + + + + + +
+ +

暂无公示数据

+
+
+ + + +
+
+
+

消息详情

+
+ {{ formatTime(currentMessageDetail.createTime) }} +
+ +
+
+
+
{{ currentMessageDetail.content || '暂无内容' }}
+
+
+
+
+ + +
+
+
+

公示详情

+
+ {{ formatTime(currentAnnouncementDetail.createTime) }} +
+ +
+
+
+
{{ currentAnnouncementDetail.projectName || '暂无项目名称' }} - {{ currentAnnouncementDetail.submitterName || '暂无提交人' }} - 审核通过
+
+
+
+
+ + \ No newline at end of file diff --git a/src/views/routine/NotificationManagement/index.vue b/src/views/routine/NotificationManagement/index.vue new file mode 100644 index 0000000..29de064 --- /dev/null +++ b/src/views/routine/NotificationManagement/index.vue @@ -0,0 +1,306 @@ + + + diff --git a/src/views/routine/stuIdReissue/index.vue b/src/views/routine/stuIdReissue/index.vue index 04624ff..f5185f3 100644 --- a/src/views/routine/stuIdReissue/index.vue +++ b/src/views/routine/stuIdReissue/index.vue @@ -6,6 +6,7 @@ + @@ -65,6 +66,14 @@ +
办理状态
+
+ 已完成制作 + 学工处理中 + 辅导员审核中 + 待审核 + 申请被驳回 +
办理信息
@@ -109,20 +118,33 @@
- 提交申请 - + 提交申请 + + + 修改提交申请 + + + 继续提交申请 + + + 取消申请 + + + 当前审核已完成，不可取消 + 打印学生证申请表 - 返 回
diff --git a/src/views/routine/stuMultiLevelReview/index.vue b/src/views/routine/stuMultiLevelReview/index.vue index f369d7a..7290941 100644 --- a/src/views/routine/stuMultiLevelReview/index.vue +++ b/src/views/routine/stuMultiLevelReview/index.vue @@ -69,11 +69,14 @@ 未审核 辅导员通过 学工处通过 + 完成制作 辅导员驳回 - +