From f63f75ce2c17b98a8e10fff11aa94d9285902139 Mon Sep 17 00:00:00 2001 From: xuyiming Date: Tue, 21 Jul 2020 15:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=90=91=E6=8E=A8=E9=80=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/ic_pushing.png | Bin 0 -> 1620 bytes .../directed-push/directed-push-list.vue | 182 ++++++++++++++++-- src/pages/workbench/workPlace.vue | 2 +- 3 files changed, 162 insertions(+), 22 deletions(-) create mode 100644 src/assets/imgs/ic_pushing.png diff --git a/src/assets/imgs/ic_pushing.png b/src/assets/imgs/ic_pushing.png new file mode 100644 index 0000000000000000000000000000000000000000..c109499006552e3c549b50c8e1c4e4d9b36205fc GIT binary patch literal 1620 zcmaJ>drT8|94}6$A~--$WH^q4fDGH~0}59utPikNi#(dPI$iAJC?l z(jo+PI5%;i&c`%abxczid?7H0x;d+&ap0qKOr~xGQ4n`U!2L0H$=&af&*$@feR7+# zvla&Uh5IoWi~zYznoF<2-goNT^jCGMN=+|ws0G>U9Mf)fak#NspcoWvv`8D??#yhIqD4{+I>6o{Pyad=D)Uy#TaaJj(f1Jcn5 zL%twanmHPaJ_*4BiZTlz$YQauEIbxY7$FV}!w{Pbak)$y!6a=MrL{6KGI~rwijaB& zHB%^#0bWI|4lkjEAf4&!5=`cCS&STQ6WuV#sx?C#7Ta6W7*L`3f2hecjwY#GGX);w zN^yOO3Bjl_uHg+=G9lM%2a}nOEJX-(4PwY7a1$_6wg8Oqmn1l5Dk2yEpJ> zlsX}xqHVXzvrrXW78<)Z=YGZdkp9q``x_!NpjX@0_ZZ8#XHLt+i;no`#ViIJ8)7T2 z6h`bixIiH2ywghJvC+r19XrYXn}0kycDeI9)mR$LSq*h>ir_uyoPAa==5_yc_v4h| zlQ$lQ*1pJFhJ}AN)upfgP4+oJ1r^3)nhPB>+vPz4rpZPtF{|_w(YhyvVfA%E!`ot} zyN?pU2Fav|H5=dQX{`H1>h4%ydn(-c^J4S&g9o}rUq$BC+|;PcI}YukmiiIL?%7_{ zW`7W-soE^@f;^Xi0r6*D4q=fkG7)+#ayy|JyRRXT6Wjw&Gh z@c>82iyJznUWrOho%?Z4D4DtaQCOJYoSi4sx4KU50fp`M{hs1J|H71IHTJ_s^-%4y zSBI<9j@WCL+Mm^*yRiRiYhL%ejy(<7%e!E$}y(L-F<2DfxYY+c)o@HJehM-(|No6}I#)e*bQ- z-=P^X4Nj@S=h$=He`e{ml7?HAQ2`HH#E@>-(3RYC)B!G5P_tw@;8q<@3;%Ck+?(!wa(+7PozhpR~CYR;(HBXx^u0eN5;(EHH@u$s4Y*|tK z9P8tdD)-jY$$W=?AM3v1()GR1zAZ1HE(Lm;99dtqo%_L~OEofoFB^(XfaF)NbVyZN6nqL_>h8(i!73IIG%R`3t)Obk(~~*aL~H<(-H8AKktyUheeWqAP3BopmY` z{Qh2fHcqZ_AR&Y90lUnJ^>})3FX&tDJ3leLNps=)L3euebk~M2i#z&*W?W1&ocW8a l3fvvMeCk|hO!>>8Rg4z3&pw}Dfoku6UY?O9Jt|&R_75L`Z~XuO literal 0 HcmV?d00001 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 b047d45..113bdb3 100644 --- a/src/pages/message-management/directed-push/directed-push-list.vue +++ b/src/pages/message-management/directed-push/directed-push-list.vue @@ -68,13 +68,80 @@ + width="800" + title="查看" + @cancel="cancelAction" + @submit="submitAction" + > +
+
+

+ 消息模板名称： +

+

+ 服务定向推送的消息 +

+
+
+

+ 模板类型： +

+

+ 服务推送 +

+
+
+

+ 消息详情： +

+
+
+

+ 亲爱的用户，根据您最近的服务调用情况，我们向您推荐 + 地图视频融合服务,贵州应急资源地图微服务，欢迎使用！ + 产品说这里最多可以输入500字。 +

+
+
+
+
+

+ 目标用户： +

+
+
+

+ 贵阳市公安局,贵阳市水利局,内马尔,勒布朗詹姆斯 +

+
+
+
+
+

+ 推送时间： +

+

+ 2020-04-30 12:34:56 +

+
+
+

+ 推送状态： +

+

+ 推送成功 +

+
+
+

+ 推送流水号： +

+

+ propelling2020001 +

+
+
+ @@ -108,6 +175,7 @@ export default { push_time: "", }, tempFilter: null, + templateDetail: null, }), created() { this.listHeader = [ @@ -116,40 +184,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, }, { @@ -220,7 +285,46 @@ export default { console.log("新建模板"); }, detailAction(item) { - console.log(`查看${item.name}`); + this.$http + .get(`/apaas/service/v3/push/directmsg/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: "", + create_user: "", + id: "", + push_time: "", + receive_user: "", + state: "", + tpl_id: "", + }; + 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(); }, }, }; @@ -230,4 +334,40 @@ export default { .list_container { height: 100%; } +.detail_dialog { + display: flex; + flex-wrap: wrap; + text-align: left; +} +.detail_dialog .detail_item { + flex: 1 1 auto; + width: 50%; + margin-top: 20px; +} +.detail_dialog .detail_item.full_line { + width: 100%; +} +.detail_dialog .detail_item p { + padding: 0 15px; + font-size: 14px; + line-height: 22px; + color: #8890a7; +} +.detail_dialog .detail_item .item_content { + color: #000; + margin-top: 10px; +} +.detail_dialog .detail_item .full_content { + padding: 10px 0; + border-radius: 8px; + background-color: #f8f9fd; + margin-top: 5px; +} +.detail_dialog .detail_item .full_content > .apass_scroll { + height: 176px; + overflow: auto; +} +.detail_dialog .detail_item .full_content .item_content { + margin: 0; +} diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index c6f6e7b..3448d1c 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -985,7 +985,7 @@ export default { pic: require("@/assets/imgs/home_tool_ic_lcsj.png"), bg: "#e6ebfe", color: "#515fe7", - url: "https://apaas.wodcloud.com/lcgl/index.html#/", + url: "https://apaas-nologo.wodcloud.com/lcgl/index.html#/", target: 1 }, { -- 2.26.0