7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dev UI (#186) 

* fix:add package

* fix:notice_info为null的情况

* fix:2 bugs
This commit is contained in:
wang-liang0615 2023-09-28 09:45:11 +08:00 committed by GitHub
parent 388134b38c
commit c0541b7e50
2 changed files with 1709 additions and 1696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
View File

@ -276,7 +276,7 @@ export default {
} else if (_findADT.agent_id) {
this.agent_type = 'agent_id'
} else {
this.agent_type = 'agent_id'
this.agent_type = this.agentTypeRadioList[0].value
}
if (_findADT.interval || (!_findADT.interval && !_findADT.cron)) {
this.interval = 'interval'
@ -348,9 +348,17 @@ export default {
}
if (this.agent_type === 'agent_id' || this.agent_type === 'all') {
params.query_expr = ''
if (this.agent_type === 'agent_id' && !params.agent_id) {
this.$message.error('请填写指定节点！')
return
}
}
if (this.agent_type === 'query_expr' || this.agent_type === 'all') {
params.agent_id = ''
if (this.agent_type === 'query_expr' && !params.query_expr) {
this.$message.error('请从cmdb中选择！')
return
}
}
putCITypeDiscovery(currentAdt.id, params).then((res) => {

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

@ -560,20 +560,22 @@ export default {
} else {
q = `q=_type:${this.currentTypeId[0]},` + q
}
const res = await searchCI2(q)
this.pageNo = res.page
this.numfound = res.numfound
res.result.forEach((item, index) => (item.key = item._id))
const jsonAttrList = this.preferenceAttrList.filter((attr) => attr.value_type === '6')
console.log(jsonAttrList)
this.instanceList = res['result'].map((item) => {
jsonAttrList.forEach(
(jsonAttr) => (item[jsonAttr.name] = item[jsonAttr.name] ? JSON.stringify(item[jsonAttr.name]) : '')
)
return { ..._.cloneDeep(item) }
})
this.initialInstanceList = _.cloneDeep(this.instanceList)
this.calcColumns()
if (this.currentTypeId[0]) {
const res = await searchCI2(q)
this.pageNo = res.page
this.numfound = res.numfound
res.result.forEach((item, index) => (item.key = item._id))
const jsonAttrList = this.preferenceAttrList.filter((attr) => attr.value_type === '6')
console.log(jsonAttrList)
this.instanceList = res['result'].map((item) => {
jsonAttrList.forEach(
(jsonAttr) => (item[jsonAttr.name] = item[jsonAttr.name] ? JSON.stringify(item[jsonAttr.name]) : '')
)
return { ..._.cloneDeep(item) }
})
this.initialInstanceList = _.cloneDeep(this.instanceList)
this.calcColumns()
}
} else {
q += `&root_id=${this.treeKeys[this.treeKeys.length - 1].split('%')[0]}`
const typeId = parseInt(this.treeKeys[this.treeKeys.length - 1].split('%')[1])
@ -608,25 +610,28 @@ export default {
} else {
q = `q=_type:${this.currentTypeId[0]},` + q
}
const res = await searchCIRelation(q)
if (this.currentTypeId[0]) {
const res = await searchCIRelation(q)
const _data = Object.assign([], res.result)
_data.forEach((item, index) => (item.key = item._id))
this.numfound = res.numfound
this.pageNo = res.page
const _data = Object.assign([], res.result)
_data.forEach((item, index) => (item.key = item._id))
this.numfound = res.numfound
this.pageNo = res.page
const jsonAttrList = this.preferenceAttrList.filter((attr) => attr.value_type === '6')
this.instanceList = _data.map((item) => {
jsonAttrList.forEach(
(jsonAttr) => (item[jsonAttr.name] = item[jsonAttr.name] ? JSON.stringify(item[jsonAttr.name]) : '')
)
return { ..._.cloneDeep(item) }
})
this.initialInstanceList = _.cloneDeep(this.instanceList)
const jsonAttrList = this.preferenceAttrList.filter((attr) => attr.value_type === '6')
this.instanceList = _data.map((item) => {
jsonAttrList.forEach(
(jsonAttr) => (item[jsonAttr.name] = item[jsonAttr.name] ? JSON.stringify(item[jsonAttr.name]) : '')
)
return { ..._.cloneDeep(item) }
})
this.initialInstanceList = _.cloneDeep(this.instanceList)
this.calcColumns()
}
this.calcColumns()
if (refreshType === 'refreshNumber') {
this.treeKeys.map((key, index) => {
const promises = this.treeKeys.map((key, index) => {
statisticsCIRelation({
root_ids: key.split('%')[0],
level: this.treeKeys.length - index,