diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue index 5e7134ded36f7596b9732fdd952ca7a9e123a815..a60dd684ed01d59b392cad6b785c771fe409f3a4 100644 --- a/src/pages/message-management/directed-push/directed-push-list.vue +++ b/src/pages/message-management/directed-push/directed-push-list.vue @@ -159,14 +159,6 @@ export default { listHeader: [], listData: [], listTotal: 0, - dialogInfo: { - msg: "", - cancelText: "", - cancelType: "", - cancel: null, - sunbmitText: "", - submit: null, - }, topFilter: { name: "", state: "", @@ -276,9 +268,6 @@ export default { this.initList(this.tempFilter); }, - showDialog() { - this.$refs.dialog.show(); - }, addNew() { this.$router.push("/message/directed_push/add"); }, diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue index 56936e81787c159bf08e86678ff4c8822083e569..f95829dcfb9ae3b05bfeea86224c7f7f5559afb8 100644 --- a/src/pages/message-management/message-alert/message-alert-list.vue +++ b/src/pages/message-management/message-alert/message-alert-list.vue @@ -67,9 +67,78 @@ + width="800" + title="查看" + @cancel="cancelAction" + @submit="submitAction" + > +
+
+

+ 消息模板名称： +

+

+ {{ templateDetail.tpl_name }} +

+
+
+

+ 模板类型： +

+

+ {{ templateDetail.tpl_type }} +

+
+
+

+ 消息详情： +

+
+
+

+ {{ templateDetail.contents }} +

+
+
+
+
+

+ 目标用户： +

+
+
+

+ {{ templateDetail.receive_user }} +

+
+
+
+
+

+ 推送时间： +

+

+ {{ templateDetail.push_time }} +

+
+
+

+ 推送状态： +

+

+ {{ templateDetail.state }} +

+
+
+

+ 推送流水号： +

+

+ {{ templateDetail.id }} +

+
+
+ @@ -89,16 +158,13 @@ export default { listHeader: [], listData: [], listTotal: 0, - dialogInfo: { - msg: "", - submit: null, - }, topFilter: { name: "", state: "", push_time: "", }, tempFilter: null, + templateDetail: null, }), created() { this.listHeader = [ @@ -107,40 +173,37 @@ export default { prop: "state", type: "image-tooltip", getImage(item) { - return item.state == 1 - ? require("@/assets/imgs/ic_true.png") - : require("@/assets/imgs/ic_failed.png"); + return [ + require("@/assets/imgs/ic_failed.png"), + require("@/assets/imgs/ic_true.png"), + require("@/assets/imgs/ic_pushing.png"), + ][item.state || 0]; }, getTooltip(item) { - return item.state == 1 ? "推送成功" : "推送失败"; + return ["推送失败", "推送成功", "推送中"][item.state || 0]; }, align: "center", width: 60, }, { label: "推送流水号", - prop: "push_num", + prop: "id", width: 240, }, { label: "消息模板名称", - prop: "name", + prop: "tpl_name", type: "button", callback: this.detailAction, width: 300, }, { label: "消息详情", - prop: "detail", + prop: "contents", }, { label: "接收用户", - prop: "users", - getText(item) { - let users = item.users || []; - - return users.join("，"); - }, + prop: "receive_user", width: 300, }, { @@ -157,122 +220,25 @@ export default { }, methods: { initList(filter) { - let fullFilter = { - ...filter, - ...this.topFilter, + let params = { + page: filter.page, + size: filter.size, + tplname: this.topFilter.name, + state: this.topFilter.state, + time_s: (this.topFilter.push_time && this.topFilter.push_time[0]) || "", + time_e: (this.topFilter.push_time && this.topFilter.push_time[1]) || "", }; - this.tempFilter = filter; // filter存档，用于页面刷新 - - console.log(fullFilter); + // console.log(params); - this.listTotal = 55; - this.listData = [ - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["张三", "李四", "王五"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["张三", "李四", "王五"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 0, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 0, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["张三", "李四", "王五"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 1, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["张三", "李四", "王五"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 0, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - { - state: 0, - push_num: "propelling2020001", - name: "服务定向推送的消息", - detail: - "亲爱的用户，根据您的服务调用情况，我们向您推荐地图视频融合服务，欢迎使用！", - users: ["杨过", "小龙女", "冯宝宝"], - push_time: "2020-07-18T14:25:09+08:00", - }, - ]; + this.tempFilter = filter; // filter存档，用于页面刷新 - /* this.$http - .get("/apaas/service/v3/resource/apply/approveList", { - params: { - search: filter.keyword, - page: filter.page, - limit: filter.size, - state: filter.state, - }, - }) + this.$http + .get("/apaas/service/v3/push/alertmsg/list", { params }) .then(({ data }) => { if (data.success == 1) { - this.listTotal = data.total; - this.listData = data.data; + this.listTotal = (data.data && data.data.total) || 0; + this.listData = (data.data && data.data.data) || []; } else { this.$message({ message: data.errMsg || "获取列表失败", @@ -282,8 +248,13 @@ export default { }) .catch((error) => { console.log(error); - }); */ - }, // TODO: 列表待调试 + + this.$message({ + message: "获取列表失败", + type: "warning", + }); + }); + }, topFilterAction() { this.initList(this.tempFilter); }, @@ -296,14 +267,51 @@ export default { this.initList(this.tempFilter); }, - showDialog() { - this.$refs.dialog.show(); - }, addNew() { this.$router.push("/message/message_alert/add") }, detailAction(item) { - console.log(`查看${item.name}`); + this.$http + .get(`//apaas/service/v3/push/alertmsg/view/${item.id}`) + .then(({ data }) => { + if (data.success == 1) { + let detail = data.data || {}; + + this.templateDetail = { + tpl_name: detail.tpl_name || "", + tpl_type: ["", "服务推送", "平台维护", "版本更新", "自动消息"][ + detail.tpl_type || 0 + ], + contents: detail.contents || "", + receive_user: detail.receive_user || "", + push_time: helper.dateStringTransform(detail.push_time || ""), + state: ["推送失败", "推送成功", "推送中"][item.state || 0], + id: detail.id || "", + tpl_id: detail.tpl_id || "", + create_user: detail.create_user || "", + }; + this.$refs.dialog.show(); + } else { + this.$message({ + message: data.errMsg || "获取详情失败", + type: "warning", + }); + } + }) + .catch((error) => { + console.log(error); + + this.$message({ + message: "获取详情失败", + type: "warning", + }); + }); + }, + cancelAction() { + this.$refs.dialog.hide(); + }, + submitAction() { + this.$refs.dialog.hide(); }, }, };