Commit 48c00efb authored by 徐一鸣's avatar 徐一鸣

我部署的应用列表页增加按工作区域的筛选

parent d382a007
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
components: { components: {
appList, appList,
apassList, apassList,
apassDialog apassDialog,
}, },
data: () => ({ data: () => ({
level: 0, // 用户等级 level: 0, // 用户等级
...@@ -62,15 +62,15 @@ export default { ...@@ -62,15 +62,15 @@ export default {
submit: null, submit: null,
cancelText: "", cancelText: "",
sunbmitText: "", sunbmitText: "",
submit: null submit: null,
}, },
otherFilter1: [], otherFilter1: [],
otherFilter2: [], otherFilter2: [],
tempFliter: null tempFliter: null,
}), }),
computed: { computed: {
...mapState({ ...mapState({
yyglNav: "yyglNav" yyglNav: "yyglNav",
}), }),
pathName() { pathName() {
return this.yyglNav[this.level][this.type]; return this.yyglNav[this.level][this.type];
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
} }
return url; return url;
} },
}, },
methods: { methods: {
initHeader() { initHeader() {
...@@ -110,18 +110,18 @@ export default { ...@@ -110,18 +110,18 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
}, },
{ {
name: "未上架", name: "未上架",
value: 0 value: 0,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -130,13 +130,13 @@ export default { ...@@ -130,13 +130,13 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
}, },
{ {
name: "应用来源", name: "应用来源",
...@@ -144,14 +144,14 @@ export default { ...@@ -144,14 +144,14 @@ export default {
data: [ data: [
{ {
name: "创建的应用", name: "创建的应用",
value: 0 value: 0,
}, },
{ {
name: "申请的应用", name: "申请的应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
} }
// 普通用户 --- 我部署的应用 card列表形式 // 普通用户 --- 我部署的应用 card列表形式
...@@ -165,14 +165,14 @@ export default { ...@@ -165,14 +165,14 @@ export default {
data: [ data: [
{ {
name: "应用商店", name: "应用商店",
value: 0 value: 0,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -181,14 +181,14 @@ export default { ...@@ -181,14 +181,14 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
// 普通用户 --- 申请的应用 // 普通用户 --- 申请的应用
...@@ -199,32 +199,32 @@ export default { ...@@ -199,32 +199,32 @@ export default {
label: "应用名称", label: "应用名称",
prop: "app_name", prop: "app_name",
type: "button", type: "button",
callback: this.detailItem callback: this.detailItem,
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "version", prop: "version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "ywly_name", prop: "ywly_name",
align: "center" align: "center",
}, },
{ {
label: "在线区域", label: "在线区域",
prop: "online_state_name", prop: "online_state_name",
align: "center" align: "center",
}, },
{ {
label: "申请类型", label: "申请类型",
prop: "apply_type_name", prop: "apply_type_name",
align: "center" align: "center",
}, },
{ {
label: "申请时间", label: "申请时间",
...@@ -233,13 +233,13 @@ export default { ...@@ -233,13 +233,13 @@ export default {
let time = item.time || ""; let time = item.time || "";
return time.substring(0, 10); return time.substring(0, 10);
}, },
align: "center" align: "center",
}, },
{ {
label: "申请状态", label: "申请状态",
prop: "apply_status", prop: "apply_status",
align: "center" align: "center",
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -248,14 +248,14 @@ export default { ...@@ -248,14 +248,14 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -264,13 +264,13 @@ export default { ...@@ -264,13 +264,13 @@ export default {
data: [ data: [
{ {
name: "申请部署", name: "申请部署",
value: 0 value: 0,
}, },
{ {
name: "申请开发", name: "申请开发",
value: 1 value: 1,
} },
] ],
}, },
{ {
name: "申请状态", name: "申请状态",
...@@ -278,18 +278,18 @@ export default { ...@@ -278,18 +278,18 @@ export default {
data: [ data: [
{ {
name: "审批中", name: "审批中",
value: 1 value: 1,
}, },
{ {
name: "审批通过", name: "审批通过",
value: 2 value: 2,
}, },
{ {
name: "审批未通过", name: "审批未通过",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
...@@ -301,27 +301,27 @@ export default { ...@@ -301,27 +301,27 @@ export default {
label: "应用名称", label: "应用名称",
prop: "app_name", prop: "app_name",
type: "button", type: "button",
callback: this.detailItem callback: this.detailItem,
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "version", prop: "version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "ywly_name", prop: "ywly_name",
align: "center" align: "center",
}, },
{ {
label: "在线状态", label: "在线状态",
prop: "online_state", prop: "online_state",
align: "center" align: "center",
}, },
{ {
label: "创建时间", label: "创建时间",
...@@ -330,7 +330,7 @@ export default { ...@@ -330,7 +330,7 @@ export default {
let time = item.create_date || ""; let time = item.create_date || "";
return time.substring(0, 10); return time.substring(0, 10);
}, },
align: "center" align: "center",
}, },
{ {
label: "操作", label: "操作",
...@@ -353,10 +353,10 @@ export default { ...@@ -353,10 +353,10 @@ export default {
item.up_deploy_status == 0 || item.up_deploy_status == 0 ||
item.up_deploy_status == 2 item.up_deploy_status == 2
); );
} },
} },
] ],
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -365,18 +365,18 @@ export default { ...@@ -365,18 +365,18 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
}, },
{ {
name: "未上架", name: "未上架",
value: 0 value: 0,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -385,13 +385,13 @@ export default { ...@@ -385,13 +385,13 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
}, },
{ {
name: "应用来源", name: "应用来源",
...@@ -399,14 +399,14 @@ export default { ...@@ -399,14 +399,14 @@ export default {
data: [ data: [
{ {
name: "创建的应用", name: "创建的应用",
value: 0 value: 0,
}, },
{ {
name: "申请的应用", name: "申请的应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
} }
// 组织管理员 --- 部署的应用 // 组织管理员 --- 部署的应用
...@@ -417,38 +417,38 @@ export default { ...@@ -417,38 +417,38 @@ export default {
label: "应用名称", label: "应用名称",
prop: "deploy_name", prop: "deploy_name",
type: "button", type: "button",
callback: this.detailItemDeploy callback: this.detailItemDeploy,
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "app_version", prop: "app_version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "business_area_name", prop: "business_area_name",
align: "center" align: "center",
}, },
{ {
label: "上架区域", label: "上架区域",
prop: "upload_area", prop: "upload_area",
align: "center" align: "center",
}, },
{ {
label: "部署时间", label: "部署时间",
prop: "created", prop: "created",
align: "center" align: "center",
}, },
{ {
label: "部署区域", label: "部署区域",
prop: "namespace", prop: "namespace",
align: "center" align: "center",
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -457,18 +457,18 @@ export default { ...@@ -457,18 +457,18 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
}, },
{ {
name: "未上架", name: "未上架",
value: 0 value: 0,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -477,14 +477,14 @@ export default { ...@@ -477,14 +477,14 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
// 组织管理员 --- 应用审批管理 // 组织管理员 --- 应用审批管理
...@@ -493,42 +493,42 @@ export default { ...@@ -493,42 +493,42 @@ export default {
this.listHeader = [ this.listHeader = [
{ {
label: "应用名称", label: "应用名称",
prop: "app_name" prop: "app_name",
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "version", prop: "version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "ywly_name", prop: "ywly_name",
align: "center" align: "center",
}, },
{ {
label: "在线区域", label: "在线区域",
prop: "online_state_name", prop: "online_state_name",
align: "center" align: "center",
}, },
{ {
label: "申请类型", label: "申请类型",
prop: "apply_type_name", prop: "apply_type_name",
align: "center" align: "center",
}, },
{ {
label: "审批时间", label: "审批时间",
prop: "time", prop: "time",
align: "center" align: "center",
}, },
{ {
label: "申请状态", label: "申请状态",
prop: "apply_status", prop: "apply_status",
align: "center" align: "center",
}, },
{ {
label: "操作", label: "操作",
...@@ -540,10 +540,10 @@ export default { ...@@ -540,10 +540,10 @@ export default {
getLabel(item) { getLabel(item) {
return item.apply_status === "已审批" ? "详情" : "审批"; return item.apply_status === "已审批" ? "详情" : "审批";
}, },
callback: this.detailItem callback: this.detailItem,
} },
] ],
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -552,14 +552,14 @@ export default { ...@@ -552,14 +552,14 @@ export default {
data: [ data: [
{ {
name: "应用商店", name: "应用商店",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -568,13 +568,13 @@ export default { ...@@ -568,13 +568,13 @@ export default {
data: [ data: [
{ {
name: "申请部署", name: "申请部署",
value: 0 value: 0,
}, },
{ {
name: "申请开发", name: "申请开发",
value: 1 value: 1,
} },
] ],
}, },
{ {
name: "申请状态", name: "申请状态",
...@@ -582,18 +582,18 @@ export default { ...@@ -582,18 +582,18 @@ export default {
data: [ data: [
{ {
name: "审批中", name: "审批中",
value: 1 value: 1,
}, },
{ {
name: "审批通过", name: "审批通过",
value: 2 value: 2,
}, },
{ {
name: "审批未通过", name: "审批未通过",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
...@@ -605,32 +605,32 @@ export default { ...@@ -605,32 +605,32 @@ export default {
label: "应用名称", label: "应用名称",
prop: "app_name", prop: "app_name",
type: "button", type: "button",
callback: this.detailItem callback: this.detailItem,
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "version", prop: "version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "ywly_name", prop: "ywly_name",
align: "center" align: "center",
}, },
{ {
label: "在线状态", label: "在线状态",
prop: "online_state", prop: "online_state",
align: "center" align: "center",
}, },
{ {
label: "所属组织", label: "所属组织",
prop: "org_name", prop: "org_name",
align: "center" align: "center",
}, },
{ {
label: "操作", label: "操作",
...@@ -640,7 +640,7 @@ export default { ...@@ -640,7 +640,7 @@ export default {
actionList: [ actionList: [
{ {
label: "编辑", label: "编辑",
callback: _self.editItem callback: _self.editItem,
}, },
{ {
getLabel(item) { getLabel(item) {
...@@ -657,7 +657,7 @@ export default { ...@@ -657,7 +657,7 @@ export default {
} else { } else {
return item.up_platform_status != 2; return item.up_platform_status != 2;
} }
} },
}, },
{ {
label: "删除", label: "删除",
...@@ -665,10 +665,10 @@ export default { ...@@ -665,10 +665,10 @@ export default {
callback: _self.deleteItem, callback: _self.deleteItem,
disabledRule(item) { disabledRule(item) {
return item.online_state != 2; return item.online_state != 2;
} },
} },
] ],
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -677,18 +677,18 @@ export default { ...@@ -677,18 +677,18 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
}, },
{ {
name: "未上架", name: "未上架",
value: 0 value: 0,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -697,14 +697,14 @@ export default { ...@@ -697,14 +697,14 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
// 超级管理员 --- 应用部署管理 // 超级管理员 --- 应用部署管理
...@@ -715,43 +715,43 @@ export default { ...@@ -715,43 +715,43 @@ export default {
label: "应用名称", label: "应用名称",
prop: "deploy_name", prop: "deploy_name",
type: "button", type: "button",
callback: this.detailItemDeploy callback: this.detailItemDeploy,
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "app_version", prop: "app_version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "business_area_name", prop: "business_area_name",
align: "center" align: "center",
}, },
{ {
label: "上架区域", label: "上架区域",
prop: "upload_area", prop: "upload_area",
align: "center" align: "center",
}, },
{ {
label: "所属组织", label: "所属组织",
prop: "org_name", prop: "org_name",
align: "center" align: "center",
}, },
{ {
label: "部署时间", label: "部署时间",
prop: "created", prop: "created",
align: "center" align: "center",
}, },
{ {
label: "部署区域", label: "部署区域",
prop: "namespace", prop: "namespace",
align: "center" align: "center",
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -760,18 +760,18 @@ export default { ...@@ -760,18 +760,18 @@ export default {
data: [ data: [
{ {
name: "平台应用", name: "平台应用",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
}, },
{ {
name: "未上架", name: "未上架",
value: 0 value: 0,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -780,14 +780,14 @@ export default { ...@@ -780,14 +780,14 @@ export default {
data: [ data: [
{ {
name: "支持开发", name: "支持开发",
value: 1 value: 1,
}, },
{ {
name: "不支持开发", name: "不支持开发",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
// 超级管理员 --- 应用审批管理 // 超级管理员 --- 应用审批管理
...@@ -796,42 +796,42 @@ export default { ...@@ -796,42 +796,42 @@ export default {
this.listHeader = [ this.listHeader = [
{ {
label: "应用名称", label: "应用名称",
prop: "app_name" prop: "app_name",
}, },
{ {
label: "应用版本", label: "应用版本",
prop: "version", prop: "version",
align: "center" align: "center",
}, },
{ {
label: "应用类型", label: "应用类型",
prop: "type_name", prop: "type_name",
align: "center" align: "center",
}, },
{ {
label: "业务领域", label: "业务领域",
prop: "ywly_name", prop: "ywly_name",
align: "center" align: "center",
}, },
{ {
label: "在线区域", label: "在线区域",
prop: "online_state_name", prop: "online_state_name",
align: "center" align: "center",
}, },
{ {
label: "申请类型", label: "申请类型",
prop: "apply_type_name", prop: "apply_type_name",
align: "center" align: "center",
}, },
{ {
label: "审批时间", label: "审批时间",
prop: "time", prop: "time",
align: "center" align: "center",
}, },
{ {
label: "申请状态", label: "申请状态",
prop: "apply_status", prop: "apply_status",
align: "center" align: "center",
}, },
{ {
label: "操作", label: "操作",
...@@ -843,10 +843,10 @@ export default { ...@@ -843,10 +843,10 @@ export default {
getLabel(item) { getLabel(item) {
return item.apply_status === "已审批" ? "详情" : "审批"; return item.apply_status === "已审批" ? "详情" : "审批";
}, },
callback: this.detailItem callback: this.detailItem,
} },
] ],
} },
]; ];
this.otherFilter1 = [ this.otherFilter1 = [
{ {
...@@ -855,14 +855,14 @@ export default { ...@@ -855,14 +855,14 @@ export default {
data: [ data: [
{ {
name: "应用商店", name: "应用商店",
value: 2 value: 2,
}, },
{ {
name: "开发者应用", name: "开发者应用",
value: 1 value: 1,
} },
] ],
} },
]; ];
this.otherFilter2 = [ this.otherFilter2 = [
{ {
...@@ -871,13 +871,13 @@ export default { ...@@ -871,13 +871,13 @@ export default {
data: [ data: [
{ {
name: "申请部署", name: "申请部署",
value: 0 value: 0,
}, },
{ {
name: "申请开发", name: "申请开发",
value: 1 value: 1,
} },
] ],
}, },
{ {
name: "申请状态", name: "申请状态",
...@@ -885,18 +885,18 @@ export default { ...@@ -885,18 +885,18 @@ export default {
data: [ data: [
{ {
name: "审批中", name: "审批中",
value: 1 value: 1,
}, },
{ {
name: "审批通过", name: "审批通过",
value: 2 value: 2,
}, },
{ {
name: "审批未通过", name: "审批未通过",
value: 0 value: 0,
} },
] ],
} },
]; ];
} }
...@@ -914,39 +914,59 @@ export default { ...@@ -914,39 +914,59 @@ export default {
callback(response) { callback(response) {
let datas = []; let datas = [];
datas = response.body.data.map(v => ({ datas = response.body.data.map((v) => ({
name: v.name, name: v.name,
value: v.id value: v.id,
})); }));
return { return {
name: "应用类型", name: "应用类型",
prop: "appTypes", prop: "appTypes",
data: datas data: datas,
}; };
} },
}, },
{ {
path: "/apaas/hubApi/market/businessAreas", path: "/apaas/hubApi/market/businessAreas",
callback(response) { callback(response) {
let datas = []; let datas = [];
datas = response.body.data.map(v => ({ datas = response.body.data.map((v) => ({
name: v.name, name: v.name,
value: v.id value: v.id,
})); }));
return { return {
name: "业务领域", name: "业务领域",
prop: "businessArea", prop: "businessArea",
data: datas data: datas,
}; };
} },
} },
]; ];
Promise.all(urls.map(url => this.$http.get(url.path))) if (level == 0 && type == 1) {
.then(responses => { urls.push({
path: "/apaas/hubApi/market/namespaces",
callback(response) {
let datas = [];
datas = response.body.data.map((v) => ({
name: v.text,
value: v.value,
}));
return {
name: "工作空间",
prop: "namespaces",
data: datas,
};
},
});
}
Promise.all(urls.map((url) => this.$http.get(url.path)))
.then((responses) => {
let filterList = responses.map((response, index) => { let filterList = responses.map((response, index) => {
return urls[index].callback(response); return urls[index].callback(response);
}); });
...@@ -954,10 +974,10 @@ export default { ...@@ -954,10 +974,10 @@ export default {
this.filterList = [ this.filterList = [
...this.otherFilter1, ...this.otherFilter1,
...filterList, ...filterList,
...this.otherFilter2 ...this.otherFilter2,
]; ];
}) })
.catch(error => { .catch((error) => {
console.log(error); console.log(error);
}); });
}, },
...@@ -965,59 +985,66 @@ export default { ...@@ -965,59 +985,66 @@ export default {
let listUrl = [ let listUrl = [
"/apaas/hubApi/market/list", "/apaas/hubApi/market/list",
"/apaas/hubApi/market/deployList", "/apaas/hubApi/market/deployList",
"/apaas/hubApi/market/applyList" "/apaas/hubApi/market/applyList",
]; ];
let params = {}; let params = {};
if (filter.online_state) { if (filter.online_state) {
params.online_state = filter.online_state params.online_state = filter.online_state
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 在线状态 / 部署来源 / 在线区域 } // 在线状态 / 部署来源 / 在线区域
if (filter.appTypes) { if (filter.appTypes) {
params.appTypes = filter.appTypes params.appTypes = filter.appTypes
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 应用类型 } // 应用类型
if (filter.businessArea) { if (filter.businessArea) {
params.businessArea = filter.businessArea params.businessArea = filter.businessArea
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 业务领域 } // 业务领域
if (filter.developable) { if (filter.developable) {
params.developable = filter.developable params.developable = filter.developable
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 是否支持开发 } // 是否支持开发
if (filter.appSource) { if (filter.appSource) {
params.appSource = filter.appSource params.appSource = filter.appSource
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 应用来源 } // 应用来源
if (filter.apply_type) { if (filter.apply_type) {
params.apply_type = filter.apply_type params.apply_type = filter.apply_type
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 申请类型 } // 申请类型
if (filter.apply_state) { if (filter.apply_state) {
params.status = filter.apply_state params.status = filter.apply_state
.map(item => { .map((item) => {
return item.value; return item.value;
}) })
.join(","); .join(",");
} // 申请状态 } // 申请状态
if (filter.namespaces) {
params.namespaces = filter.namespaces
.map((item) => {
return item.value;
})
.join(",");
} // 工作空间
this.tempFliter = filter; this.tempFliter = filter;
...@@ -1027,14 +1054,14 @@ export default { ...@@ -1027,14 +1054,14 @@ export default {
...params, ...params,
search: filter.keyword, search: filter.keyword,
page: filter.page, page: filter.page,
limit: filter.size limit: filter.size,
} },
}) })
.then(({ data }) => { .then(({ data }) => {
this.listTotal = data.total; this.listTotal = data.total;
this.listData = data.data || []; this.listData = data.data || [];
}) })
.catch(error => { .catch((error) => {
console.log(error); console.log(error);
}); });
}, },
...@@ -1055,20 +1082,20 @@ export default { ...@@ -1055,20 +1082,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `删除${item.app_name}成功.`, message: `删除${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `删除${item.app_name}失败.`, message: `删除${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `删除${item.app_name}失败.`, message: `删除${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1082,7 +1109,7 @@ export default { ...@@ -1082,7 +1109,7 @@ export default {
if (item.up_deploy_status === 3) { if (item.up_deploy_status === 3) {
this.$message({ this.$message({
message: `${item.app_name}正在申请下架中.`, message: `${item.app_name}正在申请下架中.`,
type: "warning" type: "warning",
}); });
} else { } else {
this.$http this.$http
...@@ -1091,20 +1118,20 @@ export default { ...@@ -1091,20 +1118,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `申请下架${item.app_name}成功.`, message: `申请下架${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `申请下架${item.app_name}失败.`, message: `申请下架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `申请下架${item.app_name}失败.`, message: `申请下架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
} }
...@@ -1120,27 +1147,27 @@ export default { ...@@ -1120,27 +1147,27 @@ export default {
this.$http this.$http
.delete(`/apaas/hubApi/market/deploy/${item.deploy_name}`, { .delete(`/apaas/hubApi/market/deploy/${item.deploy_name}`, {
params: { params: {
deployId: item.deploy_id deployId: item.deploy_id,
} },
}) })
.then(({ data }) => { .then(({ data }) => {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `删除${item.deploy_name}成功.`, message: `删除${item.deploy_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `删除${item.deploy_name}失败.`, message: `删除${item.deploy_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `删除${item.deploy_name}失败.`, message: `删除${item.deploy_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1169,7 +1196,9 @@ export default { ...@@ -1169,7 +1196,9 @@ export default {
); );
}, },
detailItemDeploy(item) { detailItemDeploy(item) {
this.$router.push(`${this.detailsUrl}${item.deploy_id}?app_id=${item.app_id}`); this.$router.push(
`${this.detailsUrl}${item.deploy_id}?app_id=${item.app_id}`
);
}, },
soldUpItem(item) { soldUpItem(item) {
this.dialogInfo.title = "提示"; this.dialogInfo.title = "提示";
...@@ -1181,20 +1210,20 @@ export default { ...@@ -1181,20 +1210,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `上架${item.app_name}成功.`, message: `上架${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `上架${item.app_name}失败.`, message: `上架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `上架${item.app_name}失败.`, message: `上架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1210,20 +1239,20 @@ export default { ...@@ -1210,20 +1239,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `下架${item.app_name}成功.`, message: `下架${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `下架${item.app_name}失败.`, message: `下架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `下架${item.app_name}失败.`, message: `下架${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1242,20 +1271,20 @@ export default { ...@@ -1242,20 +1271,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `上线${item.app_name}成功.`, message: `上线${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `上线${item.app_name}失败.`, message: `上线${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `上线${item.app_name}失败.`, message: `上线${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1271,20 +1300,20 @@ export default { ...@@ -1271,20 +1300,20 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `下线${item.app_name}成功.`, message: `下线${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `下线${item.app_name}失败.`, message: `下线${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `下线${item.app_name}失败.`, message: `下线${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
...@@ -1302,24 +1331,24 @@ export default { ...@@ -1302,24 +1331,24 @@ export default {
if (data.success) { if (data.success) {
this.$message({ this.$message({
message: `删除${item.app_name}成功.`, message: `删除${item.app_name}成功.`,
type: "success" type: "success",
}); });
this.initDatas(this.tempFliter); this.initDatas(this.tempFliter);
} else { } else {
this.$message({ this.$message({
message: `删除${item.app_name}失败.`, message: `删除${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
} }
}) })
.catch(error => { .catch((error) => {
this.$message({ this.$message({
message: `删除${item.app_name}失败.`, message: `删除${item.app_name}失败.`,
type: "warning" type: "warning",
}); });
}); });
}; };
} },
}, },
created() { created() {
this.level = parseInt(this.$route.params.level); this.level = parseInt(this.$route.params.level);
...@@ -1342,7 +1371,7 @@ export default { ...@@ -1342,7 +1371,7 @@ export default {
console.log(data.errMsg); console.log(data.errMsg);
} }
}); });
} },
}; };
</script> </script>
......
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