diff --git a/src/components/menu.vue b/src/components/menu.vue index 85536b56adb51596739e366ab460350c7bddf02e..83875ca77997b48705624d965bb3fc9b8a200c23 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 1c942b4869d54a2707efe46d822de3ed97e79d8f..dd6f3eee320228bcb5870e8d6de4f3c2105fb9a9 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 648e059b37b23ddce329b48c7f8eeaa64c75a8ad..c639921ba22829fa622229480d6b01b8a2299c46 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)}`); },