diff --git a/src/App.vue b/src/App.vue index 8de84169c..fed5caa5f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,12 @@ diff --git a/src/components/TableFormatters/TwoTabFormatter.vue b/src/components/TableFormatters/TwoTabFormatter.vue index 97ef8747b..f429a5070 100644 --- a/src/components/TableFormatters/TwoTabFormatter.vue +++ b/src/components/TableFormatters/TwoTabFormatter.vue @@ -6,17 +6,17 @@
- {{ row.leftTitle }} -
- {{ key }}: {{ value }} + {{ row.leftTitle }} +
+ {{ key }}: {{ value }}
- {{ row.rightTitle }} + {{ row.rightTitle }}
- {{ key }}: {{ value }} + {{ key }}: {{ value }}
diff --git a/src/store/modules/common.js b/src/store/modules/common.js index f3ac0e80e..e26944216 100644 --- a/src/store/modules/common.js +++ b/src/store/modules/common.js @@ -2,8 +2,7 @@ import { optionUrlMeta } from '@/api/common' const getDefaultState = () => { return { - metaMap: {}, - isRouterAlive: true + metaMap: {} } } @@ -12,12 +11,6 @@ const state = getDefaultState() const mutations = { SET_URL_META: (state, { url, meta }) => { state.metaMap[url] = meta - }, - reload: (state) => { - state.isRouterAlive = false - setTimeout(() => { - state.isRouterAlive = true - }, 0) } } diff --git a/src/utils/org.js b/src/utils/org.js index ea18b8f77..6cd0a5d3d 100644 --- a/src/utils/org.js +++ b/src/utils/org.js @@ -30,7 +30,7 @@ async function changeOrg(org) { if (index !== -1) { location.href = path.substring(0, index) } - setTimeout(() => store.commit('common/reload'), 400) + setTimeout(() => location.reload(), 400) } } diff --git a/src/utils/theme/index.js b/src/utils/theme/index.js index 5b532a8a2..2ec465de9 100644 --- a/src/utils/theme/index.js +++ b/src/utils/theme/index.js @@ -39,6 +39,9 @@ export function changeElementColor(themeColors) { .el-link.el-link--${key}:after { border-color: ${value}!important; } + .el-tag--dark.el-tag--${key} { + background-color: ${value} !important; + } ` } } diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanApp/index.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanApp/index.vue index 4d8ef9037..74ae7e95e 100644 --- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanApp/index.vue +++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanApp/index.vue @@ -98,7 +98,7 @@ export default { that.iHasObjects = [...that.iHasObjects, ...objects] that.$refs.select2.clearSelected() this.$message.success(this.$t('common.updateSuccessMsg')) - this.$store.commit('common/reload') + window.location.reload() this.$refs.listTable.$refs.ListTable.reloadTable() } } diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue index e420c086a..ecca8a67e 100644 --- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue +++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue @@ -93,7 +93,7 @@ export default { onAddSuccess: (items, that) => { this.$log.debug('AssetSelect value', that.assets) this.$message.success(this.$t('common.updateSuccessMsg')) - this.$store.commit('common/reload') + window.location.reload() } }, nodeRelationConfig: { @@ -120,7 +120,7 @@ export default { that.iHasObjects = [...that.iHasObjects, ...objects] that.$refs.select2.clearSelected() this.$message.success(this.$t('common.updateSuccessMsg')) - this.$store.commit('common/reload') + window.location.reload() }, performDelete: (item) => { const data = { diff --git a/src/views/audits/OperateLogList.vue b/src/views/audits/OperateLogList.vue index cb21b4916..5cd6dfb0c 100644 --- a/src/views/audits/OperateLogList.vue +++ b/src/views/audits/OperateLogList.vue @@ -1,6 +1,10 @@