Skip to content

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

Merge branch 'pure' into dev

parents 56a7c2c2 e310d1e5
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 416 deletions
.beagle.yml
View file @ b0c415c4
......@@ -17,7 +17,7 @@ pipeline:
- /data/cache:/cache
when:
branch:
- dev
- pure
## 构建
build:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch
......@@ -29,7 +29,7 @@ pipeline:
- yarn build
when:
branch:
- dev
- pure
store-cache:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0
......@@ -40,7 +40,7 @@ pipeline:
- /data/cache:/cache
when:
branch:
- dev
- pure
## 编译成静态文件
docker:
......@@ -51,7 +51,7 @@ pipeline:
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
channel: alpha
channel: pure
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -61,43 +61,7 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- dev
## 更换dev生成镜像的名称
harbor:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# 生成最终amd版本
latest:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.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
- pure
# 构建arm64位镜像
docker-arm64:
......@@ -108,7 +72,7 @@ pipeline:
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
channel: alpha-arm64
channel: pure-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -118,43 +82,7 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- dev
## 更换dev生成arm64镜像的名称
harbor-arm64:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# 生成最终arm版本
latest-arm64:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
- pure
docker-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
......@@ -164,7 +92,7 @@ pipeline:
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
channel: alpha-ppc64le
channel: pure-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -174,41 +102,7 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- dev
harbor-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
latest-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
- pure
docker-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
......@@ -218,7 +112,7 @@ pipeline:
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
channel: alpha-mips64le
channel: pure-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -228,48 +122,4 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- dev
harbor-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
latest-mips64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
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.2-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
deploy:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
namespace: apaas-v3
deployment: apaas-ui
container: apaas-ui
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha
when:
branch:
- dev
- pure
config/index.js
View file @ b0c415c4
......@@ -11,21 +11,21 @@ module.exports = {
assetsPublicPath: "/apaas/ui/",
proxyTable: {
"/apaas": {
target: "https://apaas3.wodcloud.com/apaas/",
target: "https://apaas.test.wodcloud.com/apaas/",
changeOrigin: true,
pathRewrite: {
"^/apaas": ""
}
},
"/awecloud": {
target: "https://apaas3.wodcloud.com/awecloud/",
target: "https://apaas.test.wodcloud.com/awecloud/",
changeOrigin: true,
pathRewrite: {
"^/awecloud": ""
}
},
"/vmap": {
target: "https://apaas3.wodcloud.com/vmap/",
target: "https://apaas.test.wodcloud.com/vmap/",
changeOrigin: true,
pathRewrite: {
"^/vmap": ""
......
src/pages/workbench/fwzc_fwcs.vue
View file @ b0c415c4
......@@ -113,13 +113,13 @@
</el-radio-group>
</div>
<div
v-if="!(activeBtn == 4 && zhyyVal == 24) && activeBtn != 5"
v-if="!(activeBtn == 4 && zhyyVal == 24)"
class="fwcs_fwdz"
>
服务地址：
</div>
<div
v-if="!(activeBtn == 4 && zhyyVal == 24) && activeBtn != 5"
v-if="!(activeBtn == 4 && zhyyVal == 24)"
class="fwcs_fwdz_inner"
>
<el-input
......@@ -340,124 +340,6 @@
</el-tab-pane>
</el-tabs>
</div>
<div v-if="activeBtn == 5">
<div class="fwcs_add">
<el-form ref="form_cp" :model="form_cp" :rules="rules_cp">
<el-form-item prop="name">
<p class="formname">产品名称：</p>
<el-input
v-model="form_cp.name"
placeholder="请输入产品名称"
class="form_in"
></el-input>
</el-form-item>
<el-form-item prop="desc">
<p class="formname">产品简介：</p>
<el-input
type="textarea"
v-model="form_cp.desc"
placeholder="请输入产品简介"
class="form_in"
></el-input>
</el-form-item>
<el-form-item prop="area">
<p class="formname">产品领域：</p>
<el-select
v-model="form_cp.area"
placeholder="请选择"
class="form_in"
>
<el-option
v-for="item in optionsArea"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="bb">
<p class="formname">产品版本：</p>
<el-input
v-model="form_cp.bb"
class="form_in"
placeholder="请输入产品版本，如V1.0"
></el-input>
</el-form-item>
<el-form-item>
<p class="formname">产品封面：</p>
<upload-file
:multiple="false"
:max="1"
type="cropper"
:readOnly="false"
:list="cover_cp"
@getNewList="getNewList_cp"
></upload-file>
</el-form-item>
<el-form-item prop="bq">
<p class="formname">产品标签：</p>
<div class="ip_block form_in">
<div
v-for="(item, index) in form_cp.bq"
:key="item"
class="ip_item"
>
{{ item }}
<i
class="el-icon-close ip_del"
@click="delIp(index, 'white')"
></i>
</div>
<el-input
v-if="whiteAddShow"
class="ip_input"
v-model="newIpWhite"
@keyup.enter.native="watchKeyboardWhite"
></el-input>
<el-button
class="add_ip"
@click="addIp('white')"
icon="el-icon-plus"
>增加</el-button
>
</div>
</el-form-item>
<el-form-item>
<p class="formname">产品介绍文档：</p>
<div class="cp_mb">
产品介绍文档模版.md
<a href="static/产品介绍文档模版.md" download="产品介绍文档模版.md" class="filebtn">下载文件</a>
</div>
<upload-file
:multiple="false"
:unique="false"
:max="1"
type="md"
:readOnly="false"
:drag="true"
@getNewList="getNewListwd"
class="up_f form_in"
:accepts="'.md'"
up_fz="仅支持.md格式"
:list="wd_cp"
></upload-file>
</el-form-item>
<el-form-item prop="resource">
<p class="formname">开放程度：</p>
<el-radio-group v-model="form_cp.resource">
<el-radio :label="1">共享</el-radio>
<el-radio :label="2">受限</el-radio>
<el-radio :label="3">敏感</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="btn_footer">
<el-button class="registe" @click="registeCp" :disabled="cpR"
>产品注册</el-button
>
</el-form-item>
</el-form>
</div>
</div>
</block-radius>
<block-radius v-show="resultShow">
<div
......@@ -1152,51 +1034,6 @@ export default {
code_1_index: 0,
code_2_index: 0,
user_id: "",
form_cp: {
name: "",
desc: "",
area: "",
origin: "",
bb: "",
bq: [],
resource: 1,
},
rules_cp: {
name: [
{ required: true, message: "请输入产品名称", trigger: "blur" },
{ min: 0, max: 15, message: "产品名称不超过15个字", trigger: "blur" },
],
desc: [
{ required: true, message: "请输入产品描述", trigger: "blur" },
{
min: 0,
max: 200,
message: "产品简介不超过200个字",
trigger: "blur",
},
],
area: [
{ required: true, message: "请选择产品领域", trigger: "change" },
],
bq: [{ required: true, message: "请添加产品标签", trigger: "blur" }],
bb: [
{ required: true, message: "请输入版本号", trigger: "change" },
{
pattern: /^(\w{1})(\w|\.|-|\s*)+$/,
message: "请输入正确版本号",
trigger: "blur",
},
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" },
],
},
cover_cp: [],
ip_arr: [],
whiteAddShow: false,
newIpWhite: "",
wd_cp: [],
cpR: false,
fwR: false,
mapR: false,
proR: false,
......@@ -1511,12 +1348,6 @@ export default {
getNewList(val) {
this.cover[0] = val[0].url;
},
getNewList_cp(val) {
this.cover_cp[0] = val[0].url;
},
getNewListwd(val) {
this.wd_cp[0] = val[0];
},
previous() {
this.datasQqcs = this.request_fields;
this.datasFhcs = this.response_fields;
......@@ -1533,7 +1364,6 @@ export default {
this.$api.user.getUserDetail(query).then((request) => {
if (request.data.success == 1) {
this.form.origin = request.data.data.department;
this.form_cp.origin = request.data.data.department;
this.oid = request.data.data.department_id;
} else {
console.log(response.data.errMsg);
......@@ -1681,43 +1511,6 @@ export default {
this.registePt();
}
},
registeCp() {
this.$refs.form_cp.validate((valid) => {
if (valid) {
if (this.form_cp.bq.length < 1 && this.form_cp.bq.length > 3) {
this.$message.error("产品标签至少1个，至多3个");
} else {
this.cpR = true;
let query = {
name: this.form_cp.name,
sectors: this.form_cp.area,
organization: this.form_cp.origin,
cover: this.cover_cp[0],
openness: this.form_cp.resource,
descript: this.form_cp.desc,
data_service_type1: this.btnList[this.activeBtn].id,
data_service_type2: 0,
portal_id: "",
encode_method: "自动生成",
doc_file: this.wd_cp.length != 0 ? this.wd_cp[0].url : "",
version: this.form_cp.bb,
tags: this.form_cp.bq,
urls: [],
};
this.$api.workbench.serviceAdd(query).then((response) => {
this.cpR = false;
if (response.data.success == 1) {
this.$message.success("产品注册成功");
this.$router.push("/fwgl/" + this.$store.getters.level);
} else {
console.log(response.data.errMsg);
this.$message.error(response.data.errMsg);
}
});
}
}
});
},
registePt() {
this.$refs.form.validate((valid) => {
if (valid) {
......@@ -1949,13 +1742,6 @@ export default {
break;
}
});
let cp_index = arr.findIndex((item) => {
return item.id == 36;
});
let cp = arr[cp_index];
arr.splice(cp_index, 1);
arr.push(cp);
console.log(arr);
this.btnList = arr;
let skfwRadios = this.btnList[1].childDomains;
skfwRadios.splice(2, 1);
......@@ -2332,48 +2118,12 @@ export default {
}
}
},
delIp(index, type) {
if (type == "white") {
this.form_cp.bq.splice(index, 1);
} else if (type == "black") {
this.form_cp.bq.splice(index, 1);
}
},
addIp(type) {
if (type == "white") {
this.whiteAddShow
? this.$message({
message: "请按回车完善本次标签填写",
type: "error",
})
: (this.whiteAddShow = true);
}
},
watchKeyboardWhite() {
let self = this;
if (self.newIpWhite == "") {
this.$message({
message: "无法添加空标签",
type: "error",
});
} else if (self.newIpWhite.length > 7) {
this.$message({
message: "添加的标签请小于七个字",
type: "error",
});
} else {
self.form_cp.bq.push(self.newIpWhite);
self.whiteAddShow = false;
self.newIpWhite = "";
}
},
},
mounted() {
let self = this;
window.addEventListener("message", self.listeners, false);
self.judgeMap();
self.getArea();
self.getOrganization();
},
created() {
let _self = this;
......
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