-
{{ 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 @@
-
+
{
+ vm.loading = true
vm.$axios.get(
`/api/v1/audits/operate-logs/${row.id}/?type=action_detail`,
).then(res => {
vm.rowObj.left = res.before
vm.rowObj.right = res.after
vm.logDetailVisible = true
+ }).finally(() => {
+ vm.loading = false
})
}
}
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
index 526e73bc4..2e4fa30e8 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
@@ -93,7 +93,7 @@ export default {
this.$message.success(this.$t('common.updateSuccessMsg'))
this.$refs.ListTable.reloadTable()
that.$refs.assetSelect.$refs.select2.clearSelected()
- this.$store.commit('common/reload')
+ window.location.reload()
}
},
nodeRelationConfig: {
diff --git a/src/views/sessions/SessionDetail/SessionDetailInfo.vue b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
index 4dc3315b8..1bb503e75 100644
--- a/src/views/sessions/SessionDetail/SessionDetailInfo.vue
+++ b/src/views/sessions/SessionDetail/SessionDetailInfo.vue
@@ -49,7 +49,7 @@ export default {
const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
vm.$message.success(msg)
window.setTimeout(function() {
- this.$store.commit('common/reload')
+ window.location.reload()
}, 50000)
})
}
diff --git a/src/views/settings/Interface.vue b/src/views/settings/Interface.vue
index 2b1e7aeac..b5b7b8800 100644
--- a/src/views/settings/Interface.vue
+++ b/src/views/settings/Interface.vue
@@ -175,7 +175,7 @@ export default {
}).then(() => {
restoreInterface().then(res => {
this.$message.success(res.success)
- this.$store.commit('common/reload')
+ location.reload()
})
})
}.bind(this)
@@ -221,7 +221,7 @@ export default {
}
}
updateInterface(form).then(res => {
- this.$store.commit('common/reload')
+ location.reload()
})
}
}
diff --git a/src/views/settings/License.vue b/src/views/settings/License.vue
index c485534a4..d3d9c19a5 100644
--- a/src/views/settings/License.vue
+++ b/src/views/settings/License.vue
@@ -140,7 +140,6 @@ export default {
window.open(url, '_blank')
},
importLicense() {
- const vm = this
if (this.licenseFile['file'] === undefined) {
return
}
@@ -149,7 +148,7 @@ export default {
importLicense(formData).then(res => {
if (res.status) {
this.$message.success(res.msg)
- setTimeout(() => vm.$store.commit('common/reload'), 500)
+ setTimeout(() => location.reload(), 500)
} else {
this.$message.error(res.msg)
}
diff --git a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
index d07cb7c4e..c710e7625 100644
--- a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
@@ -236,7 +236,7 @@ export default {
return toSafeLocalDateStr(dataStr)
},
reloadPage() {
- this.$store.commit('common/reload')
+ window.location.reload()
},
handleApprove() {
if (this.object.approval_step === this.object.process_map.length) {
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index 82f93b6c3..8665046e5 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -244,7 +244,7 @@ export default {
return toSafeLocalDateStr(dataStr)
},
reloadPage() {
- this.$store.commit('common/reload')
+ window.location.reload()
},
handleApprove() {
if (this.object.approval_step === this.object.process_map.length) {
diff --git a/src/views/tickets/TicketFlow/Detail/TicketDetail.vue b/src/views/tickets/TicketFlow/Detail/TicketDetail.vue
index 8d1db855d..c47920336 100644
--- a/src/views/tickets/TicketFlow/Detail/TicketDetail.vue
+++ b/src/views/tickets/TicketFlow/Detail/TicketDetail.vue
@@ -88,7 +88,7 @@ export default {
return toSafeLocalDateStr(dataStr)
},
reloadPage() {
- this.$store.commit('common/reload')
+ window.location.reload()
}
}
}
diff --git a/src/views/tickets/components/Comments.vue b/src/views/tickets/components/Comments.vue
index ea9513bf3..4e70e0bd6 100644
--- a/src/views/tickets/components/Comments.vue
+++ b/src/views/tickets/components/Comments.vue
@@ -199,7 +199,7 @@ export default {
)
},
reloadPage() {
- this.$store.commit('common/reload')
+ window.location.reload()
}
}