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

fix search

This commit is contained in:
pycook 2019-11-19 18:32:35 +08:00
parent 47ded84231
commit a1f63b00dd
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/app.py
View File

@ -99,7 +99,8 @@ def register_extensions(app):
login_manager.init_app(app) login_manager.init_app(app)
migrate.init_app(app, db) migrate.init_app(app, db)
rd.init_app(app) rd.init_app(app)
es.init_app(app) if app.config.get("USE_ES"):
es.init_app(app)
celery.conf.update(app.config) celery.conf.update(app.config)

1
ui/src/views/cmdb/attributes/index.vue
View File

@ -75,7 +75,6 @@
<a-popconfirm <a-popconfirm
title="确认删除?" title="确认删除?"
@confirm="handleDelete(record)" @confirm="handleDelete(record)"
@cancel="cancel"
okText="是" okText="是"
cancelText="否" cancelText="否"
> >

2
ui/src/views/cmdb/ci/index.vue
View File

@ -324,7 +324,7 @@ export default {
return searchCI(`q=_id:${ciId}`).then(res => { return searchCI(`q=_id:${ciId}`).then(res => {
const ciMap = {} const ciMap = {}
Object.keys(res.result[0]).forEach(k => { Object.keys(res.result[0]).forEach(k => {
if (!['ci_type', '_id', 'ci_type_alias', '_type'].includes(k)) { if (!['ci_type', 'ci_id', 'ci_type_alias', 'type_id'].includes(k)) {
ciMap[k] = res.result[0][k] ciMap[k] = res.result[0][k]
} }
}) })

4
ui/src/views/cmdb/ci/modules/CiDetail.vue
View File

@ -33,7 +33,7 @@
<div v-for="parent in parentCITypes" :key="'ctr_' + parent.ctr_id"> <div v-for="parent in parentCITypes" :key="'ctr_' + parent.ctr_id">
<a-card type="inner" :title="parent.alias || parent.name" v-if="firstCIs[parent.name]"> <a-card type="inner" :title="parent.alias || parent.name" v-if="firstCIs[parent.name]">
<a-table <a-table
rowKey="_id" rowKey="ci_id"
size="middle" size="middle"
:columns="firstCIColumns[child.id]" :columns="firstCIColumns[child.id]"
:dataSource="firstCIs[child.name]" :dataSource="firstCIs[child.name]"
@ -45,7 +45,7 @@
<div v-for="child in childCITypes" :key="'ctr_' + child.ctr_id"> <div v-for="child in childCITypes" :key="'ctr_' + child.ctr_id">
<a-card type="inner" :title="child.alias || child.name" v-if="secondCIs[child.name]"> <a-card type="inner" :title="child.alias || child.name" v-if="secondCIs[child.name]">
<a-table <a-table
rowKey="_id" rowKey="ci_id"
size="middle" size="middle"
:columns="secondCIColumns[child.id]" :columns="secondCIColumns[child.id]"
:dataSource="secondCIs[child.name]" :dataSource="secondCIs[child.name]"

4
ui/src/views/cmdb/tree_views/index.vue
View File

@ -20,7 +20,7 @@
bordered bordered
ref="table" ref="table"
size="middle" size="middle"
rowKey="_id" rowKey="ci_id"
:columns="columns" :columns="columns"
:data="loadInstances" :data="loadInstances"
:scroll="{ x: scrollX, y: scrollY }" :scroll="{ x: scrollX, y: scrollY }"
@ -203,7 +203,7 @@ export default {
this.current = [this.typeId] this.current = [this.typeId]
this.loadColumns() this.loadColumns()
this.levels = res.find(item => item.id === this.typeId).levels this.levels = res.find(item => item.id === this.typeId).levels
this.$refs.table.refresh(true) this.$refs.table && this.$refs.table.refresh(true)
} }
}) })
}, },