Skip to content

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

up 内置服务分类可编辑

parent ec10675e
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 207 deletions
.beagle.yml
View file @ f5f4d776
...@@ -47,7 +47,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 ...@@ -47,7 +47,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
settings: # 当前设置 settings: # 当前设置
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像 base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像
dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
repo: gzga-jzapi/apaas-ui # 生成镜像的 分组/名称 repo: gzgajzapi/apaas-ui # 生成镜像的 分组/名称
version: "v3.0.5" # 版本号 version: "v3.0.5" # 版本号
channel: alpha # 后缀 example: alpha test fix-alpha fix等 channel: alpha # 后缀 example: alpha test fix-alpha fix等
args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数 args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
...@@ -56,73 +56,6 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 ...@@ -56,73 +56,6 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
from_secret: REGISTRY_USER from_secret: REGISTRY_USER
registry_password: # 密码 registry_password: # 密码
from_secret: REGISTRY_PASSWORD from_secret: REGISTRY_PASSWORD
- name: deploy-cloud
image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
settings:
namespace: gzgajzapi
deployment: apaas-ui
container: apaas-ui
image: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha
environment:
KUBERNETES_SERVER:
from_secret: KUBERNETES_SERVER
KUBERNETES_TOKEN:
from_secret: KUBERNETES_TOKEN
- name: docker-arm64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
settings:
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
dockerfile: .beagle/dockerfile
repo: gzga-jzapi/apaas-ui
version: "v3.0.5"
channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: hub.wodcloud.com
registry_user:
from_secret: REGISTRY_USER
registry_password:
from_secret: REGISTRY_PASSWORD
- name: docker-ppc64le
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
settings:
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le
dockerfile: .beagle/dockerfile
repo: gzga-jzapi/apaas-ui
version: "v3.0.5"
channel: alpha-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: hub.wodcloud.com
registry_user:
from_secret: REGISTRY_USER
registry_password:
from_secret: REGISTRY_PASSWORD
- name: docker-mips64le
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
settings:
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.11-mips64le
dockerfile: .beagle/dockerfile
repo: gzga-jzapi/apaas-ui
version: "v3.0.5"
channel: alpha-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: hub.wodcloud.com
registry_user:
from_secret: REGISTRY_USER
registry_password:
from_secret: REGISTRY_PASSWORD
--- ---
clone: clone:
disable: true disable: true
...@@ -153,62 +86,8 @@ steps: ...@@ -153,62 +86,8 @@ steps:
REGISTRY_PASSWORD: REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD from_secret: REGISTRY_PASSWORD
settings: settings:
source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha source: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.5-alpha
target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5 target: hub.wodcloud.com/gzgajzapi/apaas-ui:v3.0.5
registry: hub.wodcloud.com
- name: harbor-arm64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
pull: always
environment:
http_proxy: http://10.11.92.33:1282
https_proxy: http://10.11.92.33:1282
REGISTRY_USER:
from_secret: REGISTRY_USER
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD
settings:
source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-arm64
target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-arm64
registry: hub.wodcloud.com
- name: harbor-ppc64le
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
pull: always
environment:
http_proxy: http://10.11.92.33:1282
https_proxy: http://10.11.92.33:1282
REGISTRY_USER:
from_secret: REGISTRY_USER
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD
settings:
source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-ppc64le
target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-ppc64le
registry: hub.wodcloud.com
- name: harbor-mips64le
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0
volumes:
- name: docker-sock
path: /var/run/docker.sock
pull: always
environment:
http_proxy: http://10.11.92.33:1282
https_proxy: http://10.11.92.33:1282
REGISTRY_USER:
from_secret: REGISTRY_USER
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD
settings:
source: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-alpha-mips64le
target: hub.wodcloud.com/gzga-jzapi/apaas-ui:v3.0.5-mips64le
registry: hub.wodcloud.com registry: hub.wodcloud.com
##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------## ##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------##
......
src/components/service-list/service_shop_menu_new.vue
View file @ f5f4d776
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
top: 76px; top: 76px;
left: calc(50% - 600px); left: calc(50% - 600px);
width: 176px; width: 176px;
padding: 8px; padding: 8px 16px;
background-color: #ffffff; background-color: #ffffff;
box-shadow: 0px 3px 6px 0px box-shadow: 0px 3px 6px 0px
rgba(15, 19, 65, 0.04); rgba(15, 19, 65, 0.04);
...@@ -96,11 +96,12 @@ export default { ...@@ -96,11 +96,12 @@ export default {
.service_shop_menu_list > li { .service_shop_menu_list > li {
box-sizing: border-box; box-sizing: border-box;
height: 40px; height: 40px;
padding: 8px 0 0 22px; /* padding: 8px 0 0 22px; */
margin-bottom: 16px; margin-bottom: 16px;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 40px;
cursor: pointer; cursor: pointer;
text-align: center;
} }
.service_shop_menu_list > li:nth-last-child(1) { .service_shop_menu_list > li:nth-last-child(1) {
margin-bottom: 0; margin-bottom: 0;
...@@ -115,17 +116,13 @@ export default { ...@@ -115,17 +116,13 @@ export default {
margin-right: 6px; margin-right: 6px;
} }
.menu_item { .menu_item {
position: relative;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
color: #96a0c5; color: #96a0c5;
top: -6px;
} }
.menu_item_active { .menu_item_active {
position: relative;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
color: #515fe7; color: #515fe7;
top: -6px;
} }
</style> </style>
src/pages/service_shop/shop_list_new.vue
View file @ f5f4d776
...@@ -15,9 +15,8 @@ ...@@ -15,9 +15,8 @@
:filterNames="filterNames" :filterNames="filterNames"
:name="name" :name="name"
:urlFilter="urlFilter" :urlFilter="urlFilter"
v-show="showFlag"
></service-list> ></service-list>
<shop-cloud v-show="!showFlag" name="云资源服务"></shop-cloud> <!-- <shop-cloud v-show="!showFlag" name="云资源服务"></shop-cloud> -->
</el-main> </el-main>
</el-container> </el-container>
</div> </div>
...@@ -42,17 +41,17 @@ export default { ...@@ -42,17 +41,17 @@ export default {
filterNames: [], filterNames: [],
currentId: null, currentId: null,
menuList: [], menuList: [],
otherlist: [ // otherlist: [
{ // {
id: 'app', // id: 'app',
name: "应用商店", // name: "应用商店",
}, // },
{ // {
id: "cloud", // id: "cloud",
name: "云资源服务", // name: "云资源服务",
} // }
], // ],
showFlag: true // showFlag: true
}), }),
mounted() { mounted() {
// this.getVal(this.$route.query); // this.getVal(this.$route.query);
...@@ -61,23 +60,7 @@ export default { ...@@ -61,23 +60,7 @@ export default {
}, },
methods: { methods: {
getVal(val) { getVal(val) {
console.log(val,'========') this.changeActive(this.menuList[0])
if (val.indexOf('app') > -1) {
let obj = {
id: 'app',
name: "应用商店",
}
this.changeActive(obj)
}else if (val.indexOf('cloud') > -1) {
let obj = {
id: "cloud",
name: "云资源服务",
}
this.changeActive(obj)
}else {
this.changeActive(this.menuList[0])
}
}, },
getShopMenu() { getShopMenu() {
let obj = {} let obj = {}
...@@ -86,29 +69,11 @@ export default { ...@@ -86,29 +69,11 @@ export default {
let arr = response.data.data; let arr = response.data.data;
obj = arr[0] || {} obj = arr[0] || {}
this.menuList = arr; this.menuList = arr;
this.menuList.push(...this.otherlist) this.currentId = obj.id
if (this.$route.params.id) { this.name = obj.name
this.currentId = this.$route.params.id this.urlFilter = obj.id.toString()
if (this.$route.params.id == 'app') { this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
this.showFlag = true
this.name = '应用商店'
this.urlFilter = this.$route.params.id.toString()
this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
}else if(this.$route.params.id == 'cloud') {
this.showFlag = false
}
}else {
this.currentId = obj.id
this.name = obj.name
this.urlFilter = obj.id.toString()
if (obj.id != 'app' && obj.id != 'cloud') {
this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
}else {
if (obj.id == 'app') {
this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
}
}
}
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
...@@ -116,22 +81,9 @@ export default { ...@@ -116,22 +81,9 @@ export default {
}, },
changeActive(item) { changeActive(item) {
this.currentId = item.id this.currentId = item.id
if (item.id !='cloud') { this.name = item.name
if (item.id != 'app') { this.urlFilter = item.id.toString()
this.$router.push('/shop/data_service_list') this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
}
this.showFlag = true
this.name = item.name
this.urlFilter = item.id.toString()
if (item.id != 'app') {
this.filterNames = ["服务类型", "业务领域", "服务来源组织"]
}else {
this.filterNames = ["应用类型", "应用领域", "应用来源机构"];
}
}else {
this.showFlag = false
}
console.log(this.showFlag)
} }
}, },
watch: { watch: {
......
src/pages/workbench/product-type/class_edit.vue
View file @ f5f4d776
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<el-select <el-select
v-model="form.typeCode" v-model="form.typeCode"
placeholder="请选择" placeholder="请选择"
:disabled="disabledFlag"
> >
<el-option <el-option
v-for="(e, idx) in classTypes" v-for="(e, idx) in classTypes"
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
<el-select <el-select
v-model="form.servTemplate" v-model="form.servTemplate"
placeholder="请选择" placeholder="请选择"
:disabled="disabledFlag"
> >
<el-option <el-option
v-for="(e, idx) in serviceTemplates" v-for="(e, idx) in serviceTemplates"
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
<el-select <el-select
v-model="form.pId" v-model="form.pId"
placeholder="请选择" placeholder="请选择"
:disabled="disabledFlag"
> >
<el-option <el-option
v-for="(e, idx) in pClassNames" v-for="(e, idx) in pClassNames"
...@@ -70,6 +73,7 @@ ...@@ -70,6 +73,7 @@
type="textarea" type="textarea"
placeholder="请输入分类描述" placeholder="请输入分类描述"
rows="5" rows="5"
:disabled="disabledFlag"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="state"> <el-form-item label="" prop="state">
...@@ -115,6 +119,7 @@ export default { ...@@ -115,6 +119,7 @@ export default {
], ],
name: [ name: [
{ required: true, message: "请输入分类名称", trigger: "blur" }, { required: true, message: "请输入分类名称", trigger: "blur" },
{ max: 8, message: "最大长度为8个字", trigger: "blur"}
], ],
servTemplate: [ servTemplate: [
{ required: true, message: "请选择服务模版", trigger: "change" }, { required: true, message: "请选择服务模版", trigger: "change" },
...@@ -195,7 +200,8 @@ export default { ...@@ -195,7 +200,8 @@ export default {
label: "禁用", label: "禁用",
value: 0 value: 0
}, },
] // 状态 ], // 状态
disabledFlag: false
} }
}, },
computed: { computed: {
...@@ -224,6 +230,7 @@ export default { ...@@ -224,6 +230,7 @@ export default {
state: data.state, state: data.state,
typeCode: data.type_code typeCode: data.type_code
} }
this.disabledFlag = data.can_delete == 0 ? true : false
}else { }else {
this.$message.error(res.data.errMsg) this.$message.error(res.data.errMsg)
} }
......
src/pages/workbench/product-type/class_list.vue
View file @ f5f4d776
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
type: 'edit', type: 'edit',
disflag: true, disflag: true,
disabledRule(item) { disabledRule(item) {
return item.state != 1 && item.canDelete == 1; return item.state != 1;
}, },
line: '|' line: '|'
}, },
...@@ -253,12 +253,8 @@ export default { ...@@ -253,12 +253,8 @@ export default {
}) })
}, // 启用/禁用分类 }, // 启用/禁用分类
editRow(row) { editRow(row) {
if (row.canDelete == 0) { if (row.state == 1) {
return return
}else {
if (row.state == 1) {
return
}
} }
this.$router.push(`/productType/classList/edit/${row.id}`) this.$router.push(`/productType/classList/edit/${row.id}`)
}, // 编辑分类 }, // 编辑分类
......
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