From bf50089f408dddfe55430af6a8dfb59cedc6fa37 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 6 Aug 2020 18:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E7=A9=BA=E6=9C=8D=E5=8A=A1=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-header.vue                    | 3 +--
 src/components/service-info/map-view.vue             | 2 +-
 src/components/service-info/service-info.vue         | 3 +--
 src/pages/service_shop/skfwDetail.vue                | 1 +
 src/pages/workbench/fwgl/apply_service_detail.vue    | 2 +-
 src/pages/workbench/fwgl/approval_service_detail.vue | 2 +-
 src/pages/workbench/fwgl/serviceDetail.vue           | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/service-header.vue b/src/components/service-header.vue
index 0e5f7b6..3d83af8 100644
--- a/src/components/service-header.vue
+++ b/src/components/service-header.vue
@@ -2,8 +2,7 @@
   <div class="info_logo">
     <div class="logo">
       <img :src="data.url" alt="" />
-      <!--  TODO: 时空服务预览 -->
-      <map-view v-if="data.isMap" :id="data.id"></map-view>
+      <map-view v-if="data.isMap" :id="data.portal_id"></map-view>
     </div>
     <div class="info">
       <p class="info_title">
diff --git a/src/components/service-info/map-view.vue b/src/components/service-info/map-view.vue
index f247174..6fa714e 100644
--- a/src/components/service-info/map-view.vue
+++ b/src/components/service-info/map-view.vue
@@ -35,7 +35,7 @@ export default {
   },
   methods: {
     viewAction() {
-      this.src = `https://apaasgis.wodcloud.com/portal/apaasplat/viewer/previewMap.html?id=`; // ${this.id}
+      this.src = `https://apaasgis.wodcloud.com/portal/apaasplat/viewer/previewMap.html?id=${this.id}`;
       this.showDialog = true;
     },
     beforeClose(done) {
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index adeb3bd..200f818 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -19,10 +19,9 @@
     <div class="main_container">
       <div class="main_container-left" v-if="data.cover">
         <img :src="data.cover" width="100%" />
-        <!--  TODO: 时空服务预览 -->
         <map-view
           v-if="data.type === 'Map Service'"
-          :id="data.service_id" 
+          :id="data.portal_id" 
         ></map-view>
       </div>
       <div class="main_container-right">
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index aec5496..a248535 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -74,6 +74,7 @@ export default {
             [];
 
           this.baseInfo = {
+            portal_id: this.portal_id || "", // 时空服务id
             service_id: this.id,
             app_id: 0,
             name: datas.name,
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index cc19183..bf9dfb2 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -342,7 +342,7 @@ export default {
                     return
                 }
                 let data = response.data.data;
-                this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览
+                this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id
                 this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6);
                 this.$set(this.service_header_arr, "name", data.name);
                 this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index 4b7849c..8e60784 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -342,7 +342,7 @@ export default {
               return
             }
             let data = response.data.data;
-            this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览
+            this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id
             this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6);
             this.$set(this.service_header_arr, "name", data.name);
             this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index f00e32b..1d03dd6 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -516,7 +516,7 @@ export default {
         .then(response => {
           if (response.data.success === 1) {
             let data = response.data.data;
-            this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览
+            this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id
             this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6);
             this.$set(this.service_header_arr, "name", data.name);
             this.$set(
-- 
2.26.0