diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 9944188..0261285 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -78,19 +78,25 @@
一键已读 @@ -259,13 +265,18 @@ const handleClearAll = () => { } }) } +// 点击单条消息 +const handleClickItme = (messageId, msgType) => { + if (isLink(msgType)) handleOpenLink(messageId, msgType) + else handleReadMessage(messageId) +} // 跳转 const handleOpenLink = (messageId, msgType) => { updateSiteMessageStatus({ id: messageId, readFlag: 1 }).then(res => { if (res.code == 200) { - // 新用户注册审核提醒 esc + // 新用户注册审核提醒 esc if (msgType == 10) router.push('/system/userApproval') - // 资质申请审核 esc + // 资质申请审核 esc if (msgType == 20) router.push('/qualification/qualificationEscApproval') // 标签申请审核 esc if (msgType == 30) router.push('/labelManage/escApproval') @@ -572,6 +583,7 @@ function toggleTheme() { display: flex; justify-content: space-between; align-items: center; + cursor: pointer; } .message-item:hover { @@ -587,10 +599,10 @@ function toggleTheme() { .message-text { font-size: 18px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 100%; + // white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // max-width: 100%; } .message-time { diff --git a/src/views/qualification/escApproval/approvalDetail.vue b/src/views/qualification/escApproval/approvalDetail.vue index fe11af2..72dcd2a 100644 --- a/src/views/qualification/escApproval/approvalDetail.vue +++ b/src/views/qualification/escApproval/approvalDetail.vue @@ -522,7 +522,7 @@ const isAfterToday = () => { }; const handleCancel = () => { router.push({ - path: '/qualification/escApproval' + path: '/qualification/qualificationEscApproval' }) } diff --git a/src/views/qualification/escApproval/approvalForm.vue b/src/views/qualification/escApproval/approvalForm.vue index 4ce25a5..3df6914 100644 --- a/src/views/qualification/escApproval/approvalForm.vue +++ b/src/views/qualification/escApproval/approvalForm.vue @@ -136,14 +136,7 @@ @click.stop="handleCardPreview(beforeConditionInfo.certificatePhoto)" /> - - - - - - +
@@ -556,7 +549,7 @@ const handleApplyStateChange = (value) => { const handleCancel = () => { proxy.resetForm("ruleFormRef") router.push({ - path: '/qualification/escApproval' + path: '/qualification/qualificationEscApproval' }) } const handleSubmit = () => { @@ -566,7 +559,7 @@ const handleSubmit = () => { updateStatusBusUserQualification(ruleForm.value).then(res => { if (res.code == 200) { router.push({ - path: '/qualification/escApproval' + path: '/qualification/qualificationEscApproval' }) } else { proxy.$modal.msgSuccess(res.msg) diff --git a/src/views/qualification/myQualifications/components/LableReApplyForm.vue b/src/views/qualification/myQualifications/components/LableReApplyForm.vue index fd3d977..2b88cad 100644 --- a/src/views/qualification/myQualifications/components/LableReApplyForm.vue +++ b/src/views/qualification/myQualifications/components/LableReApplyForm.vue @@ -125,6 +125,7 @@ import { getBusDependencyPage } from "@/api/system/dependency" import { getSysSectionPage } from "@/api/system/section" import { getBusUserLabelDetail, reApplyBusUserLabel } from "@/api/labelManage/labelManage" import { getCurrentUserList } from "@/api/qualification/myQualifications" +import { currentUserRecurrentTraining } from "@/api/labelManage/labelManage" import moment from 'moment' const emit = defineEmits(['refresh'])