diff --git a/src/api/xm/core/xmMenuComment.js b/src/api/xm/core/xmMenuComment.js index 9064ac64..e209ebec 100644 --- a/src/api/xm/core/xmMenuComment.js +++ b/src/api/xm/core/xmMenuComment.js @@ -27,6 +27,10 @@ export const editXmMenuComment = params => { return axios.post(`${base}/xm/core/ //新增一条档案评论表 export const addXmMenuComment = params => { return axios.post(`${base}/xm/core/xmMenuComment/add`, params); }; + +//点赞一条评论 +export const praiseXmMenuComment = params => { return axios.post(`${base}/xm/core/xmMenuComment/praise`, params); }; + //批量修改某些字段 export const editSomeFieldsXmMenuComment = params => { return axios.post(`${base}/xm/core/xmMenuComment/editSomeFields`, params); }; diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue index 17880ef7..f3ba6af8 100644 --- a/src/views/xm/core/xmMenu/XmMenuEdit.vue +++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue @@ -234,7 +234,7 @@ - + 上传附件 @@ -244,6 +244,9 @@ + + + @@ -300,6 +303,7 @@ import XmEpicFeaturesSelect from "../xmMenu/XmEpicFeaturesSelect"; import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm' +import CommentArea from '../xmMenuComment/comment-area.vue'; export default { computed: { ...mapGetters([ @@ -638,6 +642,7 @@ 'xm-workload-record':()=>import("../xmWorkload/XmWorkloadRecord"), XmEpicFeaturesSelect, xmQuestionMng, + CommentArea, }, mounted() { diff --git a/src/views/xm/core/xmMenuComment/XmMenuCommentEdit.vue b/src/views/xm/core/xmMenuComment/XmMenuCommentEdit.vue deleted file mode 100644 index 71df12c5..00000000 --- a/src/views/xm/core/xmMenuComment/XmMenuCommentEdit.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/xm/core/xmMenuComment/XmMenuCommentMng.vue b/src/views/xm/core/xmMenuComment/XmMenuCommentMng.vue deleted file mode 100644 index d38b2a6f..00000000 --- a/src/views/xm/core/xmMenuComment/XmMenuCommentMng.vue +++ /dev/null @@ -1,372 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/xm/core/xmMenuComment/comment-area.vue b/src/views/xm/core/xmMenuComment/comment-area.vue index c05f7f26..7e4b9985 100644 --- a/src/views/xm/core/xmMenuComment/comment-area.vue +++ b/src/views/xm/core/xmMenuComment/comment-area.vue @@ -13,7 +13,7 @@
- +
-import { initDicts,listXmMenuComment, delXmMenuComment, batchDelXmMenuComment,editSomeFieldsXmMenuComment } from '@/api/xm/core/xmMenuComment'; +import { initDicts,listXmMenuComment, addXmMenuComment,delXmMenuComment, batchDelXmMenuComment,editSomeFieldsXmMenuComment } from '@/api/xm/core/xmMenuComment'; import commentList from './comment-list.vue'; import { mapGetters } from 'vuex'; @@ -55,7 +55,7 @@ export default { pageSize: 10,//每页数据 count: false,//是否需要重新计算总记录数 pageNum: 1,//当前页码、从1开始计算 - orderFields: ['CREATE_DATE'],//排序列 如 ['sex','student_id']，必须为数据库字段 + orderFields: ['CDATE'],//排序列 如 ['sex','student_id']，必须为数据库字段 orderDirs: ['desc']//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] }, }; @@ -64,33 +64,33 @@ export default { ...imgUtil, handleSizeChange(pageSize) { this.pageInfo.pageSize = pageSize; - this.getCList(); + this.getXmMenuComments(); }, handleCurrentChange(pageNum) { this.pageInfo.pageNum = pageNum; - this.getCList(); + this.getXmMenuComments(); }, // 格式化评论数据 commentListFormat() { this.commentsList.forEach((item) => { this.$set(item, 'childList', []); // 将回复该评论的评论放入childList中 - let arr = this.commentsList.filter((i) => i.pcommentId === item.id); + let arr = this.commentsList.filter((i) => i.pid === item.id); if (arr.length > 0) { item.childList = arr; } }); // 过滤出最高级 - this.commentsList = this.commentsList.filter((item) => item.pcommentId === null); + this.commentsList = this.commentsList.filter((item) => item.pid === null); }, publishComment() { if (this.userInfo.userid) { let params = { - archiveId: this.targetId, + menuId: this.targetId, context: this.commentTxt, }; if (params.context) { - addarchiveComment(params).then((res) => { + addXmMenuComment(params).then((res) => { let tips = res.data.tips; if (tips.isOk) { this.$message({ @@ -98,7 +98,7 @@ export default { message: '评论成功', }); this.commentTxt = ''; - this.getCList(); + this.getXmMenuComments(); } else { this.$message({ message: tips.msg, @@ -119,7 +119,7 @@ export default { }); } }, - getCList() { + getXmMenuComments() { if (!this.targetId) { return; } @@ -129,8 +129,8 @@ export default { pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, - archiveId: this.targetId, - pcommentIdIsNull: "1", + menuId: this.targetId, + pidIsNull: "1", }; if (this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0) { let orderBys = []; @@ -140,7 +140,7 @@ export default { params.orderBy = orderBys.join(",") } - getCommentList(params).then((res) => { + listXmMenuComment(params).then((res) => { let tips = res.data.tips; if (tips.isOk) { this.pageInfo.total = res.data.total; @@ -163,7 +163,7 @@ export default { }, }, mounted() { - this.getCList(); + this.getXmMenuComments(); }, }; diff --git a/src/views/xm/core/xmMenuComment/comment-list.vue b/src/views/xm/core/xmMenuComment/comment-list.vue index dcc70ab9..5f54ab05 100644 --- a/src/views/xm/core/xmMenuComment/comment-list.vue +++ b/src/views/xm/core/xmMenuComment/comment-list.vue @@ -2,17 +2,17 @@
-
+
{{ self.username }} - {{ self.createDate }} + {{ self.cdate }}
- - -  回复 + + + 回复
@@ -36,9 +36,9 @@ {{ self.createDate }}
- - -  回复 + + + 回复
@@ -53,24 +53,25 @@ {{ !showAll ? `查看全部 ${self.childNums} 条回复 >>` : `<< 收起 ${self.childList.length} 条回复` }}
-
- -
+
+ + +
- - 发表评论 + + 发表评论
- +