gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改 表达式模板 调用tree接口

Browse Source
This commit is contained in:
zhangyu
2021-05-11 14:11:24 +08:00
parent 551f9b65ae
commit 4b85b3ced5
2 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
View File

@@ -62,7 +62,7 @@
<span>{{$t('overall.cancel')}}</span> <span>{{$t('overall.cancel')}}</span>
</button> </button>
<button id="alert-box-save" :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" <button id="alert-box-save" :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save"
class="footer__btn footer__btn--light" @click="save"> class="footer__btn" @click="save">
<span>{{$t('overall.save')}}</span> <span>{{$t('overall.save')}}</span>
</button> </button>
</div> </div>

55
nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
View File

@@ -291,6 +291,7 @@ export default {
this.dropDownVisible = false this.dropDownVisible = false
this.$emit('change', value) this.$emit('change', value)
this.$forceUpdate() this.$forceUpdate()
this.cascaderValue = ''
}, },
metricKeyDown (val) { metricKeyDown (val) {
if (this.required) { if (this.required) {
@@ -431,18 +432,18 @@ export default {
getAllOptins (key, arr) { getAllOptins (key, arr) {
switch (key) { switch (key) {
case 'asset': case 'asset':
this.$get('asset', { pageNo: 1, pageSize: -1 }).then(response => { this.$get('asset/asset', { pageNo: 1, pageSize: -1 }).then(response => {
if (response.code == 200) { if (response.code == 200) {
const arr = [] const arr = []
response.data.list.forEach(asset => { response.data.list.forEach(asset => {
asset.name = asset.sn asset.name = asset.sn
const idcF = arr.find(idc => idc.id === asset.idc.id) const dcF = arr.find(dc => dc.id === asset.dc.id)
if (idcF) { if (dcF) {
idcF.children.push(asset) dcF.children.push(asset)
} else { } else {
const idc = { ...asset.idc } const dc = { ...asset.dc }
idc.children = [asset] dc.children = [asset]
arr.push(idc) arr.push(dc)
} }
}) })
this.assetOption = arr this.assetOption = arr
@@ -450,56 +451,28 @@ export default {
}) })
break break
case 'module': case 'module':
this.$get('module', { pageNo: 1, pageSize: -1 }).then(response => { this.$get('monitor/module/tree', { pageNo: 1, pageSize: -1 }).then(response => {
if (response.code == 200) { if (response.code == 200) {
const arr = [] this.moduleOption = response.data.list
response.data.list.forEach(module => {
const projectF = arr.find(project => project.id === module.project.id)
if (projectF) {
projectF.children.push(module)
} else {
const project = { ...module.project }
project.children = [module]
arr.push(project)
}
})
this.moduleOption = arr
} }
}) })
break break
case 'endpoint': case 'endpoint':
this.$get('endpoint', { pageNo: 1, pageSize: -1 }).then(response => { this.$get('monitor/endpoint/tree', { pageNo: 1, pageSize: -1 }).then(response => {
if (response.code == 200) { if (response.code == 200) {
const arr = [] this.endpointOption = response.data.list
response.data.list.forEach(item => {
item.name = item.host
const projectF = arr.find(project => item.project.id === project.id)
if (projectF) {
const moduleF = projectF.children.find(module => module.id === item.module.id)
if (moduleF) {
moduleF.children.push(item)
} else {
projectF.children.push({ ...item.module, children: [item] })
}
} else {
const project = { ...item.project }
project.children = [{ ...item.module, children: [item] }]
arr.push(project)
}
})
this.endpointOption = arr
} }
}) })
break break
case 'datacenter': case 'datacenter':
this.$get('idc', { pageNo: 1, pageSize: -1 }).then(response => { this.$get('dc', { pageNo: 1, pageSize: -1 }).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.datacenterOption = response.data.list this.datacenterOption = response.data.list
} }
}) })
break break
case 'project': case 'project':
this.$get('project', { pageNo: 1, pageSize: -1 }).then(response => { this.$get('monitor/project', { pageNo: 1, pageSize: -1 }).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.projectOption = response.data.list this.projectOption = response.data.list
} }