diff --git a/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java b/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java index d008294..1096c83 100644 --- a/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java +++ b/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java @@ -169,6 +169,10 @@ public class MsgNotifyController { MsgNotifyUser msgNotifyUser = new MsgNotifyUser(); msgNotifyUser.setSendUser(ShiroUtil.getUserId()); + msgNotifyUser.setTitle(msgNotify.getTitle()); + msgNotifyUser.setContent(msgNotify.getContent()); + msgNotifyUser.setLink(msgNotify.getUrl()); + msgNotifyUser.setApiModule("消息管理系统"); if (msgNotify.getSendMode().equals("one")) { List list = msgNotifyService.getUserByRoleIds(msgNotify.getModule(), msgNotify.getTeacherMeetingId(), msgNotify.getRoleIds()); @@ -179,6 +183,7 @@ public class MsgNotifyController { list.forEach(v -> { if (flag) { msgNotify.setSendTime(DateUtil.getDateTime()); + msgNotifyUser.setSendTime(DateUtil.getDateTime()); } msgNotifyUser.setUserId(v.getString("id")); msgNotifyUser.setTitleId(msgNotify.getId()); @@ -194,6 +199,7 @@ public class MsgNotifyController { userScopes.forEach(v -> { if (flag) { msgNotify.setSendTime(DateUtil.getDateTime()); + msgNotifyUser.setSendTime(DateUtil.getDateTime()); } msgNotifyUser.setUserId(v.getString("id")); msgNotifyUser.setTitleId(msgNotify.getId()); @@ -208,6 +214,7 @@ public class MsgNotifyController { for (String u : users) { if (flag) { msgNotify.setSendTime(DateUtil.getDateTime()); + msgNotifyUser.setSendTime(DateUtil.getDateTime()); } msgNotifyUser.setUserId(u); msgNotifyUser.setTitleId(msgNotify.getId()); @@ -224,6 +231,7 @@ public class MsgNotifyController { for (User u : userList) { msgNotifyUser.setUserId(u.getId()); msgNotifyUser.setTitleId(msgNotify.getId()); + msgNotifyUser.setSendTime(DateUtil.getDateTime()); } dao.insert(msgNotifyUser); diff --git a/src/main/resources/views/platform/qsv/activity/setting.js b/src/main/resources/views/platform/qsv/activity/setting.js index afff7f0..af361df 100644 --- a/src/main/resources/views/platform/qsv/activity/setting.js +++ b/src/main/resources/views/platform/qsv/activity/setting.js @@ -25,13 +25,14 @@ const setting = { }, methods:{ onOpen(option,ext){ - console.log(option) - this.formData = { ...option } + this.formData = option this.ext = ext this.visible = true }, onConfirm(){ this.$emit('confirm', { option:this.formData,ext:this.ext }) + this.formData ={} + this.visible = false } } diff --git a/src/main/resources/views/platform/qsv/activity/subjectForm.js b/src/main/resources/views/platform/qsv/activity/subjectForm.js index a2c9fc7..7a23bab 100644 --- a/src/main/resources/views/platform/qsv/activity/subjectForm.js +++ b/src/main/resources/views/platform/qsv/activity/subjectForm.js @@ -323,7 +323,6 @@ const subjectForm = { //删除选项图片 removeOptionImg(subjectIndex, optionIndex){ this.$set(this.subjects[subjectIndex].options[optionIndex], "imgUrl", null) - console.log(this.subjects[subjectIndex]) }, //打开选项设置 @@ -336,11 +335,7 @@ const subjectForm = { //选项设置确认 onSettingConfirm({option, ext}){ - this.subjects[ext.subjectIndex].options[ext.optionIndex] = option - console.log(this.subjects[ext.subjectIndex].options[ext.optionIndex]) - - // this.$set(this.subjects[ext.subjectIndex].options[ext.optionIndex], "isCorrect", option.isCorrect) - // this.$set(this.subjects[ext.subjectIndex].options[ext.optionIndex], "hint", option.hint) + this.$set(this.subjects[ext.subjectIndex].options, ext.optionIndex, option) }, //保存