diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js index 252c32ad37b62d1aba104a0382b9dc3176631749..119319edee7c117dc1a9c93c943ed4dc74d90ccc 100644 --- a/src/assets/i18n/language-zh.js +++ b/src/assets/i18n/language-zh.js @@ -38,5 +38,8 @@ export const lang = { online_component_tool: "在线组件中心", process_design: "流程设计", process_management: "流程管理", - new: "新建" + new: "新建", + + // technical-support + technical_support: "技术支持" } \ No newline at end of file diff --git a/src/components/general/side-nav-bar-class.vue b/src/components/general/side-nav-bar-class.vue new file mode 100644 index 0000000000000000000000000000000000000000..440a6767b0ef5565094871f06bb85d3e46900226 --- /dev/null +++ b/src/components/general/side-nav-bar-class.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue index 4ce49226367d6c9e445a0b00b1775aab261d8a56..f755752145c35b87d70d39e92a2f9be5001bb08b 100644 --- a/src/components/service-list/service_list.vue +++ b/src/components/service-list/service_list.vue @@ -329,7 +329,6 @@ export default { for (let i = 0; i < val.length; i++) { this.filterLists[i + 1].name = val[i]; } - console.log(this.filterLists); }, }, }, diff --git a/src/components/work-flow/super-flow.vue b/src/components/work-flow/super-flow.vue index 9c207e3c729e7af5aa4ce1c415acf80d1e1eefe8..3ce22d03770d6095ae21ff3b4704000b3121329c 100644 --- a/src/components/work-flow/super-flow.vue +++ b/src/components/work-flow/super-flow.vue @@ -14,16 +14,37 @@

节点类型

请拖拽添加到流程中

-
+
{{item.label}}
- + @@ -52,11 +73,23 @@
+
+
+
- +

节点编号：

-

{{ nodeParams(nodeItem.id).node_code }}

+

{{ nodeParams(nodeItem.id).node_code == "暂无（保存后将自动生成节点编号）" ? "" : nodeParams(nodeItem.id).node_code }}

节点名称：

@@ -67,7 +100,14 @@

- +
@@ -76,16 +116,46 @@
服务地址：
- + - + 连接测试
- +
@@ -100,7 +170,12 @@
授权方式：
- + @@ -116,9 +191,47 @@
请求参数信息填写：
- +
返回参数信息填写：
- +
测试服务信息：
@@ -135,7 +248,14 @@
- +
@@ -149,11 +269,18 @@

取消 - 确定 + 添加
- +
@@ -165,8 +292,13 @@
最大时长
- - + +
@@ -179,12 +311,17 @@
最大时长
- - + +
- 超时提醒 + 超时终止流程
@@ -202,12 +339,34 @@ import CesTable from "@/components/table/table-um"; import Codes from "@/components/general/codes"; const drawerType = { node: 0, - link: 1 + link: 1, }; export default { components: { CesTable, - Codes + Codes, + }, + props: { + node_list: { + type: Array, + default: () => [], + }, + link_list: { + type: Array, + default: () => [], + }, + node_params_list: { + type: Array, + default: () => [], + }, + }, + watch: { + node_list: { + handler(val) { + this.setVal(); + }, + deep: true, + }, }, data() { return { @@ -248,14 +407,14 @@ export default { } else { this.$refs.linkSetting.clearValidate(); } - } + }, }, linkSetting: { - desc: "" + desc: "", }, nodeSetting: { name: "", - desc: "" + desc: "", }, dragConf: { isDown: false, @@ -265,7 +424,7 @@ export default { clientX: 0, clientY: 0, ele: null, - info: null + info: null, }, nodeItemList: [ { @@ -276,9 +435,9 @@ export default { meta: { label: "普通节点", name: "普通节点", - type: 3 - } - } + type: 3, + }, + }, }, { label: "开始", @@ -288,9 +447,9 @@ export default { meta: { label: "开始", name: "开始", - type: 1 - } - } + type: 1, + }, + }, }, { label: "结束", @@ -300,27 +459,27 @@ export default { meta: { label: "结束", name: "结束", - type: 2 - } - } - } + type: 2, + }, + }, + }, ], nodeParamsList: [], linkMenu: [ [ { label: "删除", - selected: link => { + selected: (link) => { console.log(link); link.remove(); - } - } - ] + }, + }, + ], ], dialog_general: false, nodeItem: { id: "", - name: "" + name: "", }, node_name: "", show_options_pop: false, @@ -329,7 +488,7 @@ export default { { label: "GET", value: 1 }, { label: "POST", value: 2 }, { label: "PUT", value: 3 }, - { label: "DELETE", value: 4 } + { label: "DELETE", value: 4 }, ], select: 1, serviceUrl: "", @@ -342,9 +501,9 @@ export default { label: "请求字段编码", prop: "requestEncoding", type: "input", - align: "left" + align: "left", }, - { label: "请求值", prop: "requestValue", type: "input", align: "left" } + { label: "请求值", prop: "requestValue", type: "input", align: "left" }, ], datasSj: [], optionsSq: [{ label: "Bearer Token", value: "Bearer" }], @@ -358,13 +517,13 @@ export default { prop: "show_type", type: "", align: "left", - width: "140" + width: "140", }, { label: "字段名称*", prop: "label", type: "input", - align: "left" + align: "left", }, { label: "是否必须*", @@ -372,10 +531,13 @@ export default { type: "select", align: "left", width: 100, - selectArr: [{ label: "是", value: 1 }, { label: "否", value: 0 }], - hasDefault: true + selectArr: [ + { label: "是", value: 1 }, + { label: "否", value: 0 }, + ], + hasDefault: true, }, - { label: "字段说明", prop: "descript", type: "input", align: "left" } + { label: "字段说明", prop: "descript", type: "input", align: "left" }, ], sjfwFhcstx: [ { label: "字段编码", prop: "name", type: "", align: "left" }, @@ -385,9 +547,9 @@ export default { label: "字段名称*", prop: "label", type: "input", - align: "left" + align: "left", }, - { label: "字段说明", prop: "descript", type: "input", align: "left" } + { label: "字段说明", prop: "descript", type: "input", align: "left" }, ], datasQqcs: [], datasFhcs: [], @@ -405,14 +567,14 @@ export default { durationOptions: [ { value: 1, label: "分钟" }, { value: 2, label: "小时" }, - { value: 3, label: "天" } + { value: 3, label: "天" }, ], max_time_0: undefined, max_time_1: undefined, max_time_type_0: 1, max_time_type_1: 1, max_time_check_0: false, - max_time_check_1: false + max_time_check_1: false, }; }, mounted() { @@ -447,7 +609,7 @@ export default { top, right, bottom, - left + left, } = this.$refs.flowContainer.getBoundingClientRect(); // 判断鼠标是否进入 flow container if ( @@ -474,15 +636,18 @@ export default { let query = { width: 120, height: 48, meta: {} }; query.meta.type = conf.info.meta.type; if (!conf.info.meta.id) { - query.meta.id = parseInt(Math.random() * 1000 * 1000); + query.meta.id = + parseInt(Math.random() * 1000 * 1000) + + "a" + + parseInt(Math.random() * 1000 * 1000); } console.log(query); this.$refs.superFlow.addNode({ coordinate, - ...query + ...query, }); if ( - this.nodeParamsList.findIndex(item => { + this.nodeParamsList.findIndex((item) => { return item.id == query.meta.id; }) == -1 ) { @@ -492,21 +657,22 @@ export default { label: "开始", name: "开始", type: 1, - id: query.meta.id + id: query.meta.id, }; } else if (conf.info.meta.type == 2) { obj = { label: "结束", name: "结束", type: 2, - id: query.meta.id + id: query.meta.id, }; } else if (conf.info.meta.type == 3) { obj = { label: "普通节点", name: "普通节点", type: 3, - id: query.meta.id + id: query.meta.id, + plugins: [], }; } this.nodeParamsList.push(obj); @@ -531,7 +697,7 @@ export default { clientY: clientY, info, ele, - isDown: true + isDown: true, }); ele.style.position = "fixed"; ele.style.margin = "0"; @@ -546,14 +712,14 @@ export default { }, blurItem() { this.nodeItem = { - id: "" + id: "", }; console.log(this.nodeItem); }, getData() { return { obj: this.$refs.superFlow.toJSON(), - params: this.nodeParamsList + params: this.nodeParamsList, }; }, handleChange() {}, @@ -565,14 +731,14 @@ export default { } else { self.$message({ message: "开始和结束节点不可被编辑", - type: "warning" + type: "warning", }); return false; } } else { self.$message({ message: "请选择节点", - type: "warning" + type: "warning", }); return false; } @@ -580,17 +746,19 @@ export default { showGeneralSettings() { if (this.checkNodeCouldEdit()) { let self = this; - self.node_name = self.nodeParamsList.find(item => { + self.node_name = self.nodeParamsList.find((item) => { return item.id == self.nodeItem.id; }).name; self.dialog_general = true; } }, - showInterfacePlugin() { - this.dialog_interface = true; + showInterfacePlugin(query) { + if (this.checkNodeCouldEdit()) { + this.dialog_interface = true; + } }, nodeParams(id) { - let index = this.nodeParamsList.findIndex(item => { + let index = this.nodeParamsList.findIndex((item) => { return item.id == id; }); if (index != -1) { @@ -605,7 +773,7 @@ export default { generalSubmit() { let self = this; if (self.nodeItem.type == 3) { - let index = self.nodeParamsList.findIndex(item => { + let index = self.nodeParamsList.findIndex((item) => { return item.id == self.nodeItem.id; }); if (index != -1) { @@ -613,7 +781,7 @@ export default { } else { self.$message({ message: "修改失败", - type: "error" + type: "error", }); } } @@ -676,17 +844,34 @@ export default { ? this.$refs.jsonCodes.getCodesVal() : ""; let contentType = this.sjfwQqt; + let method = ""; + switch (this.select) { + case 1: + method = "GET"; + break; + case 2: + method = "POST"; + break; + case 3: + method = "PUT"; + break; + case 4: + method = "DELETE"; + break; + default: + break; + } let query = { - method: this.select, + method: method, url: this.serviceUrl, headers: headers, params: requestData, body: bodys, content_type: contentType, data_service_type1: 5, - data_service_type2: 12 + data_service_type2: 12, }; - this.$api.workbench.fwzcFwcs(query).then(response => { + this.$api.workbench.fwzcFwcs(query).then((response) => { if (response.data.success == 1) { let data = response.data.data; this.body_fields = data.body_fields; @@ -720,25 +905,26 @@ export default { this.checkTable(requestData, 0); this.checkTable(responseData, 1); if (this.requestRules == 0 && this.responseRules == 0) { - this.request_fields = requestData; - this.response_fields = responseData; let self = this; - let index = this.nodeParamsList.findIndex(item => { - return (item.id = self.nodeItem.id); + self.request_fields = requestData; + self.response_fields = responseData; + let index = self.nodeParamsList.findIndex((item) => { + return item.id == self.nodeItem.id; }); + console.log(self.nodeParamsList[index]); self.nodeParamsList[index].plugins.push({ plugin_type: 1, url: self.serviceUrl, req_type: Number(self.select), auth_method: self.sqfsVal, auth_token: self.tokenVal, - query_fields: - self.dataType == "body" ? self.request_fields : self.body_fields, - body_fields: - self.dataType == "param" - ? self.request_fields - : self.param_fields, - response_fields: self.response_fields + query_fields: JSON.stringify( + self.dataType == "body" ? self.request_fields : self.body_fields + ), + body_fields: JSON.stringify( + self.dataType == "param" ? self.request_fields : self.param_fields + ), + response_fields: JSON.stringify(self.response_fields), }); console.log(self.nodeParamsList); self.dialog_interface = false; @@ -770,20 +956,32 @@ export default { } }, showProcessService() { - this.dialog_process = true; + if (this.checkNodeCouldEdit()) { + this.dialog_process = true; + } }, processCancel() { this.dialog_process = false; }, - processSubmit() {}, + processSubmit() { + if (this.service != "") { + } + }, showTimeoutManagement() { - this.dialog_timeout = true; + if (this.checkNodeCouldEdit()) { + this.dialog_timeout = true; + } }, timeoutCancel() { this.dialog_timeout = false; }, - timeoutSubmit() {} - } + timeoutSubmit() {}, + setVal() { + this.nodeList = JSON.parse(JSON.stringify(this.node_list)); + this.linkList = JSON.parse(JSON.stringify(this.link_list)); + this.nodeParamsList = JSON.parse(JSON.stringify(this.node_params_list)); + }, + }, }; @@ -882,6 +1080,11 @@ export default { } } } + .checked_line { + width: 64px; + height: 1px; + background-color: #e5e8f5; + } } } .node-item { @@ -1218,7 +1421,7 @@ export default { .timeout_row { display: flex; .timeout_input_group { - width: 300px; + width: 400px; display: flex; .input_left { display: inline-block; @@ -1238,6 +1441,19 @@ export default { border-radius: 0; color: #242c43; } + .el-input-number__decrease { + display: none; + } + .el-input-number__increase { + display: none; + } + &.is-controls-right { + .el-input__inner { + padding-left: 15px; + padding-right: 15px; + text-align: left; + } + } } .input_right_select.el-select { width: 80px; diff --git a/src/pages/data-analysis/data-analysis.vue b/src/pages/data-analysis/data-analysis.vue index 3e960577728bc80b864065ad3072a4c2d417fb2e..a974e672045631600a56e9f83ef630ae3de29da1 100644 --- a/src/pages/data-analysis/data-analysis.vue +++ b/src/pages/data-analysis/data-analysis.vue @@ -1,11 +1,19 @@