diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue index b8fa6c7d7..6812d574c 100644 --- a/src/components/DataActions/index.vue +++ b/src/components/DataActions/index.vue @@ -316,7 +316,6 @@ $color-drop-menu-border: #e4e7ed; // 下拉 options .el-dropdown-menu { ::v-deep .more-batch-processing { - text-align: center; &:hover { background-color: transparent !important; diff --git a/src/components/Drawer/index.vue b/src/components/Drawer/index.vue index 9ee041e98..1952556cb 100644 --- a/src/components/Drawer/index.vue +++ b/src/components/Drawer/index.vue @@ -246,7 +246,8 @@ export default { .page-content { height: unset; - padding-right: 20px; + padding-right: 10px; + padding-left: 20px; & > div { margin-bottom: 1px; diff --git a/src/components/Table/DrawerListTable/index.vue b/src/components/Table/DrawerListTable/index.vue index 8d97633f9..8c2919608 100644 --- a/src/components/Table/DrawerListTable/index.vue +++ b/src/components/Table/DrawerListTable/index.vue @@ -14,7 +14,6 @@ :title="drawerTitle" :visible.sync="drawerVisible" class="page-drawer" - @reload-table="reloadTable" /> @@ -123,11 +122,6 @@ export default { } }, watch: { - drawerVisible(val) { - if (!val) { - // this.$store.dispatch('common/cleanDrawerActionMeta') - } - }, inDrawer(val) { if (!this.drawerVisible) { return diff --git a/src/components/Table/ListTable/TableAction/QuickFilter.vue b/src/components/Table/ListTable/TableAction/QuickFilter.vue index fc812b3a8..d00fadee3 100644 --- a/src/components/Table/ListTable/TableAction/QuickFilter.vue +++ b/src/components/Table/ListTable/TableAction/QuickFilter.vue @@ -88,8 +88,6 @@ export default { } } }, - mounted() { - }, methods: { async getCount(item) { if (item.count) { @@ -104,7 +102,6 @@ export default { } const res = await this.$axios.get(url, { raw: 1 }) item.count = res.data.count - console.log('............get count: ', item.count) return item.count }, cleanSummary() { @@ -160,9 +157,9 @@ export default { }) } option.active = !option.active - this.activeFilters.forEach(item => { - this.filtered = { ...item.filter } - }) + this.filtered = this.activeFilters.reduce((acc, item) => { + return { ...acc, ...item.filter } + }, {}) this.$emit('filter', this.filtered) } } diff --git a/src/icons/svg/push.svg b/src/icons/svg/push.svg new file mode 100644 index 000000000..d180d1c23 --- /dev/null +++ b/src/icons/svg/push.svg @@ -0,0 +1,7 @@ + + + + diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue index 96a386cf2..9905f9fd0 100644 --- a/src/layout/components/TabPage/index.vue +++ b/src/layout/components/TabPage/index.vue @@ -137,14 +137,14 @@ export default { handleTabClick(tab) { this.$emit('tab-click', tab) this.iActiveMenu = tab.name - this.$cookie.set(this.$route.name, tab.name, 1) + // this.$cookie.set(this.$route.name, tab.name, 1) }, getPropActiveTab() { let activeTab = '' const preActiveTabs = [ this.$route.query['tab'], - this.$cookie.get(this.$route.name), + // this.$cookie.get(this.$route.name), this.activeMenu ] diff --git a/src/router/pam/automations.js b/src/router/pam/automations.js index d23b976f9..dbe7b4ffd 100644 --- a/src/router/pam/automations.js +++ b/src/router/pam/automations.js @@ -149,7 +149,7 @@ export default [ }, { path: 'executions', - component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue'), + component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue'), name: 'AccountChangeSecretExecutionList', hidden: true, meta: { @@ -159,7 +159,7 @@ export default [ }, { path: 'executions/:id', - component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue'), + component: () => import('@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue'), name: 'AccountChangeSecretExecutionDetail', hidden: true, meta: { @@ -180,7 +180,7 @@ export default [ app: 'accounts', name: 'BaseAccountPushList', resource: 'pushaccountautomation', - icon: 'change-password' + icon: 'push' }, children: [ { diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue index 4177b1cc8..ed9a7b4f2 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue @@ -10,7 +10,8 @@ import { GenericDetailPage } from '@/layout/components' import AccountChangeSecretInfo from './AccountChangeSecretInfo.vue' import AccountChangeSecretAsset from './AccountChangeSecretAsset/index.vue' -import AccountChangeSecretExecutionList from './AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue' +import AccountChangeSecretExecutionList +from '@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue' export default { components: { diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue similarity index 100% rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue rename to src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretExecutionInfo.vue diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue similarity index 100% rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue rename to src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/AccountChangeSecretRecord.vue diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue similarity index 100% rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue rename to src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue similarity index 100% rename from src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue rename to src/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue diff --git a/src/views/accounts/AccountChangeSecret/index.vue b/src/views/accounts/AccountChangeSecret/index.vue index abc30c9e7..d924d6ccc 100644 --- a/src/views/accounts/AccountChangeSecret/index.vue +++ b/src/views/accounts/AccountChangeSecret/index.vue @@ -31,7 +31,7 @@ export default { name: 'AccountChangeSecretExecutionList', hidden: () => !this.$hasPerm('accounts.view_changesecretexecution'), component: () => import( - '@/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue' + '@/views/accounts/AccountChangeSecret/AccountChangeSecretExecution/AccountChangeSecretExecutionList.vue' ) } ] diff --git a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue index afd1ce7b2..4a58b26a1 100644 --- a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue +++ b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue @@ -99,11 +99,6 @@ export default { headerActions: gatherAccountHeaderActions(this) } }, - activated() { - setTimeout(() => { - this.$refs.AssetTreeTable.$refs.TreeList.reloadTable() - }, 300) - }, mounted() { } } diff --git a/src/views/dashboard/ChangeSecret/FailedAccountSummary.vue b/src/views/dashboard/ChangeSecret/FailedAccountSummary.vue index e8d7e9dd0..a43dcda63 100644 --- a/src/views/dashboard/ChangeSecret/FailedAccountSummary.vue +++ b/src/views/dashboard/ChangeSecret/FailedAccountSummary.vue @@ -5,7 +5,7 @@ :url="secretUrl" :visible.sync="showViewSecretDialog" /> - + @@ -143,4 +143,12 @@ export default {