diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue index 384f736f5999fb4029d64413f141cf922d39e982..9194a89df3b2e93dd3e3f5c0938311645f7716dd 100644 --- a/src/pages/workbench/app_build.vue +++ b/src/pages/workbench/app_build.vue @@ -205,8 +205,7 @@ fit="fill" :list="logo" @getNewList="getNewList" - ref="servicepic" - directory="hub" + :directory="hub" > diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue index f046fc5558a8b5c66477046bff9091a79d8ce94e..e2a2f1e7646757488fe6d4de1238ecc7338dbe7c 100644 --- a/src/pages/workbench/yygl/yyglList.vue +++ b/src/pages/workbench/yygl/yyglList.vue @@ -278,11 +278,11 @@ export default { data: [ { name: "申请部署", - value: 1, + value: 0, }, { name: "申请开发", - value: 2, + value: 1, }, ], }, @@ -300,7 +300,7 @@ export default { }, { name: "审批未通过", - value: 2, + value: 0, }, ], }, @@ -611,11 +611,11 @@ export default { data: [ { name: "申请部署", - value: 1, + value: 0, }, { name: "申请开发", - value: 2, + value: 1, }, ], }, @@ -633,7 +633,7 @@ export default { }, { name: "审批未通过", - value: 2, + value: 0, }, ], }, @@ -721,7 +721,7 @@ export default { class: "warn", callback: _self.deleteItem, disabledRule(item) { - return item.online_state != 0; + return item.online_state != 2; }, }, ], @@ -929,11 +929,11 @@ export default { data: [ { name: "申请部署", - value: 1, + value: 0, }, { name: "申请开发", - value: 2, + value: 1, }, ], }, @@ -951,7 +951,7 @@ export default { }, { name: "审批未通过", - value: 2, + value: 0, }, ], }, @@ -1033,7 +1033,7 @@ export default { return item.value; }) .join(","); - } // 在线状态 + } // 在线状态 / 部署来源 / 在线区域 if (filter.appTypes) { params.appTypes = filter.appTypes .map((item) => { @@ -1062,6 +1062,20 @@ export default { }) .join(","); } // 应用来源 + if (filter.apply_type) { + params.apply_type = filter.apply_type + .map((item) => { + return item.value; + }) + .join(","); + } // 申请类型 + if (filter.apply_state) { + params.status = filter.apply_state + .map((item) => { + return item.value; + }) + .join(","); + } // 申请状态 this.tempFliter = filter; @@ -1087,7 +1101,7 @@ export default { }, // 唤醒弹窗 deleteAction(item) { if (this.cardType === 0) { - if (item.online_state == 0) { + if (item.online_state != 2) { this.dialogInfo.title = ""; this.dialogInfo.msg = "是否删除该条应用?"; this.dialogInfo.cancelText = "";