diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue index 6f46161797..e921c20f6d 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue @@ -1514,7 +1514,8 @@ if (stack.length > 0) { params.subprocess_id = stack.join(',') } - await this.itsmTransition(params) + const resp = await this.itsmTransition(params) + if (!resp.result) return this.approval.id = '' this.approval.is_passed = true this.approval.message = '' diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue index 65589864ea..33852294e9 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue @@ -13,21 +13,8 @@
- - +
{{ nodeNav[0].name }}
+ {{ stateStr }} @@ -251,47 +238,23 @@ .head-left-area { display: flex; align-items: center; + margin-right: 20px; .back-icon { font-size: 28px; color: #3a84ff; cursor: pointer; } } - .bread-crumbs-wrapper { - font-size: 0; - .path-item { - display: inline-block; - font-size: 14px; - overflow: hidden; - &.name-ellipsis { - max-width: 700px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - .node-name { - margin: 0 4px; - font-size: 14px; - color: #3a84ff; - cursor: pointer; - } - .node-ellipsis { - margin-right: 4px; - } - &:first-child { - .node-name { - margin-left: 0px; - } - } - &:last-child { - .node-name { - &:last-child { - color: #313238; - cursor: text; - } - } - } - } + .task-name { + max-width: 700px; + margin: 0 4px; + font-size: 14px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .state-popover { + flex-shrink: 0; } .task-state { flex-shrink: 0; @@ -378,6 +341,7 @@ height: 100%; .tab-operate { display: flex; + flex-shrink: 0; align-items: center; position: relative; font-size: 14px;