7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-07 18:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

version: 2.3.1

Browse Source
This commit is contained in:
pycook
2023-08-19 12:43:55 +08:00
parent 0ebd52f3fd
commit 4abe4d7e8f
9 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
View File

@@ -287,7 +287,7 @@ export default {
item.description += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.description += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.description += str
}
}
}

2
cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
View File

@@ -238,7 +238,7 @@ export default {
item.changeDescription += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.changeDescription += str
}
}
}

2
cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
View File

@@ -286,7 +286,7 @@ export default {
item.changeDescription += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
item.changeDescription += str
}
}
}

6
cmdb-ui/src/modules/cmdb/views/ci/index.vue
View File

@@ -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]

2
cmdb-ui/src/modules/cmdb/views/discovery/index.vue
View File

@@ -31,7 +31,7 @@
</template>
<script>
import { getDiscovery, deleteDiscovery, downloadADR } from '../../api/discovery'
import { getDiscovery, deleteDiscovery } from '../../api/discovery'
import DiscoveryCard from './discoveryCard.vue'
import EditDrawer from './editDrawer.vue'
export default {

2
cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
View File

@@ -66,7 +66,7 @@ import ModelRelationTable from './modules/modelRelationTable.vue'
import { searchResourceType } from '@/modules/acl/api/resource'
import { getCITypeGroupsConfig } from '@/modules/cmdb/api/ciTypeGroup'
import { getCITypes } from '@/modules/cmdb/api/CIType'
import { createRelation, deleteRelation, getCITypeChildren, getRelationTypes } from '@/modules/cmdb/api/CITypeRelation'
import { createRelation, deleteRelation, getRelationTypes } from '@/modules/cmdb/api/CITypeRelation'
export default {
name: 'Index',
components: {

2
cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
View File

@@ -594,7 +594,7 @@ export default {
this.calcColumns()
if (refreshType === 'refreshNumber') {
const promises = this.treeKeys.map((key, index) => {
this.treeKeys.map((key, index) => {
statisticsCIRelation({
root_ids: key.split('%')[0],
level: this.treeKeys.length - index,

3
cmdb-ui/src/views/setting/components/employeeTable.vue
View File

@@ -802,7 +802,6 @@
import { mapState } from 'vuex'
import { getDepartmentName, getDirectorName } from '@/utils/util'
import Bus from '../companyStructure/eventBus/bus'
import appConfig from '@/config/app'
import Sortable from 'sortablejs'
import XEUtils from 'xe-utils'
import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
@@ -1179,7 +1178,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]