diff --git a/cmdb-api/api/lib/perm/acl/audit.py b/cmdb-api/api/lib/perm/acl/audit.py index fec4408..520f3cb 100644 --- a/cmdb-api/api/lib/perm/acl/audit.py +++ b/cmdb-api/api/lib/perm/acl/audit.py @@ -49,7 +49,6 @@ class AuditCRUD(object): @staticmethod def get_current_operate_uid(uid=None): - user_id = uid or (getattr(current_user, 'uid', None)) or getattr(current_user, 'user_id', None) if has_request_context() and request.headers.get('X-User-Id'): diff --git a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue index b11d559..10e9468 100644 --- a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue +++ b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue @@ -287,7 +287,7 @@ export default { item.description += str } else { const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` - item.description += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` + item.description += str } } } diff --git a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue index 7018efc..0c2bbcf 100644 --- a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue +++ b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue @@ -238,7 +238,7 @@ export default { item.changeDescription += str } else { const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` - item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` + item.changeDescription += str } } } diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue index 75e5ed8..3ff9ac9 100644 --- a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue +++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue @@ -286,7 +286,7 @@ export default { item.changeDescription += str } else { const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` - item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 ` + item.changeDescription += str } } } diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue index 1399b80..cfa03ae 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue @@ -550,7 +550,7 @@ export default { .then(() => { successNum += 1 }) - .catch((err) => { + .catch(() => { errorNum += 1 }) .finally(() => { @@ -584,7 +584,7 @@ export default { .then(() => { successNum += 1 }) - .catch((err) => { + .catch(() => { errorNum += 1 }) .finally(() => { @@ -685,7 +685,7 @@ export default { }, onEnd: (params) => { // 由于开启了虚拟滚动,newIndex和oldIndex是虚拟的 - const { newIndex, oldIndex, from, to } = params + const { newIndex, oldIndex } = params // 从tableDragClassName拿到colid const fromColid = this.tableDragClassName[oldIndex] const toColid = this.tableDragClassName[newIndex] diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue index a11e284..e2442fd 100644 --- a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue @@ -31,7 +31,7 @@