Skip to content

A
apaas-ui
Commit 75b117a3 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

订单云再次申请路径，origin，插件，服务测试oid

parent 4f4557f7
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 46 deletions
src/components/order-list/order-list-cell.vue
View file @ 75b117a3
......@@ -271,7 +271,7 @@ export default {
} else if (this.cellItem.order_type == 2) {
query = {
app_id: parseFloat(this.cellItem.app_id),
spec_id: this.cellItem.spec_app,
spec_id: this.cellItem.spec_app++,
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit,
};
......@@ -281,7 +281,7 @@ export default {
});
} else if (this.cellItem.order_type == 3) {
this.$router.push({
path: "/shop/shop_cloud",
path: "/shop/cloud",
});
}
},
......
src/components/work-flow/super-flow.vue
View file @ 75b117a3
......@@ -4,11 +4,11 @@
<div class="scale_block">
<div class="scale_control">
<div class="less">
<i class="el-icon-minus"></i>
<i class="el-icon-minus" @click="changeScale('down')"></i>
</div>
<div class="num">{{ scale_num }}%</div>
<div class="add">
<i class="el-icon-plus"></i>
<i class="el-icon-plus" @click="changeScale('up')"></i>
</div>
</div>
<div class="node-container">
......@@ -400,6 +400,10 @@ export default {
type: Array,
default: () => [],
},
origin: {
type: Array,
default: () => [0, 0],
},
},
watch: {
node_list: {
......@@ -412,7 +416,6 @@ export default {
data() {
return {
scale_num: 100,
origin: [0, 0],
nodeList: [],
linkList: [],
drawerType,
......@@ -619,7 +622,6 @@ export default {
};
},
mounted() {
this.setOrigin();
this.setVal();
this.getProcessServiceList();
document.addEventListener("mousemove", this.docMousemove);
......@@ -630,10 +632,6 @@ export default {
});
},
methods: {
setOrigin() {
let width = this.$refs.flowContainer.clientWidth;
this.origin = [width / 2, 0];
},
linkStyle(link) {
return {};
},
......@@ -680,6 +678,7 @@ export default {
clientX - conf.offsetLeft,
clientY - conf.offsetTop
);
console.log(clientX, conf.offsetLeft, coordinate);
// 添加节点
let query = { width: 120, height: 48, meta: {} };
query.meta.type = conf.info.meta.type;
......@@ -807,9 +806,14 @@ export default {
return item.id == self.nodeItem.id;
});
if (meta) {
let index = meta.plugins.findIndex((item) => {
return item.plugin_type === 1;
});
let index = -1;
if (meta.plugins && meta.plugins.length != 0) {
index = meta.plugins.findIndex((item) => {
return item.plugin_type === 1;
});
} else {
meta.plugins = [];
}
if (index !== -1) {
let data = meta.plugins[index];
let arr0 = JSON.parse(data.body_fields);
......@@ -991,6 +995,14 @@ export default {
this.response_fields = [];
this.select = 1;
},
refleshTimeout() {
this.max_time_0 = undefined;
this.max_time_1 = undefined;
this.max_time_type_0 = 1;
this.max_time_type_1 = 1;
this.max_time_check_0 = false;
this.max_time_check_1 = false;
},
interfaceCancel() {
this.refleshItem();
this.dialog_interface = false;
......@@ -1080,8 +1092,30 @@ export default {
}
},
showProcessService() {
if (this.checkNodeCouldEdit()) {
this.dialog_process = true;
let self = this;
if (self.checkNodeCouldEdit()) {
let meta = self.nodeParamsList.find((item) => {
return item.id == self.nodeItem.id;
});
if (meta) {
let index = -1;
if (meta.plugins && meta.plugins.length != 0) {
index = meta.plugins.findIndex((item) => {
return item.plugin_type === 2;
});
} else {
meta.plugins = [];
}
if (index !== -1) {
let data = meta.plugins[index];
self.service = data.ref_workflows_id;
} else {
self.refleshTimeout();
}
} else {
self.refleshTimeout();
}
self.dialog_process = true;
}
},
processCancel() {
......@@ -1104,8 +1138,35 @@ export default {
}
},
showTimeoutManagement() {
if (this.checkNodeCouldEdit()) {
this.dialog_timeout = true;
let self = this;
if (self.checkNodeCouldEdit()) {
let meta = self.nodeParamsList.find((item) => {
return item.id == self.nodeItem.id;
});
if (meta) {
let index = -1;
if (meta.plugins && meta.plugins.length != 0) {
index = meta.plugins.findIndex((item) => {
return item.plugin_type === 3;
});
} else {
meta.plugins = [];
}
if (index !== -1) {
let data = meta.plugins[index];
self.max_time_check_0 = data.timeout_notify;
self.max_time_check_1 = data.timeout_stop;
self.max_time_0 = data.notice_max_time;
self.max_time_type_0 = data.notice_time_unit;
self.max_time_1 = data.stop_max_time;
self.max_time_type_1 = data.stop_time_unit;
} else {
self.refleshTimeout();
}
} else {
self.refleshTimeout();
}
self.dialog_timeout = true;
}
},
timeoutCancel() {
......@@ -1187,6 +1248,9 @@ export default {
};
console.log(this.nodeList, this.linkList, this.nodeParamsList);
},
changeScale(type) {
}
},
};
</script>
......@@ -1729,6 +1793,18 @@ export default {
margin-left: 20px;
line-height: 40px;
font-size: 16px;
color: #242c43;
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #242c43;
}
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #626de9;
border-color: #515fe7;
}
.el-checkbox__input.is-focus .el-checkbox__inner {
border-color: #515fe7;
}
}
}
}
......
src/pages/user/order/order_detail.vue
View file @ 75b117a3
......@@ -479,19 +479,28 @@ export default {
duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit,
};
window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
this.$router.push({
path: "/shop/shop_car_apply",
query: query,
});
} else if (this.orderDetail.order_type == 2) {
query = {
app_id: parseFloat(this.orderDetail.app_id),
spec_id: this.orderDetail.spec_app,
spec_id: this.orderDetail.spec_app++,
duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit,
};
window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
this.$router.push({
path: "/shop/shop_car_apply",
query: query,
});
} else if (this.orderDetail.order_type == 3) {
this.$router.push({
path: "/shop/cloud",
});
}
window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
this.$router.push({
path: "/shop/shop_car_apply",
query: query,
});
},
cancelDetail() {
this.$api.user
......
src/pages/workbench/component-center/process-management/process-design/edit.vue
View file @ 75b117a3
......@@ -14,7 +14,7 @@
:active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
class="apaas_step"
>
<div class="step_in">
<div class="step_in" ref="stepInProcess">
<el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left">
<el-form-item prop="name">
<p class="formname">流程名称：</p>
......@@ -57,12 +57,13 @@
:active-icon="require('@/assets/imgs/progress_ic_liucheng.png')"
class="apaas_step"
>
<div class="step_in" v-if="step == 1">
<div class="step_in">
<WorkFlow
ref="workFlow"
:node_list="node_list"
:link_list="link_list"
:node_params_list="node_params_list"
:origin="origin"
class="work_flow"
/>
<div class="btn_footer">
......@@ -134,7 +135,7 @@ export default {
rules: {
name: [
{ required: true, message: "请输入流程名称", trigger: "blur" },
{ max: 16, message: "不能超过16个字符", trigger: "blur" },
{ max: 100, message: "不能超过100个字符", trigger: "blur" },
],
workplace: [
{ required: true, message: "请选择工作区域", trigger: "blur" },
......@@ -145,13 +146,17 @@ export default {
],
},
workplace_list: [],
origin: [],
params: {
workflows_id: "",
sector: 0,
},
};
},
methods: {
verification() {
let self = this;
let data = { ...self.$refs.workFlow.getData() };
console.log(JSON.stringify(data));
let start_num = 0;
let end_num = 0;
let start_id = "";
......@@ -161,12 +166,14 @@ export default {
let in_edge = 0;
let out_edge = 0;
let datas = { ...data.obj };
console.log(data);
datas.nodeList.forEach((item) => {
let da = data.params.find((nodep) => {
return nodep.id == item.meta.id;
});
item.meta = da;
item.node_code = da.node_code;
item.coordinate[0] = parseInt(item.coordinate[0]);
item.coordinate[1] = parseInt(item.coordinate[1]);
if (item.meta.type == 1) {
start_num++;
start_id = item.id;
......@@ -228,7 +235,7 @@ export default {
}
},
backToList() {
this.$router.push("/message/directed_push");
this.$router.push("/progress/designer");
},
changeWorkPlace() {},
cancel() {
......@@ -250,6 +257,8 @@ export default {
let res = self.verification();
if (res) {
let query = {
workflows_id: self.params.workflows_id,
sector: self.params.sector,
name: self.basic_form.name,
workarea: self.basic_form.workplace,
describe: self.basic_form.desc,
......@@ -283,7 +292,8 @@ export default {
this.node_list = data.nodeList;
this.link_list = data.linkList;
this.node_params_list = [];
this.workflows_id = data.workflows_id;
this.params.workflows_id = data.workflows_id;
this.params.sector = data.sector;
this.node_list.forEach((item) => {
item.meta.id =
parseInt(Math.random() * 1000 * 1000) +
......@@ -295,10 +305,16 @@ export default {
}
});
},
setOrigin() {
let width = this.$refs.stepInProcess.clientWidth;
let href_width = width / 2 - 20;
this.origin = [href_width, 0];
},
},
mounted() {
this.getNameSpaceList();
this.getProcessDetail();
this.setOrigin();
},
};
</script>
......@@ -337,6 +353,47 @@ export default {
.work_flow {
height: calc(100% - 70px);
}
.steps_container {
flex-grow: 1;
}
.steps_done {
position: relative;
height: 100%;
}
.steps_done_info {
position: absolute;
top: calc(50% - 40px);
left: 50%;
transform: translate(-50%, -50%);
}
.steps_done_info > * {
display: inline-block;
vertical-align: middle;
}
.steps_done_info > .left_container {
width: 70px;
font-size: 0;
margin-right: 10px;
}
.steps_done_info > .right_container > p:nth-child(1) {
font-size: 18px;
font-weight: 700;
line-height: 24px;
color: #242c43;
}
.steps_done_info > .right_container > p:nth-child(2) {
font-size: 14px;
line-height: 20px;
color: #8890a7;
margin-top: 5px;
}
.btn_footer_1 {
position: absolute;
bottom: 0;
padding: 15px;
width: 100%;
text-align: right;
}
</style>
<style>
.block_item .el-textarea__inner {
......
src/pages/workbench/component-center/process-management/process-design/index.vue
View file @ 75b117a3
......@@ -14,7 +14,7 @@
:active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
class="apaas_step"
>
<div class="step_in">
<div class="step_in" ref="stepInProcess">
<el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left">
<el-form-item prop="name">
<p class="formname">流程名称：</p>
......@@ -58,7 +58,7 @@
class="apaas_step"
>
<div class="step_in">
<WorkFlow ref="workFlow" class="work_flow" />
<WorkFlow ref="workFlow" :origin="origin" class="work_flow" />
<div class="btn_footer">
<el-button class="cancel" @click="cancel">取消</el-button>
<div>
......@@ -124,7 +124,7 @@ export default {
rules: {
name: [
{ required: true, message: "请输入流程名称", trigger: "blur" },
{ max: 16, message: "不能超过16个字符", trigger: "blur" },
{ max: 100, message: "不能超过100个字符", trigger: "blur" },
],
workplace: [
{ required: true, message: "请选择工作区域", trigger: "change" },
......@@ -135,6 +135,7 @@ export default {
],
},
workplace_list: [],
origin: [],
};
},
methods: {
......@@ -156,6 +157,8 @@ export default {
});
item.meta = da;
item.node_code = da.node_code;
item.coordinate[0] = parseInt(item.coordinate[0]);
item.coordinate[1] = parseInt(item.coordinate[1]);
if (item.meta.type == 1) {
start_num++;
start_id = item.id;
......@@ -248,7 +251,10 @@ export default {
if (response.data.success == 1) {
this.step = 2;
} else {
this.$message.error(response.data.errMsg);
this.$message({
message: response.data.errMsg,
type: "error",
});
}
});
}
......@@ -260,9 +266,16 @@ export default {
}
});
},
setOrigin() {
let width = this.$refs.stepInProcess.clientWidth;
let href_width = width / 2 - 20;
this.origin = [href_width, 0];
console.log(width, href_width, this.origin);
},
},
mounted() {
this.getNameSpaceList();
this.setOrigin();
},
};
</script>
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 75b117a3
......@@ -359,11 +359,14 @@
</el-radio-group>
</el-form-item>
<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="previous"
@click="goBack('map')"
>{{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}</el-button>
<el-button class="registe" @click="registeMap">服务发布</el-button>
</el-form-item>
<el-form-item v-else-if="process_id != ''" class="btn_footer">
<el-button class="previous" @click="goBack">返回流程管理</el-button>
<el-button class="previous" @click="goBack('process')">返回流程管理</el-button>
<el-button class="registe" @click="registeProcess">服务发布</el-button>
</el-form-item>
<el-form-item v-else class="btn_footer">
......@@ -807,6 +810,7 @@ export default {
this.$api.user.getUserDetail(query).then((request) => {
if (request.data.success == 1) {
this.form.origin = request.data.data.department;
this.oid = request.data.data.department_id;
} else {
console.log(response.data.errMsg);
}
......@@ -882,7 +886,7 @@ export default {
service_name: this.form.name, // 服务名称
describe: this.form.desc, // 服务描述
sector: this.form.area, // 服务领域id
oid: this.form.origin, // 组织id
oid: this.oid, // 组织id
encode_method: this.form.code, // 接口编码
cover: this.cover[0], // 服务封面
openness: this.form.resource, // 开放程度，1共享/2受限/3敏感
......@@ -1090,14 +1094,18 @@ export default {
self.getServiceType1();
}
},
goBack() {
goBack(type) {
let self = this;
self.$store.commit("setZnztDetailsParams", {
type: "",
queryType: "webmap",
id: self.portal_id,
});
this.$router.go(-1);
if (type == "map") {
self.$store.commit("setZnztDetailsParams", {
type: "",
queryType: "webmap",
id: self.portal_id,
});
this.$router.push("/intelligent_drawing");
} else if (type == "process") {
this.$router.push("/progress/designer");
}
},
addPortalItem() {
console.log("添加portal");
......
src/request/http.js
View file @ 75b117a3
......@@ -45,7 +45,7 @@ const errorHandle = (status, other) => {
break;
case 404: tip('请求的资源不存在'); break;
case 408: tip('请求超时(408)'); break;
case 500: tip('服务器错误(500)'); break;
case 500: tip(`服务器错误(500),${other}`); break;
case 501: tip('服务未实现(501)'); break;
case 502: tip('网络错误(502)'); break;
case 503: tip('服务不可用(503)'); break;
......@@ -80,7 +80,7 @@ instance.interceptors.response.use(
const { response } = error;
if (response) {
// 请求已发出，但是不在2xx的范围
errorHandle(response.status, response.data.errmessage);
errorHandle(response.status, response.data.errMsg);
return Promise.reject(response);
}
});
......
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