Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.2
This commit is contained in:
@@ -345,6 +345,7 @@ export const fromRoute = {
|
||||
alertSilence: 'alertSilence',
|
||||
model: 'model',
|
||||
mib: 'mib',
|
||||
credential: 'credential',
|
||||
asset: 'asset',
|
||||
assetType: 'assetType',
|
||||
assetState: 'assetState',
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
ref="dataList"
|
||||
:api="url"
|
||||
:custom-table-title.sync="tools.customTableTitle"
|
||||
:from="fromRoute.mib"
|
||||
:from="fromRoute.credential"
|
||||
:layout="['searchInput', 'elementSet', 'pagination']"
|
||||
:search-msg="searchMsg"
|
||||
@search="search"
|
||||
|
||||
@@ -619,7 +619,7 @@ export default {
|
||||
this.setSearchData(response.statistics)
|
||||
}
|
||||
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)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user