From cd30d313b9fcacd0cdc8709f82f04582a27f7f0f Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Thu, 6 Aug 2020 11:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=99=BA=E8=83=BD=E5=88=B6?=
 =?UTF-8?q?=E5=9B=BE=E8=8E=B7=E5=8F=96=E5=8F=82=E6=95=B0+portal=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu.vue           |  2 +-
 src/pages/workbench/fwzc_fwcs.vue | 18 +++++++++++++++---
 src/request/api/general.js        |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/menu.vue b/src/components/menu.vue
index 85536b5..83875ca 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -146,7 +146,7 @@ export default {
     },
     gotopage(n) {
       if (n == "logout") {
-        window.location.href = "/iam/api/logout";
+        window.location.href = "https://apaasgis.wodcloud.com/portal/sharing/rest/oauth2/signout?client_id=arcgisonline&redirect_uri=https://apaas3.wodcloud.com/iam/api/logout";
       } else if (n == "login") {
         let path = this.$route.path;
         window.location.href = "/iam/login/#/login?ReturnUrl=" + path;
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 1c942b4..dd6f3ee 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -908,9 +908,21 @@ export default {
       });
     },
     judgeMap() {
-      if (this.$route.query.map && this.$route.query.map != 0) {
-        this.is_map = true;
-        this.jcxxtx = true;
+      let self = this;
+      if (self.$route.query.map && self.$route.query.map != 0) {
+        self.is_map = true;
+        self.jcxxtx = true;
+        if (self.$store.state.znztParams) {
+          let data = this.$store.state.znztParams;
+          console.log(data);
+          self.form.name = data.name;
+          self.form.desc = data.descript;
+          self.form.area = Number(data.sectors);
+          self.serviceUrl = data.url;
+          self.skfwQqt = Number(data.data_service_type2);
+          self.cover[0] = data.cover;
+          self.is_portal = true;
+        }
       }
     },
     goto(path) {
diff --git a/src/request/api/general.js b/src/request/api/general.js
index 648e059..c639921 100644
--- a/src/request/api/general.js
+++ b/src/request/api/general.js
@@ -3,6 +3,7 @@ import qs from 'qs'; // 根据需求是否导入qs模块
 
 const general = {
     // general api
+    // logout is not used
     logout(params) {
         return axios.get(`/iam/api/logout?ReturnUrl=${encodeURIComponent(params.returnUrl)}`);
     },
-- 
2.26.0