gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

Browse Source 
# Conflicts:
#	src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue
This commit is contained in:
@changcode
2022-09-20 09:38:56 +08:00
parent 8fb738ce6b f6c22ce1ae
commit e69a0147e7
16 changed files with 314 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/charts2/charts/npm/NpmRecentEvents.vue
View File

@@ -73,8 +73,11 @@ export default {
},
methods: {
recentEventsListData () {
const condition = this.$store.getters.getQueryCondition.split(/["|'](.*?)["|']/)
const type = this.$store.getters.getDimensionType
// const condition = this.$store.getters.getQueryCondition.split(/["|'](.*?)["|']/)
const conditionStr = this.$route.query.queryCondition ? this.$route.query.queryCondition : ''
const condition = conditionStr.split(/["|'](.*?)["|']/)
// const type = this.$store.getters.getDimensionType
const type = this.$route.query.dimensionType ? this.$route.query.dimensionType : ''
let url = ''
const params = {
startTime: getSecond(this.timeFilter.startTime),