From d459550a6847fe8f186135baee8b3c4c09f1df5d Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Tue, 21 Jul 2020 15:32:09 +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

---
 .../directed-push/directed-push-list.vue      | 37 +++++++++----------
 src/pages/workbench/workPlace.vue             |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

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 113bdb3..be7ecfb 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"
     >
-      <div class="detail_dialog" slot="content">
+      <div class="detail_dialog" slot="content" v-if="templateDetail">
         <div class="detail_item">
           <p class="item_title">
             消息模板名称：
           </p>
           <p class="item_content">
-            服务定向推送的消息
+            {{ templateDetail.tpl_name }}
           </p>
         </div>
         <div class="detail_item">
@@ -87,7 +87,7 @@
             模板类型：
           </p>
           <p class="item_content">
-            服务推送
+            {{ templateDetail.tpl_type }}
           </p>
         </div>
         <div class="detail_item full_line">
@@ -97,9 +97,7 @@
           <div class="full_content">
             <div class="apass_scroll">
               <p class="item_content">
-                亲爱的用户，根据您最近的服务调用情况，我们向您推荐
-                地图视频融合服务,贵州应急资源地图微服务，欢迎使用！
-                产品说这里最多可以输入500字。
+                {{ templateDetail.contents }}
               </p>
             </div>
           </div>
@@ -111,7 +109,7 @@
           <div class="full_content">
             <div class="apass_scroll">
               <p class="item_content">
-                贵阳市公安局,贵阳市水利局,内马尔,勒布朗詹姆斯
+                {{ templateDetail.receive_user }}
               </p>
             </div>
           </div>
@@ -121,7 +119,7 @@
             推送时间：
           </p>
           <p class="item_content">
-            2020-04-30 12:34:56
+            {{ templateDetail.push_time }}
           </p>
         </div>
         <div class="detail_item">
@@ -129,7 +127,7 @@
             推送状态：
           </p>
           <p class="item_content">
-            推送成功
+            {{ templateDetail.state }}
           </p>
         </div>
         <div class="detail_item">
@@ -137,7 +135,7 @@
             推送流水号：
           </p>
           <p class="item_content">
-            propelling2020001
+            {{ templateDetail.id }}
           </p>
         </div>
       </div>
@@ -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 3448d1c..49dcc4d 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
         },
         {
-- 
2.26.0