diff --git a/src/assets/imgs/ic_cancel.png b/src/assets/imgs/ic_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..ad6ffd50fe121a487f05e797cb7f10fa8558bafb Binary files /dev/null and b/src/assets/imgs/ic_cancel.png differ diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue index 7cd8bf940a55e50302560e91738f20192f52827f..c1d584a2441784d0c7b5e5361642d6bb8b3e1bf7 100644 --- a/src/pages/workbench/fwgl/organizationCloudResource.vue +++ b/src/pages/workbench/fwgl/organizationCloudResource.vue @@ -443,11 +443,25 @@ export default { align: "center", type: "image-tooltip", getImage(item) { + if ( + (item.apply_type === 0 && item.approve_state === -1) || + (item.apply_type === 1 && item.approve_update_state === -1) + ) { + return require("@/assets/imgs/ic_cancel.png"); + } + return item.state == 1 ? require("@/assets/imgs/ic_true.png") : require("@/assets/imgs/ic_failed.png"); }, getTooltip(item) { + if ( + (item.apply_type === 0 && item.approve_state === -1) || + (item.apply_type === 1 && item.approve_update_state === -1) + ) { + return "审批未通过"; + } + return item.state == 1 ? "运行中" : "该工作区域已被禁用"; }, }, @@ -522,6 +536,12 @@ export default { return item.state == 1 ? "禁用" : "启用"; }, callback: this.stateAction, + disabledRule(item) { + return ( + (item.apply_type === 0 && item.approve_state === -1) || + (item.apply_type === 1 && item.approve_update_state === -1) + ); + }, }, { label: "移除",