From b530f19ecfe38d0d9e2b12edb3817204d3799ebb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Apr 2024 16:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=B7=A5=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/plan/bpworkorder.js | 8 ++++++ src/layout/components/Navbar.vue | 40 ++++++++++++++++++++++++++++ src/views/plan/workorder/index.vue | 10 +++---- src/views/plan/workorderBP/index.vue | 39 ++++++++++++++++++--------- 4 files changed, 79 insertions(+), 18 deletions(-) diff --git a/src/api/plan/bpworkorder.js b/src/api/plan/bpworkorder.js index 06db209..281df1a 100644 --- a/src/api/plan/bpworkorder.js +++ b/src/api/plan/bpworkorder.js @@ -85,6 +85,14 @@ export function delWorkorder(workorderId) { }); } +// 删除白坯湿料计划 +export function deleteWetMaterial(workorderId) { + return request({ + url: '/plan/bppro/workorder/deleteWetMaterial/' + workorderId, + method: 'delete' + }); +} + //下发生产工单 export function downWorkorder(workorderId) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 4c345ec..fde35db 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -40,6 +40,18 @@ }} + + + + + + + + + + @@ -138,6 +150,7 @@ import SizeSelect from "@/components/SizeSelect"; import Search from "@/components/HeaderSearch"; import RuoYiGit from "@/components/RuoYi/Git"; import RuoYiDoc from "@/components/RuoYi/Doc"; +import { getUnReadComment } from "@/api/visit/visitComment"; import { listNotice, getNotice, @@ -164,6 +177,9 @@ export default { single1: true, // 非多个禁用 multiple1: true, + showPrise: false, + unReadComments: '您有0新的未读消息，请点击查看', + commentNum:0 }; }, created() { @@ -281,6 +297,30 @@ export default { window.location.reload(); }); }, + /** 获取未读消息数 */ + getUnReadList() { + console.log("++未读消息查询++"); + getUnReadComment(this.queryParams).then(response => { + if(response>0){ + this.unReadComments='您有'+response+'新的未读消息，请点击查看'; + this.commentNum = response; + this.showPrise = true; + }else{ + this.showPrise = false; + } + }); + }, + /** 跳转到【消息】 */ + gotoComment() { + alert("301") + this.showPrise = false; + }, + //先执行一次 + this.getUnReadList() + // 实现轮询 + this.timer = setInterval(() => { + setTimeout(this.getUnReadList(), 30000); + }, 30000); }, }; diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 1afb049..d7df7c5 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -202,9 +202,7 @@ --> - - - + - + + + - -