Skip to content

A
apaas-ui
Commit 7ad2fdcd authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

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

parents 912751fa b15204c6
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 24 deletions
src/components/super-flow.vue
View file @ 7ad2fdcd
......@@ -105,8 +105,8 @@
<div class="node-container">
<span
class="node-item"
v-for="item in nodeItemList"
:key="item"
v-for="(item, index) in nodeItemList"
:key="index"
@mousedown="evt => nodeItemMouseDown(evt, item.value)">
{{item.label}}
</span>
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 7ad2fdcd
<template>
<div class="fwcs">
<el-breadcrumb v-if="is_map" separator="/" class="bread_crumb">
<el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">在线组件工具</el-breadcrumb-item>
<el-breadcrumb v-if="is_map != 0" separator="/" class="bread_crumb">
<el-breadcrumb-item :to="{ path: '/workplace' }">在线组件工具</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">智能制图</el-breadcrumb-item>
<el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
</el-breadcrumb>
......@@ -342,9 +342,9 @@
<el-radio :label="3">敏感</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="is_map" class="btn_footer">
<el-button class="previous" @click="goto('/intelligent_drawing')">返回智能制图</el-button>
<el-button class="registe" @click="registe">服务发布</el-button>
<el-form-item v-if="is_map != 0" class="btn_footer">
<el-button class="previous" @click="goBack">{{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}</el-button>
<el-button class="registe" @click="registeMap">服务发布</el-button>
</el-form-item>
<el-form-item v-else class="btn_footer">
<el-button class="previous" @click="previous">上一步</el-button>
......@@ -544,7 +544,7 @@ export default {
noSearchUrl: "",
requestRules: 0,
responseRules: 0,
is_map: false,
is_map: 0,
param_fields: [],
body_fields: [],
dialogInfo: {
......@@ -553,6 +553,7 @@ export default {
submit: "",
},
is_portal: false,
portal_id: "",
};
},
computed: {},
......@@ -791,6 +792,67 @@ export default {
}
});
},
registeMap() {
this.$refs.form.validate((valid) => {
if (valid) {
if (this.cover.length != 0) {
let query = {};
if (this.is_map == 1) {
query = {
name: this.form.name,
sectors: this.form.area,
organization: this.form.origin,
cover: this.cover[0],
openness: this.form.resource,
descript: this.form.desc,
data_service_type1: 6,
data_service_type2: this.skfwQqt,
encode_method: this.form.code,
method: "GET",
url: this.serviceUrl,
request_fields: [],
request_query_fields: [],
response_fields: [],
content_type: "json",
portal_id: this.portal_id,
};
} else if (this.is_map == 4) {
query = {
name: this.form.name,
sectors: this.form.area,
organization: this.form.origin,
cover: this.cover[0],
openness: this.form.resource,
descript: this.form.desc,
data_service_type1: 21,
data_service_type2: 34,
encode_method: this.form.code,
method: "GET",
url: this.serviceUrl,
request_fields: [],
request_query_fields: [],
response_fields: [],
content_type: "json",
portal_id: this.portal_id,
};
}
this.$api.workbench.serviceAdd(query).then((response) => {
if (response.data.success == 1) {
this.$message.success("服务注册成功");
this.$router.push("/fwgl/" + this.$store.getters.level);
} else {
console.log(response.data.errMsg);
this.$message.error(response.data.errMsg);
}
});
} else {
this.$message.error("请上传服务封面");
}
} else {
this.$message.error("请完善服务基本信息");
}
});
},
registe() {
this.$refs.form.validate((valid) => {
if (valid) {
......@@ -831,6 +893,7 @@ export default {
this.param_fields.length == 0 ? [] : this.request_fields,
response_fields: this.response_fields,
content_type: contentType,
portal_id: this.portal_id,
};
this.$api.workbench.serviceAdd(query).then((response) => {
if (response.data.success == 1) {
......@@ -910,7 +973,7 @@ export default {
judgeMap() {
let self = this;
if (self.$route.query.map && self.$route.query.map != 0) {
self.is_map = true;
self.is_map = self.$route.query.map;
self.jcxxtx = true;
if (self.$store.state.znztParams) {
let data = this.$store.state.znztParams;
......@@ -921,12 +984,27 @@ export default {
self.serviceUrl = data.url;
self.skfwQqt = Number(data.data_service_type2);
self.cover[0] = data.cover;
self.portal_id = data.portalid;
self.is_portal = true;
} else if (self.$store.state.appBuilderParams) {
let data = this.$store.state.appBuilderParams;
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.portal_id = data.portalid;
self.is_portal = true;
}
this.getOrganization();
} else {
self.is_map = 0;
}
},
goto(path) {
this.$router.push(path);
goBack() {
this.$router.go(-1);
},
addPortalItem() {
console.log("添加portal");
......@@ -967,9 +1045,14 @@ export default {
self.form.name = data.name;
self.form.desc = data.descript;
self.form.area = Number(data.sectors);
self.portal_id = data.portalid;
self.cover[0] = data.cover;
if (
self.serviceUrl != data.url ||
self.skfwQqt != Number(data.data_service_type2)
) {
self.serviceUrl = data.url;
self.skfwQqt = Number(data.data_service_type2);
self.cover[0] = data.cover;
self.dialogInfo.msg = `您的时空服务地址已更新为${
self.serviceUrl
}，服务类型更新为${
......@@ -981,12 +1064,14 @@ export default {
self.$refs.alertChange.hide();
};
self.$refs.alertChange.show();
}
self.is_portal = true;
} else if (event.data.cmd == "getPortalItemInfoError") {
console.log(event.data.params);
self.is_portal = false;
} else if (event.data.cmd == "addPortalItem") {
console.log(event.data.params);
self.portal_id = event.data.params;
self.is_portal = true;
self.registe();
} else if (event.data.cmd == "addPortalItemError") {
......
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