diff --git a/src/pages/index.vue b/src/pages/index.vue index e3bedc7383607e877127a07d69a535840a834efb..78be45440281119443cee55df040664cd21dad20 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -15,6 +15,7 @@ export default { '/app_build', '/intelligent_drawing', '/intelligent_details', + '/intelligent_appbuilder', '/search_engine' ] }), diff --git a/src/pages/workbench/intelligent_appbuilder.vue b/src/pages/workbench/intelligent_appbuilder.vue new file mode 100644 index 0000000000000000000000000000000000000000..dc1739b967a697f070dedcc5b44399037c883dc2 --- /dev/null +++ b/src/pages/workbench/intelligent_appbuilder.vue @@ -0,0 +1,85 @@ + + + + + + + diff --git a/src/pages/workbench/intelligent_details.vue b/src/pages/workbench/intelligent_details.vue index eea696b3c017280f17cb701c3eae4e1a8c77e71d..4291444c076d9a5ef38d6976d4e5fc9dc1d1e6ba 100644 --- a/src/pages/workbench/intelligent_details.vue +++ b/src/pages/workbench/intelligent_details.vue @@ -4,7 +4,7 @@ 在线组件工具 智能制图 - 资源详情 + @@ -25,7 +25,7 @@ export default { itemUrl:function(){ let _self = this; if(_self.$route.name == 'intelligent_details'){ - return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=dataGallery` + return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=${_self.$route.query.type}` } } }, @@ -50,7 +50,10 @@ export default { height: calc(100vh - 150px - 43px); border-radius: 12px; background-color: #fff; - padding: 20px; + padding: 0px; +} +.intelligent_details-container .main-container iframe { + border-radius: 12px; } diff --git a/src/pages/workbench/intelligent_drawing.vue b/src/pages/workbench/intelligent_drawing.vue index 1fe75a967ca0ea2ef5fa10c67440b77cb7db0ebe..f2fde7e2d85c5bae3d10ccfa8fd4c884c43e2012 100644 --- a/src/pages/workbench/intelligent_drawing.vue +++ b/src/pages/workbench/intelligent_drawing.vue @@ -24,9 +24,6 @@ export default { getZnztParams() { return this.$store.state.znztParams; }, - getAppBuilderParams() { - return this.$store.state.appBuilderParams; - }, znztUrl(){ return this.url+this.urlParams }, @@ -43,9 +40,6 @@ export default { this.urlParams = `?webmap=${newVal.id}` console.log('智能制图参数'+newVal) }, - getAppBuilderParams(newVal) { - console.log('智能制图应用程序参数'+newVal) - }, }, mounted() { window.addEventListener('message',event =>{ @@ -56,11 +50,31 @@ export default { this.$store.commit("setZnztParams", data.params); this.$router.push(`/fwzc/fwcs`); } - // App Builder发布服务 - if (data.cmd == 'appbuildermsg'){ + // App Builder页面 -- 新窗口打开 + if (data.cmd == 'mapviewtoapp'){ console.log(data); - this.$store.commit("setAppBuilderParams", data.params); - this.$router.push(`/fwzc/fwcs`); + let params = { + title: data.params.title, + tags: data.params.tags, + sharewithwebmap:data.params.shareWithWebMap, + webmap:data.params.id, + summary: data.params.summary, + }; + let routeData = this.$router.resolve({ + name: "intelligent_appbuilder", + query: params, + }); + window.open(routeData.href, '_blank'); + // this.$store.commit("setAppBuilderParams", data.params); + } + // 智能制图服务详情--新窗口打开 + if (data.cmd == 'mapdetailmsg'){ + console.log(data); + let routeData = this.$router.resolve({ + name: "intelligent_details", + query: data.params, + }); + window.open(routeData.href, '_blank'); } }) }, diff --git a/src/router/index.js b/src/router/index.js index 27499ae7ab5a065dc6755951b0d2252bfeba7de3..e87e24dbb35c45ca933a9babbd02bf273e78989b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -247,6 +247,11 @@ export default new Router({ name: "intelligent_details", component: () => import("@/pages/workbench/intelligent_details"), }, // 智能制图--详情页面 + { + path: "/intelligent_appbuilder", + name: "intelligent_appbuilder", + component: () => import("@/pages/workbench/intelligent_appbuilder"), + }, // 智能制图--应用程序页面 { path: "/search_engine", name: "search_act",