diff --git a/.beagle.yml b/.beagle.yml index 1798e667b4e42d6811e4c900ed60f954e2799bca..6ce83b0baa00a821dcf02d8d8fe51531e88aa0fe 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -50,7 +50,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3 dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com @@ -69,8 +69,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -87,7 +87,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -107,7 +107,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64 dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com @@ -126,8 +126,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -144,7 +144,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -163,7 +163,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-ppc64le args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com @@ -181,8 +181,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-ppc64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -198,7 +198,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -217,7 +217,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-mips64le args: "TARGETOS=linux,TARGETARCH=mips64le" registry: registry.cn-qingdao.aliyuncs.com @@ -235,8 +235,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-mips64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -252,7 +252,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -269,7 +269,7 @@ pipeline: namespace: apaas-v3 deployment: apaas-ui container: apaas-ui - registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha + registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha when: branch: - dev diff --git a/src/components/service-list/commodity-list-new.vue b/src/components/service-list/commodity-list-new.vue index 53dc45fc0a49dbe95ebff903bd7867df1aa4a759..b9f867e9f161b6fc9e1adaf8c08a7d6f84d60ab5 100644 --- a/src/components/service-list/commodity-list-new.vue +++ b/src/components/service-list/commodity-list-new.vue @@ -119,6 +119,7 @@ export default { methods: { handleSizeChange(val) { this.pagination.rowsPerPage = val; + this.pagination.page = 1 this.refreshData(); }, handleCurrentChange(val) { diff --git a/src/components/service-list/service_list-new.vue b/src/components/service-list/service_list-new.vue index 93b1137cb008bbfd263b946604a61a0d94fd73f7..07508a86623076c2fb3b987fe913f137c20d94e4 100644 --- a/src/components/service-list/service_list-new.vue +++ b/src/components/service-list/service_list-new.vue @@ -182,6 +182,7 @@ > {{ item.name }} +
共{{total}}条数据
- +
+ +
+
+ + +
@@ -242,6 +255,20 @@ export default { ], activeOptions: [[], [], [], []], activeChildOptions: [[], [], [], []], + pageOptions: [ + { + value: "10", + label: "10", + }, + { + value: "20", + label: "20", + }, + { + value: "50", + label: "50", + }, + ], buttonFilter: [ { name: "综合排序", @@ -286,7 +313,7 @@ export default { }, ], page: 1, - limit: 20, + limit: 10, couldTwice: false, refresh_app_1: false, refresh_app_2: false, @@ -297,11 +324,11 @@ export default { }), mounted() { window.addEventListener("resize", this.judgeHeight); - window.addEventListener("scroll", this.menu, true); + // window.addEventListener("scroll", this.menu, true); }, destroyed() { window.removeEventListener("resize", this.judgeHeight); - window.removeEventListener("scroll", this.menu, true); + // window.removeEventListener("scroll", this.menu, true); }, watch: { urlFilter: { @@ -357,22 +384,31 @@ export default { }, }, methods: { - menu() { - if (this.isKaiGuan) { - let scroll = - this.getScrollTop() + this.getWindowHeight() - this.getScrollHeight(); - if (scroll > -10) { - if ( - (this.total != 0 && this.page * this.limit < this.total) || - this.total == 0 - ) { - this.page++; - this.getShopList(); - } - } - } - }, + // menu() { + // if (this.isKaiGuan) { + // let scroll = + // this.getScrollTop() + this.getWindowHeight() - this.getScrollHeight(); + // if (scroll > -10) { + // if ( + // (this.total != 0 && this.page * this.limit < this.total) || + // this.total == 0 + // ) { + // this.page++; + // this.getShopList(); + // } + // } + // } + // }, //滚动条在Y轴上的滚动距离 + handleSizeChange(val) { + this.limit = val; + this.page = 1 + this.getShopList() + }, + handleCurrentChange(val) { + this.page = val; + this.getShopList() + }, getScrollTop() { var documentScrollTop = 0; documentScrollTop = document.documentElement.scrollTop; @@ -406,10 +442,11 @@ export default { }; this.$api.serviceShop.getAppList(query).then((response) => { if (response.data.success == "1") { - this.lists = - this.page == 1 - ? response.data.data - : this.lists.concat(response.data.data); + // this.lists = + // this.page == 1 + // ? response.data.data + // : this.lists.concat(response.data.data); + this.lists = response.data.data this.total = response.data.total; this.isKaiGuan = true; } else { @@ -430,10 +467,11 @@ export default { }; this.$api.serviceShop.getServiceShopList(query).then((response) => { if (response.data.success == "1") { - this.lists = - this.page == 1 - ? response.data.data - : this.lists.concat(response.data.data); + // this.lists = + // this.page == 1 + // ? response.data.data + // : this.lists.concat(response.data.data); + this.lists = response.data.data this.total = response.data.total; this.isKaiGuan = true; } else { @@ -582,7 +620,7 @@ export default { getNewList(val) { console.log(val); this.page = 1; - this.limit = 20; + this.limit = 10; this.getShopList(); }, clickAll(item) { @@ -771,6 +809,11 @@ export default { margin-left: 15px; position: relative; } +.list_total { + position: absolute; + right: 16px; + top: 0; +} .btn_right_check { position: absolute; right: 20px; @@ -785,8 +828,7 @@ export default { .head_flex .input_right .el-input--prefix .el-input__inner { padding-left: 40px; } -.head_flex .input_right .el-input__prefix, -.el-input__suffix { +.head_flex .input_right .el-input__prefix{ left: 10px; } .head_flex .input_right .el-input--prefix .el-input__inner { @@ -810,3 +852,22 @@ export default { border-color: #626de9; } + diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue index c6835a4d1f4a189b232fe86ffce00da875c18ace..93dd61d180c6bccb7081dcda960486119e5d6cd4 100644 --- a/src/components/table/table-um.vue +++ b/src/components/table/table-um.vue @@ -135,7 +135,7 @@ + + { if (e.value == val) { @@ -778,6 +813,37 @@ export default { return; } let data = response.data.data; + // 审批通过才可以下载接口文档,待审批、审批中、审批不通过不可以下载 + if (data.service_apply_info.approval_status == 3) { + this.clickFlag = true + }else { + this.clickFlag = false + } + if (data.doc_file != '') { + this.jkwd_datas.push({ + wd_name: helper.downloadFileFormat(data.doc_file), + url: data.doc_file + }) + } + this.jkwd_headers = [ + { + prop: "wd_name", + label: "文档名称", + align: "left", + }, + { + label: "操作", + type: "Button", + align: "center", + btnList: [ + { + type: "download", + label: "下载", + disabledRule: this.clickFlag == true + }, + ], + }, + ], this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id this.$set(this.service_header_arr, "workflows_id", data.workflows_id); // 时空服务id this.$set( diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue index 36d22f10f0f2d2bb0b15e6dcdd776ba19a614508..f34575ab6360fc276ca7e7eb1e91c91c49e357ac 100644 --- a/src/pages/workbench/fwgl/serviceDetail.vue +++ b/src/pages/workbench/fwgl/serviceDetail.vue @@ -24,7 +24,7 @@ :style=" now_service == index ? { borderBottom: '4px solid #f5ab4c' } : {} " - v-if="index < 3 || in_origin_ser" + v-if="index < 4 || in_origin_ser" > {{ item }} @@ -288,13 +288,19 @@ >
-

服务规格:

+ + +

- + >
保存 取消 -
+
-->
@@ -468,6 +474,25 @@ export default { times: 0, month: 0, }, + jkwd_headers: [ + { + prop: "wd_name", + label: "文档名称", + align: "left", + }, + { + label: "操作", + type: "Button", + align: "center", + btnList: [ + { + type: "download", + label: "下载", + }, + ], + }, + ], + jkwd_datas: [], trans_log_arr: [ { title: "服务交易概览", @@ -739,18 +764,19 @@ export default { workflows_id: "", //判断是否是流程服务 sizeset_flag: false, //规格设置是否显示 service_arr: [ - ["服务基本信息", "接口详细信息", "服务运行状态"], + ["服务基本信息", "接口详细信息", "服务运行状态","接口文档"], [ "服务基本信息", "接口详细信息", "服务运行状态", // "服务计费规则", // "服务交易记录", + "接口文档" ], [ "服务基本信息", "接口详细信息", - "服务运行状态", + "服务运行状态","接口文档" // "服务规格", // "服务交易记录", ], @@ -1272,6 +1298,14 @@ export default { }, mounted() {}, methods: { + download(row) { + console.log(row.url) + const a = document.createElement("a"); // 创建a标签 + a.setAttribute("download", ""); // download属性 + a.setAttribute("href", row.url); // href链接 + a.click(); // 自执行点击事件 + }, // 下载接口文档 + change_port(val) { this.port_options.forEach((e) => { if (e.value == val) { @@ -1665,6 +1699,12 @@ export default { }); this.service_size_data = temp; this.size_arr_down = temp; + if (data.doc_file != '') { + this.jkwd_datas.push({ + wd_name: helper.downloadFileFormat(data.doc_file), + url: data.doc_file + }) + } } else { this.$message({ message: response.data.errMsg, diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index ddfbad5a3a97fce70f7e4624940d67956cd3ea2d..480444494924aa116fe7c0c172ad0cfcf0c30f15 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -125,14 +125,26 @@ XML
+
+ 接口协议: +
+ + + http(s) + grpc + websocket +
服务地址:
-
+