diff --git a/.beagle-arm.yml b/.beagle-arm.yml new file mode 100644 index 0000000000000000000000000000000000000000..db4e66cd6a65bc4d4749efda1f6a76711a7374ea --- /dev/null +++ b/.beagle-arm.yml @@ -0,0 +1,62 @@ + +clone: + git: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-git-arm64:1.0 +pipeline: + read-cache: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 + restore: true + check: yarn.lock + mount: + - ./node_modules + - ./yarn.lock + volumes: + - /data/cache:/cache + build: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-node-arm64:12.18.2-buster + volumes: + - /data/cache/yarn:/usr/local/share/.cache/yarn + commands: + - yarn install + - yarn run build + store-cache: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 + rebuild: true + mount: + - ./node_modules + - ./yarn.lock + volumes: + - /data/cache:/cache + docker-dev: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim + repo: wod/apaas/apaas-v3-ui-arm64 + version: "v3.0.0" + channel: alpha + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: dev + docker-master: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/node-arm64:14.5.0-buster-slim + repo: wod/apaas/apaas-v3-ui-arm64 + version: "v3.0.0" + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: master + +branches: [master,dev] diff --git a/.beagle.yml b/.beagle.yml index 4ffd337f70ff272c3adaba4986d0b9585944affd..6cd0808d140fe7eceaf5785f7002efcf5ff56a99 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -15,7 +15,7 @@ pipeline: volumes: - /data/cache:/cache build: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/node:8.15.0-onbuild + image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch dns: 223.5.5.5 volumes: - /data/cache/yarn:/usr/local/share/.cache/yarn diff --git a/build/arm.dockerfile b/build/arm.dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..7a41e8ce962d4b76a989e4fe6faa0e3d7d8b0b3d --- /dev/null +++ b/build/arm.dockerfile @@ -0,0 +1,5 @@ +FROM {{ BASEIMAGE }} +MAINTAINER {{ AUTHOR }} +LABEL Author={{ AUTHOR }} Name={{ PROJECT }} Version={{ VERSION }} +ADD ./dist /www +ADD ./build/conf.yaml /www/conf.yaml \ No newline at end of file diff --git a/package.json b/package.json index be2749511dcd02348e46a82f5fb4b4b91a040e15..895ec122ec356dd66d898c2a408c57f069365f96 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "@babel/plugin-transform-runtime": "^7.4.0", "@babel/preset-env": "^7.4.2", "@babel/runtime": "^7.4.2", + "@babel/compat-data": "7.9.0", "autoprefixer": "^9.5.0", "babel-loader": "^8.0.5", "babel-plugin-syntax-jsx": "^6.18.0", diff --git a/src/assets/css/index.css b/src/assets/css/index.css index fc8bdab9b412e41cb26fe7bc4a037a5d58b8d9cc..1908c476ef067a10512da7bff3e13951219b3f59 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -511,7 +511,7 @@ width: 620px!important; /* common */ .apass_breadcrumb > .el-breadcrumb { - margin: 15px 0; + padding: 15px 0; } .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner { font-size: 14px; @@ -638,4 +638,59 @@ width: 620px!important; /* background: #f4f4f4; */ box-shadow: 8px 0 0 #f4f4f4 inset; border: 4px solid rgba(0, 0, 0, 0); -} \ No newline at end of file +} + +/* 详情页公共样式 by xuyiming */ +.apaas_detail_container { + padding: 0 20px; +} +.apaas_detail_container .main_contaner { + min-height: calc(100vh - 84px - 83px); + flex-grow: 1; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: stretch; + padding: 30px; + background-color: #fff; + border-radius: 10px; + margin-bottom: 30px; + display: flex; + flex-direction: column; + justify-content: space-between; +} +.apaas_detail_container .detail_action { + text-align: right; + margin-top: 50px; +} +.apaas_detail_container .detail_action .el-button + .el-button { + margin-left: 30px; +} +.apaas_detail_container .detail_form { + max-width: 970px; +} +.apaas_detail_container .detail_form .el-input__inner, +.apaas_detail_container .detail_form .el-textarea__inner { + width: 100%; + background-color: #f7f8f9; +} +.apaas_detail_container .detail_form .el-select { + width: 100%; +} +.apaas_detail_container .detail_form.el-form--label-top .el-form-item__label { + padding: 0 0 15px; + font-size: 14px; + line-height: 1; + color: #58617a; +} +.apaas_detail_container .detail_form .el-form-item { + margin-bottom: 30px; +} +.apaas_detail_container .detail_form .textarea_count { + font-size: 14px; + line-height: 1; + color: #a9aec0; + text-align: right; + margin-top: 10px; +} +/* 详情页公共样式 by xuyiming ~~~end */ \ No newline at end of file diff --git a/src/assets/imgs/ic_guoqi.png b/src/assets/imgs/ic_guoqi.png index 6b3f62152c2621d31b9ba7da00ba9b8cf5d0818c..9a01ea4f680c73539516f4db577bed76d75897a8 100644 Binary files a/src/assets/imgs/ic_guoqi.png and b/src/assets/imgs/ic_guoqi.png differ diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue index 78c8999a4d1c84c5c302760c484f13d83f915e12..9751e0859df4871a9e88f51f0c1c083ecae8daab 100644 --- a/src/components/apass-list.vue +++ b/src/components/apass-list.vue @@ -286,7 +286,7 @@ export default { .top_fliter { display: flex; } -.top_fliter > .filter_list { +.top_fliter .filter_list { flex-grow: 1; } .filter_list > .filter_item { @@ -294,10 +294,14 @@ export default { vertical-align: middle; margin-top: 15px; } -.filter_list > .filter_item + .filter_item { - margin-left: 25px; +.filter_list > .filter_item { + margin-right: 15px; } .filter_list > .filter_item > .filter_title { + display: inline-block; + vertical-align: middle; + width: 8em; + text-align: right; font-size: 14px; font-weight: 700; color: #242c43; @@ -307,7 +311,7 @@ export default { .filter_list > .filter_item > .filter_title + * { width: 300px; } -.top_fliter > .filter_action { +.top_fliter .filter_action { flex-shrink: 0; margin-left: 25px; text-align: right; diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue index 20e746e22793953847666556760f1b39b57f3088..2996fa945141411aed6a08c000ccb50d67e6ea80 100644 --- a/src/components/apass-table.vue +++ b/src/components/apass-table.vue @@ -1,7 +1,10 @@