From cbe5c8c1cf88e7e14ddd70c34a160a47d5216eff Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Wed, 5 Aug 2020 15:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwzc_fwcs.vue | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 4bcd4d5..52c35f1 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -357,7 +357,7 @@
     <div>
       <iframe
         id="listener"
-        src="https://apaasgis.wodcloud.com/portal/apaasplat/viewer/autologin.html"
+        src="https://apaasgis.wodcloud.com/portal/apaasplat/viewer/addPortalItem.html"
         style="width: 1000px;height: 600px"
       ></iframe>
     </div>
@@ -540,7 +540,6 @@ export default {
       is_map: false,
       param_fields: [],
       body_fields: [],
-      portalUser: {},
       dataTree_apaas_config: {
         "18": "Map Service",
         "19": "Feature Service",
@@ -753,15 +752,10 @@ export default {
           this.$message.error("请完善返回参数信息中的字段名称");
         }
       } else if (this.activeBtn == 1) {
-        console.log(this.portalUser);
-        if (this.portalUser.username && this.portalUser.username != "") {
-          let value = helper.getQueryString("id", this.serviceUrl);
-          console.log(value);
-          if (value && value != "") {
-            this.getItemInfo(value);
-          } else {
-            this.addPortalItem();
-          }
+        let value = helper.getQueryString("id", this.serviceUrl);
+        console.log(value);
+        if (value && value != "") {
+          this.getItemInfo(value);
         }
         this.request_fields = [];
         this.response_fields = [];
@@ -820,6 +814,11 @@ export default {
             let contentType = "";
             if (this.activeBtn == 0) {
               contentType = this.sjfwQqt;
+            } else if (this.activeBtn == 1) {
+              let value = helper.getQueryString("id", this.serviceUrl);
+              if (value == "") {
+                this.addPortalItem();
+              }
             } else if (this.activeBtn == 4) {
               if (this.activeZh == 1) {
                 contentType = this.zhfwQqt;
@@ -946,7 +945,6 @@ export default {
             title: self.form.name,
             url: self.serviceUrl,
             type: self.dataTree_apaas_config["19"],
-            token: self.portalUser.token,
           },
         },
         "*"
@@ -967,10 +965,7 @@ export default {
     let self = this;
     window.addEventListener("message", function (event) {
       if (event.origin == "https://apaasgis.wodcloud.com" && event.data) {
-        if (event.data.cmd == "getPortalUser") {
-          self.portalUser = event.data.params;
-          console.log(self.portalUser);
-        } else if (event.data.cmd == "getPortalItemInfo") {
+        if (event.data.cmd == "getPortalItemInfo") {
           console.log(event.data.params);
         } else if (event.data.cmd == "getPortalItemInfoError") {
           console.log(event.data.params);
-- 
2.26.0