Skip to content

A
apaas-ui
Commit b8c3d6f2 authored by 赵伟庚's avatar 赵伟庚
Browse files
Options

Merge branch 'dev'

parents 6b5e33d8 ca819edd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
.beagle.yml
View file @ b8c3d6f2
...@@ -137,7 +137,7 @@ pipeline: ...@@ -137,7 +137,7 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- [master,dev] - master
# 生成最终arm版本 # 生成最终arm版本
latest-arm64: latest-arm64:
...@@ -155,7 +155,7 @@ pipeline: ...@@ -155,7 +155,7 @@ pipeline:
target: REGISTRY_PASSWORD target: REGISTRY_PASSWORD
when: when:
branch: branch:
- [master,dev] - master
docker-ppc64le: docker-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
......
src/pages/workbench/fwzc_fwcs.vue
View file @ b8c3d6f2
...@@ -1501,8 +1501,6 @@ export default { ...@@ -1501,8 +1501,6 @@ export default {
} }
headers = Object.assign(headers, requestHeaderDataObj) headers = Object.assign(headers, requestHeaderDataObj)
} }
let bodys = "";
let contentType = "";
if (this.activeBtn == 0 || this.activeBtn == 3) { if (this.activeBtn == 0 || this.activeBtn == 3) {
bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : ""; bodys = this.$refs.jsonCodes ? this.$refs.jsonCodes.getCodesVal() : "";
contentType = this.sjfwQqt; contentType = this.sjfwQqt;
......
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