diff --git a/.beagle.yml b/.beagle.yml index 6a523e52b6efb781dfec6e5057b879834d73ae73..7c0db7a325cbb4c81df6fcb7033b5f669414bf42 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -31,7 +31,7 @@ pipeline: image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 volumes: - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.15.9-alpine + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 repo: apaas/apaas-v3-ui version: 1.0.0 channel: alpha @@ -42,7 +42,7 @@ pipeline: image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 volumes: - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.15.9-alpine + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 repo: apaas/apaas-v3-ui version: 1.0.0 registry: hub.wodcloud.com diff --git a/build/conf.yaml b/build/conf.yaml index 45dfbfccb0ff0d40963b8b67223b80fc4adbeed8..48474f17c582554f11e967088181d286fa5dde10 100644 --- a/build/conf.yaml +++ b/build/conf.yaml @@ -1,3 +1,3 @@ -index: /awecloud/ui/ -login: /awecloud/dex/login -logout: /awecloud/dex/logout \ No newline at end of file +index: /apaas/ui/ +login: /iam/login/#/login +logout: /iam/api/logout \ No newline at end of file diff --git a/build/dockerfile b/build/dockerfile index ab1ccc78db59b81bfe17a445d553872f7511bf35..7a41e8ce962d4b76a989e4fe6faa0e3d7d8b0b3d 100644 --- a/build/dockerfile +++ b/build/dockerfile @@ -1,4 +1,5 @@ FROM {{ BASEIMAGE }} MAINTAINER {{ AUTHOR }} LABEL Author={{ AUTHOR }} Name={{ PROJECT }} Version={{ VERSION }} -ADD ./dist /usr/share/nginx/html \ No newline at end of file +ADD ./dist /www +ADD ./build/conf.yaml /www/conf.yaml \ No newline at end of file diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index b000cc958c7391a2f2609d97845bd2456acb71e5..cc5f9ee17d5b0fdc9d7120fe39449a68a31411dc 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -9,53 +9,109 @@ - - -

账号：

- - - -

密码：

- - 修改密码 - - -

昵称：

- - - -

头像：

- - - -

联系人：

- - - -

手机号：

- - - -

邮箱：

- - - -

组织机构：

- - - -

当前角色：

- - 升级为开发者 - - +
+ + +

账号：

+ + + +

密码：

+ + 修改密码 + + +

昵称：

+ + + +

头像：

+ + + +

联系人：

+ + + +

手机号：

+ + + +

邮箱：

+ + + +

组织机构：

+ + + +

当前角色：

+ + 升级为开发者 + + +
+
+ + +

业务系统名：

+ + + +

域名：

+ + + +

IP（白名单）：

+
+
+ {{ item.ip }} + +
+ + 增加 +
+ + +

IP（黑名单）：

+
+
+ {{ item.ip }} + +
+ + 增加 +
+ + +

密钥：

+ + 复制 + 重置 + + +

描述：

+ + + +
取消 修改 @@ -112,6 +168,32 @@ export default { role: "" }, imgList: [], + formBusiness: { + businessSystemName: "", + domainName: "", + ip_white: [ + { ip: "255.255.255.255", id: "123789244" }, + { ip: "255.255.255.255", id: "123576744" }, + { ip: "255.255.255.255", id: "123467866874" }, + { ip: "255.255.255.255", id: "1226783544" } + ], + ip_black: [ + { ip: "255.255.255.255", id: "12773844" }, + { ip: "255.255.255.255", id: "12561344" }, + { ip: "255.255.255.255", id: "1235672344" }, + { ip: "255.255.255.255", id: "12342314" }, + { ip: "255.255.255.255", id: "12386444" }, + { ip: "255.255.255.255", id: "12783544" }, + { ip: "255.255.255.255", id: "121678344" }, + { ip: "255.255.255.255", id: "127678344" } + ], + key: "", + description: "" + }, + whiteAddShow: false, + blackAddShow: false, + newIpWhite: "", + newIpBlack: "", diaPassWord: false }), mounted() { @@ -135,6 +217,50 @@ export default { submitChangePwd() {}, upLevel() { this.diaPassWord = true; + }, + copyKey() { + this.$refs.keys.select(); + document.execCommand("Copy"); + this.$message({ + message: "复制成功", + type: "success" + }); + }, + delIp(ip, type) { + console.log(ip, type); + }, + addIp(type) { + if (type == "white") { + this.whiteAddShow + ? this.$message({ + message: "请按回车完善本次ip填写", + type: "error" + }) + : (this.whiteAddShow = true); + } else if (type == "black") { + this.blackAddShow + ? this.$message({ + message: "请按回车完善本次ip填写", + type: "error" + }) + : (this.blackAddShow = true); + } + }, + watchKeyboardWhite() { + let self = this; + if (self.newIpWhite != "") { + self.formBusiness.ip_white.push({ ip: self.newIpWhite, id: 0 }); + self.whiteAddShow = false; + self.newIpWhite = ""; + } + }, + watchKeyboardBlack() { + let self = this; + if (self.newIpBlack != "") { + self.formBusiness.ip_black.push({ ip: self.newIpBlack, id: 0 }); + self.blackAddShow = false; + self.newIpBlack = ""; + } } } }; @@ -147,7 +273,7 @@ export default { .btn_footer { display: flex; justify-content: flex-end; - margin: 40px 20px 10px; + margin: 60px 20px 10px; } .previous { width: 100px; @@ -165,6 +291,12 @@ export default { border-radius: 8px; color: #f8f9fd; } +.option_btn_gray { + width: 124px; + background-color: #e3e5ef; + border-radius: 8px; + color: #0f2683; +} .info_item { width: 70%; min-width: 600px; @@ -191,12 +323,60 @@ export default { justify-content: flex-end; margin: 20px 0 0; } +.ip_block { + border-radius: 8px; + border: solid 1px #e3e5ef; + padding: 10px 0 0 10px; + line-height: 24px; +} +.ip_item { + display: inline-block; + position: relative; + background-color: #e6ebfe; + border-radius: 4px; + color: #0f2683; + font-size: 12px; + line-height: 24px; + padding: 0 26px 0 8px; + margin-right: 10px; + margin-bottom: 10px; +} +.ip_del { + position: absolute; + right: 8px; + top: 6px; + font-size: 14px; + color: #6573ae; + cursor: pointer; +} +.ip_del:hover { + color: #e56600; +} +.add_ip { + background-color: #495feb; + border-radius: 4px; + color: #f8f9fd; + font-size: 12px; + line-height: 24px; + padding: 0 8px; + margin-right: 10px; + margin-bottom: 10px; +} +.ip_input { + width: 110px; + margin-right: 10px; + margin-bottom: 10px; +} \ No newline at end of file