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 113bdb3ea3c29089b12849a7371c2e7fd1486ddb..be7ecfb52a10e9ac0c04caa88bad5bfe985afad5 100644
--- a/src/pages/message-management/directed-push/directed-push-list.vue
+++ b/src/pages/message-management/directed-push/directed-push-list.vue
@@ -73,13 +73,13 @@
@cancel="cancelAction"
@submit="submitAction"
>
-
+
消息模板名称:
- 服务定向推送的消息
+ {{ templateDetail.tpl_name }}
@@ -87,7 +87,7 @@
模板类型:
- 服务推送
+ {{ templateDetail.tpl_type }}
@@ -97,9 +97,7 @@
@@ -111,7 +109,7 @@
@@ -121,7 +119,7 @@
推送时间:
- 2020-04-30 12:34:56
+ {{ templateDetail.push_time }}
@@ -129,7 +127,7 @@
推送状态:
- 推送成功
+ {{ templateDetail.state }}
@@ -137,7 +135,7 @@
推送流水号:
- propelling2020001
+ {{ templateDetail.id }}
@@ -289,19 +287,20 @@ export default {
.get(`/apaas/service/v3/push/directmsg/view/${item.id}`)
.then(({ data }) => {
if (data.success == 1) {
- let detail = data.data;
+ let detail = data.data || {};
+
this.templateDetail = {
- tpl_name: detail.tpl_name,
+ tpl_name: detail.tpl_name || "",
tpl_type: ["", "服务推送", "平台维护", "版本更新", "自动消息"][
detail.tpl_type || 0
],
- contents: "",
- create_user: "",
- id: "",
- push_time: "",
- receive_user: "",
- state: "",
- tpl_id: "",
+ 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 {
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 3448d1c536c84449516bf11c9e83cf56e9fe5368..49dcc4d7da98b2d3e0f86ae1117792a029806fba 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -965,7 +965,7 @@ export default {
pic: require("@/assets/imgs/home_tool_ic_znht.png"),
bg: "#e5f4fe",
color: "#38aef9",
- url: "https://apaasgis.wodcloud.com/portal/geoplat/viewer/mapViewer.html",
+ url: "https://apaasgis.wodcloud.com/portal/nologoplat/viewer/mapViewer.html",
target: 1
},
{