From eb01aeb236723b3ed620db820145bd377810775b Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 9 Jul 2022 13:05:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A5=E5=85=85=E6=A0=87?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 7 ++- .../BussDocumentLibraryEOServiceImpl.java | 34 ++++++------ .../impl/DummyInventoryBaseEOServiceImpl.java | 9 ++-- .../project/job/InventoryAffirmJob.java | 10 ++-- .../jero/modules/project/job/PrehomoJob.java | 8 ++- .../project/job/VerifyComplianceJob.java | 8 ++- .../project/job/designComplianceJob.java | 8 ++- .../IProjectLawsInventoryEOService.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 53 ++++++++++++++----- ...ojectTaskInventoryDetailEOServiceImpl.java | 14 +++-- .../ProjectTaskInventoryEOServiceImpl.java | 26 +++++++-- ...ectTaskInventoryFeedbackEOServiceImpl.java | 20 ++++++- .../project/util/SendMessageUtils.java | 7 +-- .../modules/warn/service/LawsWarnService.java | 4 +- .../modules/warn/service/TimedTaskWarn.java | 10 ++-- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../src/views/system/UserAnnouncementList.vue | 16 +++--- 18 files changed, 164 insertions(+), 74 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 6b40d73bd..ff8f7c289 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1202,7 +1202,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); StringBuilder connectBuilder = new StringBuilder(); - connectBuilder.append("You are required to fll in "); + connectBuilder.append("You are required to fill in "); for (int i=0; ithe link,"; String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; + String msgTitle = "You have a homo parameter task to complete"; + // TODO 为什么不用SendMessageUtils工具类呢？ // 发送系统消息 SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); @@ -1305,6 +1307,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl userNameList = new ArrayList<>(); if (onlCgformSubscribeList.size() != 0) { for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { @@ -313,10 +306,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); String content = sysUser.getUsername() + " delete " + StringUtils.join(serialNumberList, ",") + ",Please pay attention to check."; -// String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check."; String contentInfo =content; + String title = content; //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue()); + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo); } @@ -2148,9 +2141,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "").replaceAll("", ""); //您订阅的XXX已被修改 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString(); -// String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString(); - //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue()); + String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated"; + // 封装消息的实体类 + SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket((String) map.get("id"), contentInfo); } @@ -3171,8 +3165,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl thirdIdList = userList.stream().map(SysUser::getThirdId).collect(Collectors.toList()); String content = "New numbering implemented, please note update status of alternate numbering " + StringUtils.join(serialNumberList, ","); String contentInfo = "New numbering implemented, please note update status of alternate numbering " + sbStr; + String msgTitle = contentInfo; //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue()); + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo); //飞书 @@ -3275,7 +3271,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo,String messageType) { + public SysAnnouncement getSysAnnouncement(List userIdList, String title, String content, String contentInfo,String messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); @@ -3283,6 +3279,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"," "); + + msgTitle = "The " + baseName + " virtual list you subscribed to has been updated"; //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue()); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo); //飞书 @@ -1159,9 +1162,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl updateStatusBatch(JSONObject json); - void sendMessage(String msgContent, List userIdList, String projectLibraryId, Map params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType); + void sendMessage(String msgTitle, String msgContent, List userIdList, String projectLibraryId, Map params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType); /** * 匹配相关人员 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 42a962cfc..2b922603a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1346,6 +1346,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); userIdList.add(projectLibraryBase.getStudioEngineer()); - sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK); + sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK); } + if(isProjectRole == Integer.parseInt(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()) || isProjectRole == Integer.parseInt(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){ msgContentEN = "The regulation list confirmation of "+projectLawsInventoryEO.getSerialNumber() + " for " + projectNameInfoEO.getProjectName() +" is rejected by " + currentUser.getUsername() +". Please check and address it in a timely manner."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + ": You have a regulation list confirmation task to complete"; // 飞书消息封装 FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); @@ -1545,7 +1554,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); userIdList.add(projectLibraryBase.getStudioEngineer()); - sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK); + sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK); } } @@ -1561,6 +1570,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); userIdList.add(projectLibraryBase.getStudioEngineer()); - sendMessage(msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION); + sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION); } } } @@ -1616,7 +1627,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList,String projectLibraryId,Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType){ + public void sendMessage(String msgTitle, String msgContent, List userIdList,String projectLibraryId,Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType){ String idTemp = projectLibraryId; List sysUsers = sysUserService.listByIds(userIdList); @@ -1630,7 +1641,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo, MessageTypeEnum messageType) { + private SysAnnouncement getSysAnnouncement(List userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 + sysAnnouncement.setTitile(title); sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); sysAnnouncement.setUserIds(StringUtils.join(userIdList, ",")); @@ -2073,36 +2085,45 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, currentUserId)); String msgContentEN = ""; + String msgTitle = ""; List userIdList = new ArrayList<>(); FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) { userIdList.add(engineeringInterfacePerson); - msgContentEN = sysUser.getUsername() + " assigned the regulation task confirmation of " + projectNameInfoEO.getProjectName() + msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName() + ".The due date is：" +taskAffirmDueDate+ " Please check and address it in a timely manner."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + ": You have a regulation task confirmation to complete"; - feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and and handle it in time."); + feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner."); } else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) { String dreUserId = jsonObject.getString("dreUserId"); //dre用户id userIdList.add(dreUserId); msgContentEN = sysUser.getUsername() + " has assigned the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName() + ".to you. the due date is " +taskAffirmDueDate+ " Please check and handle it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + ": You have a regulation task confirmation to complete"; feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time."); } else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) { userIdList.add(engineeringInterfacePerson); - msgContentEN = sysUser.getUsername() + " has returned the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() + msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() + ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + ": You have a regulation task confirmation to complete"; - feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has returned the task. Please check and and handle it in time."); + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time."); } else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) { userIdList.add(engineeringInterfacePerson); msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName() + ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + ": You have a regulation task confirmation to complete"; feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time."); @@ -2128,7 +2149,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl userIdList){ LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String msgContentEN = ""; - - String projectTaskInventoryId = projectTaskInventoryDetailEO.getProjectTaskInventoryId(); + String projectTaskInventoryId = projectTaskInventoryDetailEO.getProjectTaskInventoryId(); ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOMapper.selectOne(new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryId)); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); @@ -305,6 +303,8 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper() @@ -354,6 +353,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl().success("提醒办理成功！"); } @@ -733,7 +740,6 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl().lambda().eq(ProjectLawsInventoryEO::getId, id) ); - String msgContentEN = ""; List userIdList = new ArrayList<>(); String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id if(StringUtils.isNotEmpty(dreUserIds)){ @@ -770,6 +776,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl userIdList, String projectLibraryId, Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType) { + public static void sendMessage(String msgTitle, String msgContent, List userIdList, String projectLibraryId, Map sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType) { String idTemp = projectLibraryId; List sysUsers = sysUserService.listByIds(userIdList); @@ -69,7 +69,7 @@ public class SendMessageUtils { String contentInfo = (String) sendMessageMap.get("contentInfo"); //系统消息 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgContent, contentInfo,messageType); + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo,messageType); sysAnnouncementService.saveAnnouncement(sysAnnouncement); sendWebsocket(idTemp, idTemp); @@ -89,13 +89,14 @@ public class SendMessageUtils { } @NotNull - private static SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo, MessageTypeEnum messageType) { + private static SysAnnouncement getSysAnnouncement(List userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); sysAnnouncement.setMsgCategory(messageType.getValue());//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 + sysAnnouncement.setTitile(title); sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); sysAnnouncement.setUserIds(StringUtils.join(userIdList, ",")); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index fb14f56ec..8e091a1da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -332,8 +332,10 @@ public class LawsWarnService { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out."; String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out."; + String title = content; + //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.PUSH.getValue()); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo); //飞书 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java index 34bf673e4..c6b2e871c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java @@ -122,7 +122,8 @@ public class TimedTaskWarn implements Job { + " new model you subscribed to is "+format+",please pay attention to check"; String contentInfo = "The implementation date of the " + category +" "+ href + " new model you subscribed to is "+format+",please pay attention to check"; - sendMessage(content,contentInfo,content, url, userIdList, thirdIdList); + String msgTitle = content; + sendMessage(msgTitle, content,contentInfo,content, url, userIdList, thirdIdList); } } @@ -141,16 +142,17 @@ public class TimedTaskWarn implements Job { + " production vehicle you subscribed to is "+format+",please pay attention to check"; String contentInfo = "The implementation date of the " + category +" "+ href + " production vehicle you subscribed to is "+format+",please pay attention to check"; - sendMessage(content,contentInfo,content, url, userIdList, thirdIdList); + String msgTitle = content; + sendMessage(msgTitle, content,contentInfo,content, url, userIdList, thirdIdList); } } } } - private void sendMessage(String content,String contentInfo,String contentFeiShu, String url, List userIdList, List thirdIdList) { + private void sendMessage(String title, String content,String contentInfo,String contentFeiShu, String url, List userIdList, List thirdIdList) { //站内消息 //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.WARN.getValue()); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.WARN.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index fee53c4dc..9c72de433 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -414,6 +414,7 @@ module.exports = { ForwardPush: 'Forward push', PleaseSelectData: 'Please select data first', MessageContent: 'Message Content', + MessageTitle: 'Message Title', MessageType: 'Message Type', NotificationTime: 'Notification Time', MessageNotification: 'Message Notification', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index cc78f27b5..36383260f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -419,6 +419,7 @@ module.exports = { ForwardPush: '转发推送', PleaseSelectData: '请先选择数据', MessageContent: '消息内容', + MessageTitle: '消息标题', MessageType: '消息类型', NotificationTime: '通知时间', MessageNotification: '消息通知', diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index c06aa9dcf..800be4f7e 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -6,12 +6,12 @@
-
- {{this.$t('MessageContent')}} +
+ {{this.$t('MessageTitle')}}
+ :placeholder="$t('pleaseEnter')+$t('MessageTitle')" + v-model="queryParam.titile">
@@ -65,7 +65,7 @@ :pagination="ipagination" :loading="loading" @change="handleTableChange"> - + {{text}} @@ -119,11 +119,11 @@ }, columns: [ { - title: this.$t('MessageContent'), + title: this.$t('MessageTitle'), align: 'center', - dataIndex: 'msgContent', + dataIndex: 'titile', ellipsis: true, - scopedSlots: { customRender: 'msgContent' } + scopedSlots: { customRender: 'msgTitile' } }, { title: this.$t('MessageType'),