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

Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2

Browse Source
This commit is contained in:
zhangyu
2022-02-15 11:23:51 +08:00
parent 1b90f0f9ae 6bd1c0f8dd
commit ab89da8387
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/common/js/constants.js
View File

@@ -345,6 +345,7 @@ export const fromRoute = {
alertSilence: 'alertSilence', alertSilence: 'alertSilence',
model: 'model', model: 'model',
mib: 'mib', mib: 'mib',
credential: 'credential',
asset: 'asset', asset: 'asset',
assetType: 'assetType', assetType: 'assetType',
assetState: 'assetState', assetState: 'assetState',

2
nezha-fronted/src/components/page/config/credentials.vue
View File

@@ -4,7 +4,7 @@
ref="dataList" ref="dataList"
:api="url" :api="url"
:custom-table-title.sync="tools.customTableTitle" :custom-table-title.sync="tools.customTableTitle"
:from="fromRoute.mib" :from="fromRoute.credential"
:layout="['searchInput', 'elementSet', 'pagination']" :layout="['searchInput', 'elementSet', 'pagination']"
:search-msg="searchMsg" :search-msg="searchMsg"
@search="search" @search="search"

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -619,7 +619,7 @@ export default {
this.setSearchData(response.statistics) this.setSearchData(response.statistics)
} }
for (let i = 0; i < response.data.list.length; i++) { for (let i = 0; i < response.data.list.length; i++) {
response.data.list[i].configs.forEach(item => { response.data.list[i].configs && response.data.list[i].configs.forEach(item => {
item.config = JSON.parse(item.config) item.config = JSON.parse(item.config)
}) })
} }