Skip to content

A
apaas-ui
Commit b88462f0 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

parents 50b8db7e 935eeef4
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 19 deletions
config/index.js
View file @ b88462f0
...@@ -8,7 +8,7 @@ module.exports = { ...@@ -8,7 +8,7 @@ module.exports = {
dev: { dev: {
// Paths // Paths
assetsSubDirectory: "static", assetsSubDirectory: "static",
assetsPublicPath: "/", assetsPublicPath: "/apaas/ui/",
proxyTable: { proxyTable: {
"/apaas": { "/apaas": {
target: "https://apaas3.wodcloud.com/apaas/", target: "https://apaas3.wodcloud.com/apaas/",
......
index.html
View file @ b88462f0
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
} }
</style> </style>
</head> </head>
<script src="/apaas/ui/static/config/configmap.js"></script>
<body> <body>
<div id="app"></div> <div id="app"></div>
</body> </body>
......
src/components/menu.vue
View file @ b88462f0
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
</template> </template>
<script> <script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
export default { export default {
data() { data() {
return { return {
...@@ -146,7 +147,7 @@ export default { ...@@ -146,7 +147,7 @@ export default {
}, },
gotopage(n) { gotopage(n) {
if (n == "logout") { if (n == "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"; window.location.href = gisServiceUrl + "/portal/sharing/rest/oauth2/signout?client_id=arcgisonline&redirect_uri=https://apaas3.wodcloud.com/iam/api/logout";
} else if (n == "login") { } else if (n == "login") {
let path = this.$route.path; let path = this.$route.path;
window.location.href = "/iam/login/#/login?ReturnUrl=" + path; window.location.href = "/iam/login/#/login?ReturnUrl=" + path;
......
src/components/service-header.vue
View file @ b88462f0
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<div class="info_logo"> <div class="info_logo">
<div class="logo"> <div class="logo">
<img :src="data.url" alt="" /> <img :src="data.url" alt="" />
<!-- TODO: 时空服务预览 --> <map-view v-if="data.isMap" :id="data.portal_id"></map-view>
<map-view v-if="data.isMap" :id="data.id"></map-view>
</div> </div>
<div class="info"> <div class="info">
<p class="info_title"> <p class="info_title">
......
src/components/service-info/map-view.vue
View file @ b88462f0
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
</template> </template>
<script> <script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
export default { export default {
name: "map-view", name: "map-view",
data: () => ({ data: () => ({
...@@ -35,7 +36,7 @@ export default { ...@@ -35,7 +36,7 @@ export default {
}, },
methods: { methods: {
viewAction() { viewAction() {
this.src = `https://apaasgis.wodcloud.com/portal/apaasplat/viewer/previewMap.html?id=`; // ${this.id} this.src = gisServiceUrl + `/portal/apaasplat/viewer/previewMap.html?id=${this.id}`;
this.showDialog = true; this.showDialog = true;
}, },
beforeClose(done) { beforeClose(done) {
......
src/components/service-info/service-info.vue
View file @ b88462f0
...@@ -19,10 +19,9 @@ ...@@ -19,10 +19,9 @@
<div class="main_container"> <div class="main_container">
<div class="main_container-left" v-if="data.cover"> <div class="main_container-left" v-if="data.cover">
<img :src="data.cover" width="100%" /> <img :src="data.cover" width="100%" />
<!-- TODO: 时空服务预览 -->
<map-view <map-view
v-if="data.type === 'Map Service'" v-if="data.type === 'Map Service'"
:id="data.service_id" :id="data.portal_id"
></map-view> ></map-view>
</div> </div>
<div class="main_container-right"> <div class="main_container-right">
......
src/pages/service_shop/skfwDetail.vue
View file @ b88462f0
...@@ -74,6 +74,7 @@ export default { ...@@ -74,6 +74,7 @@ export default {
[]; [];
this.baseInfo = { this.baseInfo = {
portal_id: datas.portal_id || "", // 时空服务id
service_id: this.id, service_id: this.id,
app_id: 0, app_id: 0,
name: datas.name, name: datas.name,
......
src/pages/workbench/intelligent_appbuilder.vue → src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue
View file @ b88462f0
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
</template> </template>
<script> <script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
export default { export default {
data() { data() {
return { return {
originUrl:'https://apaasgis.wodcloud.com/portal/apps/webappbuilder/index.html' originUrl: gisServiceUrl + '/portal/apps/webappbuilder/index.html'
}; };
}, },
computed:{ computed:{
......
src/pages/workbench/intelligent_details.vue → src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue
View file @ b88462f0
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
</template> </template>
<script> <script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
export default { export default {
data() { data() {
return { return {
originUrl:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/item.html', originUrl: gisServiceUrl + '/portal/apaasplat/viewer/item.html',
}; };
}, },
computed:{ computed:{
......
src/pages/workbench/intelligent_drawing.vue → src/pages/workbench/component-center/intelligent-drawing/intelligent_drawing.vue
View file @ b88462f0
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
<script> <script>
import { mapState } from "vuex"; import { mapState } from "vuex";
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
export default { export default {
data() { data() {
return { return {
url:'https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html', url: gisServiceUrl + '/portal/apaasplat/viewer/mapViewer.html',
queryType: '', queryType: '',
id: '', id: '',
}; };
......
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ b88462f0
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
return return
} }
let data = response.data.data; 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, "isMap", data.data_service_type1 === 6);
this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr, "name", data.name);
this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name); this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ b88462f0
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
return return
} }
let data = response.data.data; 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, "isMap", data.data_service_type1 === 6);
this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr, "name", data.name);
this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name); this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ b88462f0
...@@ -516,7 +516,7 @@ export default { ...@@ -516,7 +516,7 @@ export default {
.then(response => { .then(response => {
if (response.data.success === 1) { if (response.data.success === 1) {
let data = response.data.data; 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, "isMap", data.data_service_type1 === 6);
this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr, "name", data.name);
this.$set( this.$set(
......
src/pages/workbench/fwzc_fwcs.vue
View file @ b88462f0
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
<div style="display: none"> <div style="display: none">
<iframe <iframe
id="listener" id="listener"
src="https://apaasgis.wodcloud.com/portal/apaasplat/viewer/addPortalItem.html" :src="addPortalItemUrl"
></iframe> ></iframe>
</div> </div>
<apass-dialog <apass-dialog
...@@ -371,6 +371,7 @@ ...@@ -371,6 +371,7 @@
</template> </template>
<script> <script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
import BlockRadius from "@/components/general/block-radius"; import BlockRadius from "@/components/general/block-radius";
import CesTable from "@/components/table/table-um"; import CesTable from "@/components/table/table-um";
import Codes from "@/components/general/codes"; import Codes from "@/components/general/codes";
...@@ -387,6 +388,7 @@ export default { ...@@ -387,6 +388,7 @@ export default {
}, },
data() { data() {
return { return {
addPortalItemUrl: gisServiceUrl + '/portal/apaasplat/viewer/addPortalItem.html',
btnList: [], btnList: [],
activeBtn: null, activeBtn: null,
serviceUrl: "", serviceUrl: "",
...@@ -1040,7 +1042,7 @@ export default { ...@@ -1040,7 +1042,7 @@ export default {
listeners(event) { listeners(event) {
console.log(event); console.log(event);
let self = this; let self = this;
if (event && event.origin == "https://apaasgis.wodcloud.com" && event.data) { if (event && event.origin == gisServiceUrl && event.data) {
if (event.data.cmd == "getPortalItemInfo") { if (event.data.cmd == "getPortalItemInfo") {
console.log(event.data.params); console.log(event.data.params);
let data = event.data.params; let data = event.data.params;
......
src/router/index.js
View file @ b88462f0
...@@ -235,23 +235,33 @@ export default new Router({ ...@@ -235,23 +235,33 @@ export default new Router({
{ {
path: "/app_build", path: "/app_build",
name: "app_build", name: "app_build",
component: () => import("@/pages/workbench/app_build"), component: () => import("@/pages/workbench/component-center/app-build/app_build"),
}, // 应用构建（镜像形式） }, // 应用构建（镜像形式）
{ {
path: "/intelligent_drawing", path: "/intelligent_drawing",
name: "intelligent_drawing", name: "intelligent_drawing",
component: () => import("@/pages/workbench/intelligent_drawing"), component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_drawing"),
}, // 智能制图 }, // 智能制图
{ {
path: "/intelligent_details", path: "/intelligent_details",
name: "intelligent_details", name: "intelligent_details",
component: () => import("@/pages/workbench/intelligent_details"), component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_details"),
}, // 智能制图--详情页面 }, // 智能制图--详情页面
{ {
path: "/intelligent_appbuilder", path: "/intelligent_appbuilder",
name: "intelligent_appbuilder", name: "intelligent_appbuilder",
component: () => import("@/pages/workbench/intelligent_appbuilder"), component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder"),
}, // 智能制图--应用程序页面 }, // 智能制图--应用程序页面
{
path: "/process_designer",
name: "process_designer",
component: () => import("@/pages/workbench/component-center/process-designer/process-designer-list"),
}, // 流程设计--列表
{
path: "/process_designer_detail",
name: "process_designer_detail",
component: () => import("@/pages/workbench/component-center/process-designer/process-designer-detail"),
}, // 流程设计--详情
{ {
path: "/search_engine", path: "/search_engine",
name: "search_act", name: "search_act",
......
static/config/configmap.js 0 → 100644
View file @ b88462f0
window.serviceConfig = {
gisServiceRoot: 'https://apaasgis.wodcloud.com'
};
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment